Fix for some issues in translation of plural strings (fixes NB#61146).

* src/modest-ui-actions.c:
* src/modest-msg-edit-window.c:
        * Changed translations of plurals to use ngettext.

pmo-trunk-r2318

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 53a2e6b..ad6b342 100644 (file)
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -1608,14 +1608,18 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window,
                GtkWidget *confirmation_dialog = NULL;
                gboolean dialog_response;
                GList *node;
+               gchar *message = NULL;
+               const gchar *filename = NULL;
+
                if (att_list->next == NULL) {
-                       gchar *message = g_strdup_printf (_("emev_nc_delete_attachment"), 
-                                                         tny_mime_part_get_filename (TNY_MIME_PART (att_list->data)));
-                       confirmation_dialog = hildon_note_new_confirmation (GTK_WINDOW (window), message);
-                       g_free (message);
+                       filename = tny_mime_part_get_filename (TNY_MIME_PART (att_list->data));
                } else {
-                       confirmation_dialog = hildon_note_new_confirmation (GTK_WINDOW (window), _("emev_nc_delete_attachments"));
+                       filename = "";
                }
+               message = g_strdup_printf (ngettext("emev_nc_delete_attachment", "emev_nc_delete_attachments",
+                                                   att_list->next == NULL), filename);
+               confirmation_dialog = hildon_note_new_confirmation (GTK_WINDOW (window), message);
+               g_free (message);
                dialog_response = (gtk_dialog_run (GTK_DIALOG (confirmation_dialog))==GTK_RESPONSE_OK);
                gtk_widget_destroy (confirmation_dialog);
                if (!dialog_response) {

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index d415008..a4a6ff3 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -307,16 +307,15 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
        }
 
        /* Select message */
-       if (tny_list_get_length(header_list) > 1)
-               message = g_strdup(_("emev_nc_delete_messages"));
-       else {
+       if (tny_list_get_length(header_list) == 1) {
                iter = tny_list_create_iterator (header_list);
                header = TNY_HEADER (tny_iterator_get_current (iter));
                desc = g_strdup_printf ("%s", tny_header_get_subject (header)); 
-               message = g_strdup_printf(_("emev_nc_delete_message"), desc);
                g_object_unref (header);
                g_object_unref (iter);
        }
+       message = g_strdup_printf(ngettext("emev_nc_delete_message", "emev_nc_delete_messages", 
+                                          tny_list_get_length(header_list)), desc);
 
        /* Confirmation dialog */               
        response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
@@ -2750,17 +2749,13 @@ msgs_move_to_confirmation (GtkWindow *win,
                if (!modest_tny_folder_is_local_folder (src_folder)) {
                        const gchar *message;
                        
-                       if (tny_list_get_length (headers) == 1)
-                               if (has_retrieved_msgs (headers))
-                                       message = _("mcen_nc_move_retrieve");
-                               else
-                                       message = _("mcen_nc_move_header");
-                       else
-                               if (has_retrieved_msgs (headers))
-                                       message = _("mcen_nc_move_retrieves");
-                               else
-                                       message = _("mcen_nc_move_headers");
-                       
+                       if (has_retrieved_msgs (headers))
+                               message = ngettext ("mcen_nc_move_retrieve", "mcen_nc_move_retrieves",
+                                                   tny_list_get_length (headers));
+                       else 
+                               message = ngettext ("mcen_nc_move_header", "mcen_nc_move_headers",
+                                                   tny_list_get_length (headers));
+
                        response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
                                                                            (const gchar *) message);
                }