aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/alarm-notify/notify-main.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 73b921b494..c3c55bba50 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-24 Duncan Mak <duncan@ximian.com>
+
+ * gui/alarm-notify/notify-main.c (funny_trigger_cb): Fixed
+ Strftime so it uses the locale prefered way to display date/time.
+ ("%x %X" instead of "%Y/%m/%d %H:%M:%S")
+
2001-04-21 Gediminas Paulauskas <menesis@delfi.lt>
* gui/calendar-summary.c: translate "Things to do" etc. and convert them
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 9c1d04b739..0fc6b48607 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -51,7 +51,7 @@ funny_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)
struct tm *tm;
tm = localtime (&trigger);
- strftime (str, sizeof (str), "%Y/%m/%d %H:%M:%S", tm);
+ strftime (str, sizeof (str), "%x %X", tm);
msg = g_strdup_printf (_("It is %s. The Unix time is %ld right now. We just thought "
"you may like to know."), str, (long) trigger);