From 12ecaf7cef7e9a3eea0aa8a7cb44235bd14e507f Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Sat, 22 Sep 2001 19:03:48 +0000 Subject: Bumped the version number to 0.12.99.0. 2001-09-22 Christopher James Lahey * configure.in: Bumped the version number to 0.12.99.0. From a patch by Damian Ivereigh : * gal/util/e-util.c, gal/util/e-util.h (e_strftime_fix_am_pm): New function, takes the same arguments as strftime, but does some fixup if the given string is in 12 hour mode but the locale doesn't have AM/PM descriptors. From gal/e-table/ChangeLog: 2001-09-22 Christopher James Lahey From a patch by Damian Ivereigh : * e-cell-date.c: Made this use e_strftime_fix_am_pm instead of strftime. svn path=/trunk/; revision=13081 --- widgets/table/e-cell-date.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'widgets/table') diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c index 2c1873ae90..a483d79d89 100644 --- a/widgets/table/e-cell-date.c +++ b/widgets/table/e-cell-date.c @@ -39,7 +39,7 @@ ecd_get_text(ECellText *cell, ETableModel *model, int col, int row) localtime_r (&nowdate, &now); if (nowdate - date < 60 * 60 * 8 && nowdate > date) { - strftime (buf, 26, _("%l:%M %p"), &then); + e_strftime_fix_am_pm (buf, 26, _("%l:%M %p"), &then); done = TRUE; } @@ -47,7 +47,7 @@ ecd_get_text(ECellText *cell, ETableModel *model, int col, int row) if (then.tm_mday == now.tm_mday && then.tm_mon == now.tm_mon && then.tm_year == now.tm_year) { - strftime (buf, 26, _("Today %l:%M %p"), &then); + e_strftime_fix_am_pm (buf, 26, _("Today %l:%M %p"), &then); done = TRUE; } } @@ -59,10 +59,10 @@ ecd_get_text(ECellText *cell, ETableModel *model, int col, int row) then.tm_year == yesterday.tm_year) { #if 0 if (nowdate - date < 60 * 60 * 12) { - strftime (buf, 26, _("Late Yesterday %l:%M %p"), &then); + e_strftime_fix_am_pm (buf, 26, _("Late Yesterday %l:%M %p"), &then); } else { #endif - strftime (buf, 26, _("Yesterday %l:%M %p"), &then); + e_strftime_fix_am_pm (buf, 26, _("Yesterday %l:%M %p"), &then); #if 0 } #endif @@ -77,7 +77,7 @@ ecd_get_text(ECellText *cell, ETableModel *model, int col, int row) if (then.tm_mday == yesterday.tm_mday && then.tm_mon == yesterday.tm_mon && then.tm_year == yesterday.tm_year) { - strftime (buf, 26, _("%a %l:%M %p"), &then); + e_strftime_fix_am_pm (buf, 26, _("%a %l:%M %p"), &then); done = TRUE; break; } @@ -85,9 +85,9 @@ ecd_get_text(ECellText *cell, ETableModel *model, int col, int row) } if (!done) { if (then.tm_year == now.tm_year) { - strftime (buf, 26, _("%b %d %l:%M %p"), &then); + e_strftime_fix_am_pm (buf, 26, _("%b %d %l:%M %p"), &then); } else { - strftime (buf, 26, _("%b %d %Y"), &then); + e_strftime_fix_am_pm (buf, 26, _("%b %d %Y"), &then); } } #if 0 -- cgit