aboutsummaryrefslogtreecommitdiffstats
path: root/my-evolution
diff options
context:
space:
mode:
Diffstat (limited to 'my-evolution')
-rw-r--r--my-evolution/ChangeLog7
-rw-r--r--my-evolution/e-summary-calendar.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 34abbc9916..fd98a54e38 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-19 Harry Lu <harry.lu@sun.com>
+
+ ** For bug #47461.
+
+ * e-summary-calendar.c: (generate_html): Change "%P" to "%p" so that
+ strftime() can work under solaris.
+
2003-08-12 Jack Jia <jack.jia@sun.com>
[Fixed bug #47563]
diff --git a/my-evolution/e-summary-calendar.c b/my-evolution/e-summary-calendar.c
index 6b7e04b593..71a25e6f15 100644
--- a/my-evolution/e-summary-calendar.c
+++ b/my-evolution/e-summary-calendar.c
@@ -405,7 +405,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%P %d %B"), &start_tm);
+ strftime (start_str, sizeof start_str, _("%l:%M%p %d %B"), &start_tm);
}
if (cal_component_has_alarms (event->comp)) {