aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-03-20 04:03:29 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-03-20 04:03:29 +0800
commit2fb0817743b56f4c044946a4d0d9cb0619938d40 (patch)
tree1d5153c9994f3ced3ee8fbf1e7b680abe4a018a0
parent5ab2f198eb734adf2afa1d8171be59adb8c4aae0 (diff)
downloadgsoc2013-evolution-2fb0817743b56f4c044946a4d0d9cb0619938d40.tar.gz
gsoc2013-evolution-2fb0817743b56f4c044946a4d0d9cb0619938d40.tar.zst
gsoc2013-evolution-2fb0817743b56f4c044946a4d0d9cb0619938d40.zip
(generate_html): Add a %P in the strftime
string for the case when the user wants am/pm format. [#19957] svn path=/trunk/; revision=20364
-rw-r--r--my-evolution/ChangeLog5
-rw-r--r--my-evolution/e-summary-calendar.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index d40f6b9f7c..e80e446a28 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-19 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-summary-calendar.c (generate_html): Add a %P in the strftime
+ string for the case when the user wants am/pm format. [#19957]
+
2003-03-13 Mike Kestner <mkestner@ximian.com>
* e-summary-preferences.c (fill_rdf_etable): pass FALSE for
diff --git a/my-evolution/e-summary-calendar.c b/my-evolution/e-summary-calendar.c
index 7c5a5cbea7..bbf5a3daca 100644
--- a/my-evolution/e-summary-calendar.c
+++ b/my-evolution/e-summary-calendar.c
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* e-summary-calendar.c
*
- * Copyright (C) 2001, 2002 Ximian, Inc.
+ * Copyright (C) 2001, 2002, 2003 Ximian, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
@@ -404,7 +404,7 @@ generate_html (gpointer data)
if (calendar->wants24hr == TRUE) {
strftime (start_str, sizeof start_str, _("%k:%M %d %B"), &start_tm);
} else {
- strftime (start_str, sizeof start_str, _("%l:%M %d %B"), &start_tm);
+ strftime (start_str, sizeof start_str, _("%l:%M%P %d %B"), &start_tm);
}
if (cal_component_has_alarms (event->comp)) {