aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-07-02 02:44:39 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-07-02 02:44:39 +0800
commit50eff556547ae1bb142e3d453f731603095f7041 (patch)
tree4946c148384a57874e248819bdd23d24b8c482cb
parent03b5e1899b556feb73af85b2dea61f3c7ca0d057 (diff)
downloadgsoc2013-evolution-50eff556547ae1bb142e3d453f731603095f7041.tar
gsoc2013-evolution-50eff556547ae1bb142e3d453f731603095f7041.tar.gz
gsoc2013-evolution-50eff556547ae1bb142e3d453f731603095f7041.tar.bz2
gsoc2013-evolution-50eff556547ae1bb142e3d453f731603095f7041.tar.lz
gsoc2013-evolution-50eff556547ae1bb142e3d453f731603095f7041.tar.xz
gsoc2013-evolution-50eff556547ae1bb142e3d453f731603095f7041.tar.zst
gsoc2013-evolution-50eff556547ae1bb142e3d453f731603095f7041.zip
Use the newer utf8 versions of the e_strftime*() functions since our
2003-06-27 Jeffrey Stedfast <fejj@ximian.com> * message-list.c (filter_date): Use the newer utf8 versions of the e_strftime*() functions since our format strings are all now in UTF-8. * mail-display.c (mail_display_render): Use the newer e_utf8_strftime_fix_am_pm(). * mail-callbacks.c (mail_generate_reply): Use e_utf8_strftime(), otherwise we can end up with invalid utf-8. svn path=/trunk/; revision=21712
-rw-r--r--mail/ChangeLog12
-rw-r--r--mail/mail-callbacks.c2
-rw-r--r--mail/mail-display.c2
-rw-r--r--mail/message-list.c10
4 files changed, 19 insertions, 7 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9e320443a1..d682cae826 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,15 @@
+2003-06-27 Jeffrey Stedfast <fejj@ximian.com>
+
+ * message-list.c (filter_date): Use the newer utf8 versions of the
+ e_strftime*() functions since our format strings are all now in
+ UTF-8.
+
+ * mail-display.c (mail_display_render): Use the newer
+ e_utf8_strftime_fix_am_pm().
+
+ * mail-callbacks.c (mail_generate_reply): Use e_utf8_strftime(),
+ otherwise we can end up with invalid utf-8.
+
2003-06-25 Radek Doulik <rodo@ximian.com>
* mail-config.c (config_write_style): provide hardcoded default
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 50c0619a84..edcbd337f0 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -1190,7 +1190,7 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char
}
date = camel_mime_message_get_date (message, NULL);
- strftime (format, sizeof (format), _("On %a, %Y-%m-%d at %H:%M, %%s wrote:"), localtime (&date));
+ e_utf8_strftime (format, sizeof (format), _("On %a, %Y-%m-%d at %H:%M, %%s wrote:"), localtime (&date));
text = mail_tool_quote_message (message, format, name && *name ? name : address);
mail_ignore (composer, name, address);
if (text) {
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 5ecba7c306..543ff7279b 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -1888,7 +1888,7 @@ mail_display_render (MailDisplay *md, GtkHTML *html, gboolean reset_scroll)
localtime_r (&target_date, &due);
- e_strftime_fix_am_pm (due_date, sizeof (due_date), _("by %B %d, %Y, %l:%M %P"), &due);
+ e_utf8_strftime_fix_am_pm (due_date, sizeof (due_date), _("by %B %d, %Y, %l:%M %P"), &due);
} else {
due_date[0] = '\0';
}
diff --git a/mail/message-list.c b/mail/message-list.c
index bb2d3e1464..d69981fbb6 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1076,7 +1076,7 @@ filter_date (time_t date)
if (then.tm_mday == now.tm_mday &&
then.tm_mon == now.tm_mon &&
then.tm_year == now.tm_year) {
- e_strftime_fix_am_pm (buf, 26, _("Today %l:%M %p"), &then);
+ e_utf8_strftime_fix_am_pm (buf, 26, _("Today %l:%M %p"), &then);
done = TRUE;
}
if (!done) {
@@ -1085,7 +1085,7 @@ filter_date (time_t date)
if (then.tm_mday == yesterday.tm_mday &&
then.tm_mon == yesterday.tm_mon &&
then.tm_year == yesterday.tm_year) {
- e_strftime_fix_am_pm (buf, 26, _("Yesterday %l:%M %p"), &then);
+ e_utf8_strftime_fix_am_pm (buf, 26, _("Yesterday %l:%M %p"), &then);
done = TRUE;
}
}
@@ -1097,7 +1097,7 @@ filter_date (time_t date)
if (then.tm_mday == yesterday.tm_mday &&
then.tm_mon == yesterday.tm_mon &&
then.tm_year == yesterday.tm_year) {
- e_strftime_fix_am_pm (buf, 26, _("%a %l:%M %p"), &then);
+ e_utf8_strftime_fix_am_pm (buf, 26, _("%a %l:%M %p"), &then);
done = TRUE;
break;
}
@@ -1105,9 +1105,9 @@ filter_date (time_t date)
}
if (!done) {
if (then.tm_year == now.tm_year) {
- e_strftime_fix_am_pm (buf, 26, _("%b %d %l:%M %p"), &then);
+ e_utf8_strftime_fix_am_pm (buf, 26, _("%b %d %l:%M %p"), &then);
} else {
- e_strftime_fix_am_pm (buf, 26, _("%b %d %Y"), &then);
+ e_utf8_strftime_fix_am_pm (buf, 26, _("%b %d %Y"), &then);
}
}
#if 0