Refactor translations from hildon-libs.

diff --git a/src/gtk/modest-platform.c b/src/gtk/modest-platform.c
index 7255013..c51a99f 100644 (file)
--- a/src/gtk/modest-platform.c
+++ b/src/gtk/modest-platform.c
@@ -858,7 +858,7 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
 
        result = modest_platform_run_folder_common_dialog (parent_window,
                                                           suggested_folder,
-                                                          _HL("ckdg_ti_new_folder"),
+                                                          _HL_TITLE_NEW_FOLDER,
                                                           _FM("ckdg_fi_new_folder_name"),
                                                           real_suggested_name,
                                                           TRUE,
@@ -884,8 +884,8 @@ modest_platform_run_rename_folder_dialog (ModestWindow *parent_window,
 
        return modest_platform_run_folder_common_dialog (gtk_widget_get_toplevel (GTK_WIDGET (parent_window)), 
                                                         parent_folder,
-                                                        _HL("ckdg_ti_rename_folder"),
-                                                        _HL("ckdg_fi_rename_name"),
+                                                        _HL_TITLE_RENAME_FOLDER,
+                                                        _HL_RENAME_NAME,
                                                         suggested_name,
                                                         TRUE,
                                                         FALSE,
@@ -1327,9 +1327,9 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name,
                GTK_BUTTONS_NONE,
                question);
        gtk_dialog_add_buttons (GTK_DIALOG (note),
-                               _HL("wdgt_bd_yes"),     GTK_RESPONSE_OK,
-                               _HL("wdgt_bd_view"),          GTK_RESPONSE_APPLY,   /* abusing this... */
-                               _HL("wdgt_bd_no"), GTK_RESPONSE_CANCEL,
+                               _HL_YES,     GTK_RESPONSE_OK,
+                               _HL_VIEW,          GTK_RESPONSE_APPLY,   /* abusing this... */
+                               _HL_NO, GTK_RESPONSE_CANCEL,
                                NULL, NULL);
 
        g_signal_connect (G_OBJECT(note), "response",

diff --git a/src/modest-datetime-formatter.c b/src/modest-datetime-formatter.c
index 8ce371a..b04ec34 100644 (file)
--- a/src/modest-datetime-formatter.c
+++ b/src/modest-datetime-formatter.c
@@ -272,7 +272,7 @@ modest_datetime_formatter_format_date (ModestDatetimeFormatter *self,
        switch (priv->current_format) {
        case DATETIME_FORMAT_12H:
        case DATETIME_FORMAT_24H:
-               format_string = _HL("wdgt_va_date");
+               format_string = _HL_DATE;
                break;
        case DATETIME_FORMAT_LOCALE:
                format_string = "%x";
@@ -308,10 +308,10 @@ modest_datetime_formatter_format_time (ModestDatetimeFormatter *self,
 
        switch (priv->current_format) {
        case DATETIME_FORMAT_12H:
-               format_string = is_pm?_HL("wdgt_va_12h_time_pm"):_HL("wdgt_va_12h_time_am");
+               format_string = is_pm?_HL_12H_TIME_PM:_HL_12H_TIME_AM;
                break;
        case DATETIME_FORMAT_24H:
-               format_string = _HL("wdgt_va_24h_time");
+               format_string = _HL_24H_TIME;
                break;
        case DATETIME_FORMAT_LOCALE:
                format_string = "%X";

diff --git a/src/modest-text-utils.h b/src/modest-text-utils.h
index 34050f8..e387c16 100644 (file)
--- a/src/modest-text-utils.h
+++ b/src/modest-text-utils.h
@@ -46,6 +46,51 @@
 #define _KR(str) dgettext("ke-recv",str)
 #define _UR(str) dgettext("osso-uri",str)
 
+#ifdef MODEST_TOOLKIT_HILDON2
+#define _HL_SAVE _HL("wdgt_bd_save")
+#define _HL_YES _HL("wdgt_bd_yes")
+#define _HL_NO _HL("wdgt_bd_no")
+#define _HL_VIEW _HL("wdgt_bd_view")
+#define _HL_TITLE_SORT _HL("ckdg_ti_sort")
+#define _HL_TITLE_NEW_FOLDER _HL("ckdg_ti_new_folder")
+#define _HL_TITLE_RENAME_FOLDER _HL("ckdg_ti_rename_folder")
+#define _HL_DATE _HL("wdgt_va_date")
+#define _HL_24H_TIME _HL("wdgt_va_24h_time")
+#define _HL_WEEK _HL("wdgt_va_week")
+#define _HL_DATE_MEDIUM _HL("wdgt_va_date_medium")
+#define _HL_12H_TIME_PM _HL("wdgt_va_12h_time_pm")
+#define _HL_12H_TIME_AM _HL("wdgt_va_12h_time_am")
+#define _HL_DONE _HL("wdgt_bd_done")
+#define _HL_DELETE _HL("wdgt_bd_delete")
+#define _HL_MOVE _HL("wdgt_bd_move")
+#define _HL_RENAME _HL("wdgt_bd_rename")
+#define _HL_IB_FIND_COMPLETE _HL("ckct_ib_find_search_complete")
+#define _HL_IB_FIND_NO_MATCHES _HL("ckct_ib_find_no_matches")
+#define _HL_IB_ZOOM _HL("wdgt_ib_zoom")
+#else
+#define _HL_SAVE _("Save")
+#define _HL_YES _("Yes")
+#define _HL_NO _("Yes")
+#define _HL_VIEW _("View")
+#define _HL_TITLE_SORT _("Sort")
+#define _HL_TITLE_NEW_FOLDER _("New folder")
+#define _HL_TITLE_RENAME_FOLDER _HL("Rename folder")
+#define _HL_RENAME_NAME _("Name")
+#define _HL_24H_TIME _("%H:%M")
+#define _HL_DATE _("%m/%d/%Y")
+#define _HL_WEEK _("%A")
+#define _HL_DATE_MEDIUM _("%e %B %Y")
+#define _HL_12H_TIME_PM _("%l:%M pm")
+#define _HL_12H_TIME_AM _("%l:%M am")
+#define _HL_DONE _("Done")
+#define _HL_DELETE _("Delete")
+#define _HL_MOVE _("Move")
+#define _HL_RENAME _("Rename")
+#define _HL_IB_FIND_COMPLETE _("Search complete")
+#define _HL_IB_FIND_NO_MATCHES _("No matches")
+#define _HL_IB_ZOOM _("Zoom %d")
+#endif
+
 /* Forbidden char arrays */
 extern const gchar account_title_forbidden_chars[];
 extern const gchar folder_name_forbidden_chars[];

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index f0c9d60..bb5b755 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -3420,7 +3420,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
                gtk_dialog_new_with_buttons (_("mail_ti_password_protected"),
                                             NULL,
                                             GTK_DIALOG_MODAL,
-                                            _HL("wdgt_bd_done"),
+                                            _HL_DONE,
                                             GTK_RESPONSE_ACCEPT,
                                             NULL);
        gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),

diff --git a/src/widgets/modest-compact-mail-header-view.c b/src/widgets/modest-compact-mail-header-view.c
index 8c45e07..3889a64 100644 (file)
--- a/src/widgets/modest-compact-mail-header-view.c
+++ b/src/widgets/modest-compact-mail-header-view.c
@@ -134,7 +134,7 @@ set_date_time (ModestCompactMailHeaderView *compact_mail_header)
                gchar date_buf[BUF_SIZE];
                GString *buffer = g_string_new ("");
 
-               modest_text_utils_strftime (date_buf, BUF_SIZE, _HL("wdgt_va_week"), priv->date_to_show);
+               modest_text_utils_strftime (date_buf, BUF_SIZE, _HL_WEEK, priv->date_to_show);
                buffer = g_string_append (buffer, date_buf);
                buffer = g_string_append_c (buffer, ' ');
                buffer = g_string_append_unichar (buffer, 0x2015);
@@ -144,7 +144,7 @@ set_date_time (ModestCompactMailHeaderView *compact_mail_header)
                gtk_label_set_text (GTK_LABEL (priv->time_label), buffer->str);
                g_string_free  (buffer, TRUE);
                buffer = g_string_new ("");
-               modest_text_utils_strftime (date_buf, BUF_SIZE, _HL("wdgt_va_date_medium"), priv->date_to_show);
+               modest_text_utils_strftime (date_buf, BUF_SIZE, _HL_DATE_MEDIUM, priv->date_to_show);
                buffer = g_string_append (buffer, date_buf);
 
                gtk_label_set_text (GTK_LABEL (priv->date_label), buffer->str);

diff --git a/src/widgets/modest-connection-specific-smtp-edit-window.c b/src/widgets/modest-connection-specific-smtp-edit-window.c
index 0d32636..0b3f815 100644 (file)
--- a/src/widgets/modest-connection-specific-smtp-edit-window.c
+++ b/src/widgets/modest-connection-specific-smtp-edit-window.c
@@ -489,7 +489,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
        gtk_widget_show (captioned);
 
        /* Add the button. Disabled by default */
-       gtk_dialog_add_button (GTK_DIALOG (self), _HL("wdgt_bd_save"), GTK_RESPONSE_OK);
+       gtk_dialog_add_button (GTK_DIALOG (self), _HL_SAVE, GTK_RESPONSE_OK);
        gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, FALSE);
 
        priv->is_dirty = FALSE;

diff --git a/src/widgets/modest-default-account-settings-dialog.c b/src/widgets/modest-default-account-settings-dialog.c
index 94fc744..d8f7e73 100644 (file)
--- a/src/widgets/modest-default-account-settings-dialog.c
+++ b/src/widgets/modest-default-account-settings-dialog.c
@@ -598,7 +598,7 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self,
        /* Delete button: */
        if (!priv->button_delete)
                priv->button_delete = gtk_dialog_add_button (GTK_DIALOG (self),
-                                                            _HL("wdgt_bd_delete"),
+                                                            _HL_DELETE,
                                                             RESPONSE_DELETE_DUMMY);
 
        /* Signature button: */
@@ -1114,7 +1114,7 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog
        gtk_widget_show (GTK_WIDGET (scrollable));
         
     /* Add the buttons: */
-       gtk_dialog_add_button (GTK_DIALOG(self), _HL("wdgt_bd_save"), GTK_RESPONSE_OK);
+       gtk_dialog_add_button (GTK_DIALOG(self), _HL_SAVE, GTK_RESPONSE_OK);
 
     gtk_window_set_default_size (GTK_WINDOW (self), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT);
 

diff --git a/src/widgets/modest-default-global-settings-dialog.c b/src/widgets/modest-default-global-settings-dialog.c
index fb336f0..f7c6c35 100644 (file)
--- a/src/widgets/modest-default-global-settings-dialog.c
+++ b/src/widgets/modest-default-global-settings-dialog.c
@@ -144,7 +144,7 @@ modest_default_global_settings_dialog_init (ModestDefaultGlobalSettingsDialog *s
        gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, 0);
 
        /* Add the buttons: */
-       gtk_dialog_add_button (GTK_DIALOG (self), _HL("wdgt_bd_save"), GTK_RESPONSE_OK);
+       gtk_dialog_add_button (GTK_DIALOG (self), _HL_SAVE, GTK_RESPONSE_OK);
 
        /* Set the default focusable widgets */
        g_object_set_data (G_OBJECT(ppriv->updating_page), DEFAULT_FOCUS_WIDGET,

diff --git a/src/widgets/modest-folder-window.c b/src/widgets/modest-folder-window.c
index e6c1ae7..e5c4986 100644 (file)
--- a/src/widgets/modest-folder-window.c
+++ b/src/widgets/modest-folder-window.c
@@ -425,21 +425,21 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
        modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), 
                                                  EDIT_MODE_COMMAND_DELETE,
                                                  _("mcen_ti_edit_folder_delete"), 
-                                                 _HL("wdgt_bd_delete"),
+                                                 _HL_DELETE,
                                                  GTK_TREE_VIEW (priv->folder_view),
                                                  GTK_SELECTION_SINGLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_delete_folder));
        modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), 
                                                  EDIT_MODE_COMMAND_MOVE,
                                                  _("mcen_ti_edit_move_folder"), 
-                                                 _HL("wdgt_bd_move"),
+                                                 _HL_MOVE,
                                                  GTK_TREE_VIEW (priv->folder_view),
                                                  GTK_SELECTION_SINGLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to)); 
        modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), 
                                                  EDIT_MODE_COMMAND_RENAME,
                                                  _("mcen_ti_edit_rename_folder"), 
-                                                 _HL("wdgt_bd_rename"),
+                                                 _HL_RENAME,
                                                  GTK_TREE_VIEW (priv->folder_view),
                                                  GTK_SELECTION_SINGLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_rename_folder));

diff --git a/src/widgets/modest-header-window.c b/src/widgets/modest-header-window.c
index 1361522..aeab0bb 100644 (file)
--- a/src/widgets/modest-header-window.c
+++ b/src/widgets/modest-header-window.c
@@ -630,7 +630,7 @@ create_header_view (ModestWindow *self, TnyFolder *folder)
 
        /* Create CSM menu */
        priv->csm_menu = gtk_menu_new ();
-       delete_item = gtk_menu_item_new_with_label (_HL("wdgt_bd_delete"));
+       delete_item = gtk_menu_item_new_with_label (_HL_DELETE);
        mark_read_item = gtk_menu_item_new_with_label (_("mcen_me_inbox_mark_as_read"));
        mark_unread_item = gtk_menu_item_new_with_label (_("mcen_me_inbox_mark_as_unread"));
        gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), delete_item);
@@ -829,12 +829,12 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc
        /* setup edit modes */
 #ifdef MODEST_TOOLKIT_HILDON2
        modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE,
-                                                 _("mcen_ti_edit_delete"), _HL("wdgt_bd_delete"),
+                                                 _("mcen_ti_edit_delete"), _HL_DELETE,
                                                  GTK_TREE_VIEW (priv->header_view),
                                                  GTK_SELECTION_MULTIPLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_delete_message));
        modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE,
-                                                 _("mcen_ti_edit_move"), _HL("wdgt_bd_move"),
+                                                 _("mcen_ti_edit_move"), _HL_MOVE,
                                                  GTK_TREE_VIEW (priv->header_view),
                                                  GTK_SELECTION_MULTIPLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to));

diff --git a/src/widgets/modest-msg-edit-window.c b/src/widgets/modest-msg-edit-window.c
index 035d5ba..f8dcb8b 100644 (file)
--- a/src/widgets/modest-msg-edit-window.c
+++ b/src/widgets/modest-msg-edit-window.c
@@ -3885,14 +3885,14 @@ modest_msg_edit_window_isearch_toolbar_search (GtkWidget *widget,
                result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search, 
                                                                   &match_start, &match_end);
                if (!result)
-                       modest_platform_system_banner (NULL, NULL, _HL("ckct_ib_find_search_complete"));
+                       modest_platform_system_banner (NULL, NULL, _HL_IB_FIND_COMPLETE);
        } else {
                GtkTextIter buffer_start;
                gtk_text_buffer_get_start_iter (priv->text_buffer, &buffer_start);
                result = gtk_text_iter_forward_search_insensitive (&buffer_start, current_search, 
                                                                   &match_start, &match_end);
                if (!result)
-                       modest_platform_system_banner (NULL, NULL, _HL("ckct_ib_find_no_matches"));
+                       modest_platform_system_banner (NULL, NULL, _HL_IB_FIND_NO_MATCHES);
        }
 
        /* Mark as selected the string found in search */
@@ -4292,7 +4292,7 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window)
 
        dialog = gtk_dialog_new_with_buttons (_("mcen_me_message_settings"), NULL,
                                              GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                             _HL("wdgt_bd_done"), GTK_RESPONSE_ACCEPT, NULL);
+                                             _HL_DONE, GTK_RESPONSE_ACCEPT, NULL);
        vbox = gtk_vbox_new (FALSE, 0);
        align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
        gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE, 0);

diff --git a/src/widgets/modest-msg-view-window.c b/src/widgets/modest-msg-view-window.c
index 3882232..d7e3872 100644 (file)
--- a/src/widgets/modest-msg-view-window.c
+++ b/src/widgets/modest-msg-view-window.c
@@ -1599,7 +1599,7 @@ modest_msg_view_window_isearch_toolbar_search (GtkWidget *widget,
                                                     priv->last_search);
                if (!result) {
                        modest_platform_system_banner (NULL, NULL, 
-                                                       _HL("ckct_ib_find_no_matches"));
+                                                       _HL_IB_FIND_NO_MATCHES);
                        g_free (priv->last_search);
                        priv->last_search = NULL;
                } else {
@@ -1608,7 +1608,7 @@ modest_msg_view_window_isearch_toolbar_search (GtkWidget *widget,
        } else {
                if (!modest_isearch_view_search_next (MODEST_ISEARCH_VIEW (priv->msg_view))) {
                        modest_platform_system_banner (NULL, NULL, 
-                                                       _HL("ckct_ib_find_search_complete"));
+                                                       _HL_IB_FIND_COMPLETE);
                        g_free (priv->last_search);
                        priv->last_search = NULL;
                } else {
@@ -1677,7 +1677,7 @@ modest_msg_view_window_zoom_plus (ModestWindow *window)
 
        /* set zoom level */
        int_zoom = (gint) rint (zoom_level*100.0+0.1);
-       banner_text = g_strdup_printf (_HL("wdgt_ib_zoom"), int_zoom);
+       banner_text = g_strdup_printf (_HL_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);
@@ -1718,7 +1718,7 @@ modest_msg_view_window_zoom_minus (ModestWindow *window)
 
        /* set zoom level */
        int_zoom = (gint) rint (zoom_level*100.0+0.1);
-       banner_text = g_strdup_printf (_HL("wdgt_ib_zoom"), int_zoom);
+       banner_text = g_strdup_printf (_HL_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);

diff --git a/src/widgets/modest-signature-editor-dialog.c b/src/widgets/modest-signature-editor-dialog.c
index f442cf2..2dfd4bc 100644 (file)
--- a/src/widgets/modest-signature-editor-dialog.c
+++ b/src/widgets/modest-signature-editor-dialog.c
@@ -175,7 +175,7 @@ modest_signature_editor_dialog_init (ModestSignatureEditorDialog *self)
                          G_CALLBACK (text_buffer_end_user_action), self);
        
        /* Add the buttons: */
-       gtk_dialog_add_button (GTK_DIALOG (self), _HL("wdgt_bd_save"), GTK_RESPONSE_OK);
+       gtk_dialog_add_button (GTK_DIALOG (self), _HL_SAVE, GTK_RESPONSE_OK);
 
        align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
        gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, 0);