Migrated hildon2 to text-utils dgettext macros

[modest] / src / hildon2 / modest-msg-view-window.c

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index 2c4a5f5..4a0f792 100644 (file)
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -1443,7 +1443,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
 
        if ((current_search == NULL) || (strcmp (current_search, "") == 0)) {
                g_free (current_search);
-               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ecdg_ib_find_rep_enter_text"));
+               hildon_banner_show_information (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text"));
                return;
        }
 
@@ -1454,7 +1454,8 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
                result = modest_isearch_view_search (MODEST_ISEARCH_VIEW (priv->msg_view),
                                                     priv->last_search);
                if (!result) {
-                       hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_no_matches"));
+                       hildon_banner_show_information (NULL, NULL, 
+                                                       _HL("ckct_ib_find_no_matches"));
                        g_free (priv->last_search);
                        priv->last_search = NULL;
                } else {
@@ -1463,7 +1464,8 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
                }
        } else {
                if (!modest_isearch_view_search_next (MODEST_ISEARCH_VIEW (priv->msg_view))) {
-                       hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_search_complete"));
+                       hildon_banner_show_information (NULL, NULL, 
+                                                       _HL("ckct_ib_find_search_complete"));
                        g_free (priv->last_search);
                        priv->last_search = NULL;
                } else {
@@ -1507,6 +1509,8 @@ modest_msg_view_window_zoom_plus (ModestWindow *window)
 {
        gdouble zoom_level;
        ModestMsgViewWindowPrivate *priv;
+       gint int_zoom;
+       gchar *banner_text;
      
        g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), 1.0);
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
@@ -1514,7 +1518,8 @@ modest_msg_view_window_zoom_plus (ModestWindow *window)
        zoom_level =  modest_zoomable_get_zoom (MODEST_ZOOMABLE (priv->msg_view));
 
        if (zoom_level >= 2.0) {
-               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_max_zoom_level_reached"));
+               hildon_banner_show_information (NULL, NULL, 
+                                               _CS("ckct_ib_max_zoom_level_reached"));
                return FALSE;
        } else if (zoom_level >= 1.5) {
                zoom_level = 2.0;
@@ -1531,7 +1536,10 @@ modest_msg_view_window_zoom_plus (ModestWindow *window)
        }
 
        /* set zoom level */
-       hildon_banner_show_information (NULL, NULL, _HL("wdgt_ib_zoom"));
+       int_zoom = (gint) rint (zoom_level*100.0+0.1);
+       banner_text = g_strdup_printf (_("wdgt_ib_zoom"), int_zoom);
+       modest_platform_information_banner (GTK_WIDGET (window), NULL, banner_text);
+       g_free (banner_text);
        modest_zoomable_set_zoom (MODEST_ZOOMABLE (priv->msg_view), zoom_level);
 
        return TRUE;
@@ -1542,6 +1550,8 @@ modest_msg_view_window_zoom_minus (ModestWindow *window)
 {
        gdouble zoom_level;
        ModestMsgViewWindowPrivate *priv;
+       gint int_zoom;
+       gchar *banner_text;
      
        g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), 1.0);
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
@@ -1549,7 +1559,8 @@ modest_msg_view_window_zoom_minus (ModestWindow *window)
        zoom_level =  modest_zoomable_get_zoom (MODEST_ZOOMABLE (priv->msg_view));
 
        if (zoom_level <= 0.5) {
-                         hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_min_zoom_level_reached"));
+               hildon_banner_show_information (NULL, NULL, 
+                                               _CS("ckct_ib_min_zoom_level_reached"));
                return FALSE;
        } else if (zoom_level <= 0.8) {
                zoom_level = 0.5;
@@ -1566,7 +1577,10 @@ modest_msg_view_window_zoom_minus (ModestWindow *window)
        }
 
        /* set zoom level */
-       hildon_banner_show_information (NULL, NULL, _HL("wdgt_ib_zoom"));
+       int_zoom = (gint) rint (zoom_level*100.0+0.1);
+       banner_text = g_strdup_printf (_("wdgt_ib_zoom"), int_zoom);
+       modest_platform_information_banner (GTK_WIDGET (window), NULL, banner_text);
+       g_free (banner_text);
        modest_zoomable_set_zoom (MODEST_ZOOMABLE (priv->msg_view), zoom_level);
 
        return TRUE;
@@ -2605,8 +2619,8 @@ idle_save_mime_part_show_result (SaveMimePartInfo *info)
                if (info->result == GNOME_VFS_OK) {
                        hildon_banner_show_information (NULL, NULL, _CS("sfil_ib_saved"));
                } else if (info->result == GNOME_VFS_ERROR_NO_SPACE) {
-                       hildon_banner_show_information (NULL, NULL, dgettext("ke-recv", 
-                                                                            "cerm_device_memory_full"));
+                       hildon_banner_show_information (NULL, NULL, 
+                                                       _KR("cerm_device_memory_full"));
                } else {
                        hildon_banner_show_information (NULL, NULL, _("mail_ib_file_operation_failed"));
                }
@@ -2699,7 +2713,7 @@ save_attachments_response (GtkDialog *dialog,
 
        if (!modest_utils_folder_writable (chooser_uri)) {
                hildon_banner_show_information 
-                       (NULL, NULL, dgettext("hildon-fm", "sfil_ib_readonly_location"));
+                       (NULL, NULL, _FM("sfil_ib_readonly_location"));
        } else {
                TnyIterator *iter;
 
@@ -2711,7 +2725,7 @@ save_attachments_response (GtkDialog *dialog,
                            !tny_mime_part_is_purged (mime_part) &&
                            (tny_mime_part_get_filename (mime_part) != NULL)) {
                                SaveMimePartPair *pair;
-                                       
+
                                pair = g_slice_new0 (SaveMimePartPair);
 
                                if (tny_list_get_length (mime_parts) > 1) {