aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMilan Crha <mcrha@src.gnome.org>2007-07-30 15:52:48 +0800
committerMilan Crha <mcrha@src.gnome.org>2007-07-30 15:52:48 +0800
commitf971541da6eafd34428c318ad01c3de647057c5b (patch)
tree9fe3ddcda5aef793cf3b580794794f0d6b24f1ee /mail
parentc3381b5b2e4ab4428a7421f23cab04bdef600a17 (diff)
downloadgsoc2013-evolution-f971541da6eafd34428c318ad01c3de647057c5b.tar.gz
gsoc2013-evolution-f971541da6eafd34428c318ad01c3de647057c5b.tar.zst
gsoc2013-evolution-f971541da6eafd34428c318ad01c3de647057c5b.zip
2007-07-30 Part of fix for bug #360461 - Avoid markup in translatable messages
svn path=/trunk/; revision=33894
Diffstat (limited to 'mail')
-rw-r--r--mail/em-filter-rule.c4
-rw-r--r--mail/em-folder-view.c8
-rw-r--r--mail/em-format-html.c8
3 files changed, 14 insertions, 6 deletions
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index 3f1016d5d4..a68f135e15 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -485,11 +485,13 @@ get_widget(FilterRule *fr, RuleContext *rc)
widget = FILTER_RULE_CLASS(parent_class)->get_widget(fr, rc);
/* and now for the action area */
- label = gtk_label_new(_("<b>Then</b>"));
+ gchar * msg = g_strdup_printf("<b>%s</b>", _("Then"));
+ label = gtk_label_new(msg);
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_box_pack_start(GTK_BOX(widget), label, FALSE, FALSE, 0);
gtk_widget_show(label);
+ g_free(msg);
hbox = gtk_hbox_new(FALSE, 12);
gtk_box_pack_start(GTK_BOX(widget), hbox, TRUE, TRUE, 0);
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 80bcd32245..bd1868962d 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -2372,11 +2372,13 @@ emfv_spin(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject)
if (!strcmp(eb->classid, "spinner")) {
GtkWidget *box, *label;
-
+ gchar *msg = g_strdup_printf("<b>%s</b>", _("Retrieving Message..."));
+
label = gtk_label_new (NULL);
- gtk_label_set_markup ((GtkLabel *)label, _("<b>Retrieving Message...</b>"));
+ gtk_label_set_markup ((GtkLabel *)label, msg);
box = gtk_hbox_new (FALSE, 0);
-
+ g_free (msg);
+
ep = e_spinner_new ();
e_spinner_set_size ((ESpinner *)ep, GTK_ICON_SIZE_SMALL_TOOLBAR);
e_spinner_start ((ESpinner *)ep);
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index d554b1e288..3334e65ce3 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1707,10 +1707,14 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct
msg_offset += (local.tm_hour * 60) + local.tm_min;
if (msg_offset >= (24 * 60) || msg_offset < 0) {
/* translators: strftime format for local time equivalent in Date header display, with day */
- e_utf8_strftime(buf, sizeof(buf), _("<I> (%a, %R %Z)</I>"), &local);
+ gchar *msg = g_strdup_printf("<I>%s</I>", _(" (%a, %R %Z)"));
+ e_utf8_strftime(buf, sizeof(buf), msg, &local);
+ g_free(msg);
} else {
/* translators: strftime format for local time equivalent in Date header display, without day */
- e_utf8_strftime(buf, sizeof(buf), _("<I> (%R %Z)</I>"), &local);
+ gchar *msg = g_strdup_printf("<I>%s</I>", _(" (%R %Z)"));
+ e_utf8_strftime(buf, sizeof(buf), msg, &local);
+ g_free(msg);
}
html = camel_text_to_html(txt, efh->text_html_flags, 0);