2007-07-30 Part of fix for bug #360461 - Avoid markup in translatable messages

svn path=/trunk/; revision=33894

6 files changed, 50 insertions, 26 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);
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index 9a3d7b0085..51f1697f65 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -73,6 +73,7 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 	CamelFolder *folder = (CamelFolder *)data;
 	CamelStore *store = folder->parent_store;	
 	cnc = get_cnc (store);	
+	gchar *msg;
 
 	dialog =  gtk_dialog_new_with_buttons (_("Junk Settings"),
 			NULL,
@@ -86,9 +87,11 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 	gtk_widget_ensure_style (dialog);
 	gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *) dialog)->vbox, 12);
 	box = gtk_vbox_new (FALSE, 6);
-	w = gtk_label_new ("");		
-	gtk_label_set_markup (GTK_LABEL (w), _("<b>Junk Mail Settings</b>"));
+	w = gtk_label_new ("");	
+	msg = g_strdup_printf("<b>%s</b>", _("Junk Mail Settings"));
+	gtk_label_set_markup (GTK_LABEL (w), msg);
 	gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 6);
+	g_free(msg);
 
 	junk_tab = junk_settings_new (cnc);
 	w = (GtkWidget *)junk_tab->vbox;
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index 7a0580a12d..2f5b4402db 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -75,6 +75,8 @@ track_status (EPopup *ep, EPopupItem *item, void *data)
 	time_t time ;
 	char *time_str ;
 
+	gchar *boldmsg;
+
 	const char *status = NULL ;
 
 	int row = 0;
@@ -114,7 +116,9 @@ track_status (EPopup *ep, EPopupItem *item, void *data)
 	gtk_table_set_row_spacings (table, 6);
 
 	/*Subject*/
-	widget = gtk_label_new (_("<b>Subject</b>:"));
+	boldmsg = g_strdup_printf ("<b>%s</b>", _("Subject:"));
+	widget = gtk_label_new (boldmsg);
+	g_free (boldmsg);
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 	gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
 	gtk_table_attach (table, widget , 0, 1, row,  row + 1, GTK_FILL, 0, 0, 0);
@@ -126,7 +130,9 @@ track_status (EPopup *ep, EPopupItem *item, void *data)
 	/*From*/
 	from = camel_mime_message_get_from (msg) ;
 	camel_internet_address_get (from, 0, &namep, &addp) ;
-	widget = gtk_label_new (_("<b>From</b>:"));
+	boldmsg = g_strdup_printf ("<b>%s</b>", _("From:"));
+	widget = gtk_label_new (boldmsg);
+	g_free (boldmsg);
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 	gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
 	gtk_table_attach (table, widget , 0, 1,  row,  row + 1, GTK_FILL, 0, 0, 0);
@@ -139,7 +145,9 @@ track_status (EPopup *ep, EPopupItem *item, void *data)
 	time = camel_mime_message_get_date (msg, NULL) ;
 	time_str = ctime (&time) ;
 	time_str[strlen(time_str)-1] = '\0' ;
-	widget = gtk_label_new (_("<b>Creation date</b>:"));
+	boldmsg = g_strdup_printf ("<b>%s</b>", _("Creation date:"));
+	widget = gtk_label_new (boldmsg);
+	g_free (boldmsg);
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 	gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
 	gtk_table_attach (table, widget , 0, 1, row,  row + 1, GTK_FILL, 0, 0, 0);
diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c
index 96ed6ba7d6..3b0a3d2de0 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.c
+++ b/plugins/ipod-sync/evolution-ipod-sync.c
@@ -29,16 +29,18 @@ ipod_check_status (gboolean silent)
 	if (check_hal () == FALSE)
 	{
 		if (!silent) {
-			GtkWidget *message = gtk_message_dialog_new_with_markup (
-											NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-											"<span weight=\"bold\" size=\"larger\">"
-											"Hardware Abstraction Layer not loaded"
-											"</span>\n\n"
-											"The \"hald\" service is required but not currently "
-											"running. Please enable the service and rerun this "
-											"program, or contact your system administrator.");
+			gchar *msg1, *msg2;
+			msg1 = g_strdup_printf("<span weight=\"bold\" size=\"larger\">%s</span>\n\n", _("Hardware Abstraction Layer not loaded"));
+			msg2 = g_strdup_printf("%s%s", msg1, _("The \"hald\" service is required but not currently "
+								"running. Please enable the service and rerun this "
+								"program, or contact your system administrator.") );
+
+			GtkWidget *message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg2);
 
 			gtk_dialog_run (GTK_DIALOG (message));
+
+			g_free(msg1);
+			g_free(msg2);
 			gtk_widget_destroy (message);
 		}
 		return FALSE;
@@ -60,15 +62,18 @@ ipod_check_status (gboolean silent)
 		 * it wasn't plugged in. Either way, we want to umount
 		 * the iPod when we finish syncing. */
 		if (!silent) {
-			GtkWidget *message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-										_("<span weight=\"bold\" size=\"larger\">"
-										  "Search for an iPod failed"
-										  "</span>\n\n"
-										  "Evolution could not find an iPod to synchronize with. "
-										  "Either the iPod is not connected to the system or it "
-										  "is not powered on."));
+			gchar *msg1, *msg2;
+			msg1 = g_strdup_printf("<span weight=\"bold\" size=\"larger\">%s</span>\n\n", _("Search for an iPod failed"));
+			msg2 = g_strdup_printf("%s%s", msg1, _("Evolution could not find an iPod to synchronize with. "
+								"Either the iPod is not connected to the system or it "
+								"is not powered on."));
+
+			GtkWidget *message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg2);
 
 			gtk_dialog_run (GTK_DIALOG (message));
+
+			g_free(msg1);
+			g_free(msg2);
 			gtk_widget_destroy (message);
 		}