aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/ChangeLog7
-rw-r--r--widgets/misc/e-dateedit.c11
2 files changed, 11 insertions, 7 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index bba804c20c..1987762c74 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-09 Jeff Cai<jeff.cai@sun.com>
+
+ * e-dateedit.c: (rebuild_time_popup):
+ Use e_time_format_time to ensure evolution and evolution-
+ data-server use same translations.
+ Fix #380843.
+
2007-03-29 Matthew Barnes <mbarnes@redhat.com>
* e-icon-entry.c:
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 6061b09f6d..9706632c6e 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -1435,12 +1435,10 @@ rebuild_time_popup (EDateEdit *dedit)
if (priv->use_24_hour_format)
/* This is a strftime() format. %H = hour (0-23), %M = minute. */
- format = _("%H:%M");
+ e_time_format_time (&tmp_tm, 1, 0, buffer, sizeof (buffer));
else
/* This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string. */
- format = _("%I:%M %p");
-
- e_utf8_strftime (buffer, sizeof (buffer), format, &tmp_tm);
+ e_time_format_time (&tmp_tm, 0, 0, buffer, sizeof (buffer));
/* For 12-hour am/pm format, we want space padding, not zero padding. This
* can be done with strftime's %l, but it's a potentially unportable extension. */
@@ -1762,12 +1760,11 @@ e_date_edit_update_time_entry (EDateEdit *dedit)
if (priv->use_24_hour_format)
/* This is a strftime() format. %H = hour (0-23), %M = minute. */
- format = _("%H:%M");
+ e_time_format_time (&tmp_tm, 1, 0, buffer, sizeof (buffer));
else
/* This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string. */
- format = _("%I:%M %p");
+ e_time_format_time (&tmp_tm, 0, 0, buffer, sizeof (buffer));
- e_utf8_strftime (buffer, sizeof (buffer), format, &tmp_tm);
gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->time_combo)->entry),
buffer);
}