From: Sergio Villar Senin <svillar@igalia.com>
Date: Tue, 4 Aug 2009 08:38:46 +0000 (+0200)
Subject: Fixes NB#131178, use logical id instead of semicolon in setup wizard to fix grammar... 
X-Git-Tag: 3.0.17-rc28~5
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=d54e0da879b16a8af8eae3dec80c0a405b21146a

Fixes NB#131178, use logical id instead of semicolon in setup wizard to fix grammar issues in french translations
---

diff --git a/src/widgets/modest-wizard-dialog.c b/src/widgets/modest-wizard-dialog.c
index 401d922..930090a 100644
--- a/src/widgets/modest-wizard-dialog.c
+++ b/src/widgets/modest-wizard-dialog.c
@@ -490,48 +490,33 @@ create_title (ModestWizardDialog *wizard_dialog)
     gchar *str = NULL;
     ModestWizardDialogPrivate *priv = NULL;
     GtkNotebook *notebook = NULL;
+    gint pages, current;
+    const gchar *steps;
 
     g_return_if_fail (MODEST_IS_WIZARD_DIALOG(wizard_dialog));
     g_return_if_fail (wizard_dialog->priv != NULL);
 
-    priv = wizard_dialog->priv;    
+    priv = wizard_dialog->priv;
     notebook = priv->notebook;
 
     if (!notebook)
         return;
 
     /* Get page information, we'll need that when creating title */
-    gint pages = gtk_notebook_get_n_pages (notebook);
+    pages = gtk_notebook_get_n_pages (notebook);
     if (pages == 0)
-      return;
-	
-    gint current = gtk_notebook_get_current_page (priv->notebook);
+	    return;
+
+    current = gtk_notebook_get_current_page (priv->notebook);
     if (current < 0)
-        current = 0;
-
-    /* the welcome title on the initial page */
-    /* This is the standard wizard title, with, e.g., 1/4 at the end,
-	 * but the Modest UI spec does not want this. */
-	/*
-    if (current == 0) {
-        str = g_strdup_printf (_HL("ecdg_ti_wizard_welcome"), 
-                priv->wizard_name, pages);
-    } else {
-    */
-    	const gchar *steps = gtk_notebook_get_tab_label_text (notebook,
-        	gtk_notebook_get_nth_page (notebook, current));
-                
-		/* This is the standard wizard title, with, e.g., 1/4 at the end,
-		 * but the Modest UI spec does not want this.
-		 */
-		/*
-        str = g_strdup_printf (_HL("ecdg_ti_wizard_step"), 
-                priv->wizard_name, current + 1, pages, steps);
-        */
-
-        str = g_strdup_printf ((steps&&*steps)?_HL("%s: %s"):_HL("%s"), 
-                priv->wizard_name, steps);
-    /* } */
+	    current = 0;
+
+    steps = gtk_notebook_get_tab_label_text (notebook,
+					     gtk_notebook_get_nth_page (notebook, current));
+
+    str = g_strdup_printf ((steps&&*steps)?_HL("%s%s %s"):_HL("%s"),
+			   priv->wizard_name, _HL("ecdg_ti_caption_separator"),
+			   steps);
 
     /* Update the dialog to display the generated title */
     gtk_window_set_title (GTK_WINDOW (wizard_dialog), str);