From 1ac011673169fad8269369148f59f21c77aa57de Mon Sep 17 00:00:00 2001 From: huobos Date: Mon, 20 Feb 2017 21:56:58 +0000 Subject: [PATCH] Some more variables need marking for i18n Signed-off-by: Rob Norris --- src/uibuilder.c | 16 +++++++++++----- src/viklayerspanel.c | 4 ++-- src/vikwindow.c | 4 ++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/uibuilder.c b/src/uibuilder.c index 72547b0c..7131d352 100644 --- a/src/uibuilder.c +++ b/src/uibuilder.c @@ -32,6 +32,12 @@ VikLayerParamData vik_lpd_true_default ( void ) { return VIK_LPD_BOOLEAN ( TRUE ); } VikLayerParamData vik_lpd_false_default ( void ) { return VIK_LPD_BOOLEAN ( FALSE ); } +/** i18n note + * Since UI builder often uses static structures, the text is marked with N_() + * however to actually get it to apply the widget (e.g. to a label) then + * an additional call to _() needs to occur on that string + **/ + GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data ) { // Perform pre conversion if necessary @@ -62,7 +68,7 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data gchar **pstr = param->widget_data; rv = vik_combo_box_text_new (); while ( *pstr ) - vik_combo_box_text_append ( rv, *(pstr++) ); + vik_combo_box_text_append ( rv, _(*(pstr++)) ); if ( param->extra_widget_data ) /* map of alternate uint values for options */ { /* Set the effective default value */ @@ -88,9 +94,9 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data rv = gtk_combo_box_entry_new_text (); #endif if ( vlpd.s ) - vik_combo_box_text_append ( rv, vlpd.s ); + vik_combo_box_text_append ( rv, _(vlpd.s) ); while ( *pstr ) - vik_combo_box_text_append ( rv, *(pstr++) ); + vik_combo_box_text_append ( rv, _(*(pstr++)) ); if ( vlpd.s ) gtk_combo_box_set_active ( GTK_COMBO_BOX ( rv ), 0 ); } @@ -100,7 +106,7 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data gchar **pstr = param->widget_data; rv = GTK_WIDGET ( vik_combo_box_text_new () ); while ( *pstr ) - vik_combo_box_text_append ( rv, *(pstr++) ); + vik_combo_box_text_append ( rv, _(*(pstr++)) ); if ( vlpd.s ) { /* Set the effective default value */ @@ -223,7 +229,7 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data case VIK_LAYER_WIDGET_BUTTON: if ( param->type == VIK_LAYER_PARAM_PTR && param->widget_data ) { - rv = gtk_button_new_with_label ( param->widget_data ); + rv = gtk_button_new_with_label ( _(param->widget_data) ); g_signal_connect ( G_OBJECT(rv), "clicked", G_CALLBACK (vlpd.ptr), param->extra_widget_data ); } break; diff --git a/src/viklayerspanel.c b/src/viklayerspanel.c index 60ff221b..9c421b08 100644 --- a/src/viklayerspanel.c +++ b/src/viklayerspanel.c @@ -143,11 +143,11 @@ static GtkWidget* layers_panel_create_popup ( VikLayersPanel *vlp, gboolean full for ( ii = 0; ii < VIK_LAYER_NUM_TYPES; ii++ ) { if ( vik_layer_get_interface(ii)->icon ) { - menuitem = gtk_image_menu_item_new_with_mnemonic ( vik_layer_get_interface(ii)->name ); + menuitem = gtk_image_menu_item_new_with_mnemonic ( _(vik_layer_get_interface(ii)->name) ); gtk_image_menu_item_set_image ( (GtkImageMenuItem*)menuitem, gtk_image_new_from_pixbuf ( vik_layer_load_icon (ii) ) ); } else - menuitem = gtk_menu_item_new_with_mnemonic ( vik_layer_get_interface(ii)->name ); + menuitem = gtk_menu_item_new_with_mnemonic ( _(vik_layer_get_interface(ii)->name) ); lpnl[ii][0] = vlp; lpnl[ii][1] = GINT_TO_POINTER(ii); diff --git a/src/vikwindow.c b/src/vikwindow.c index bb2bc95d..2a513e4b 100644 --- a/src/vikwindow.c +++ b/src/vikwindow.c @@ -4702,7 +4702,7 @@ static void window_create_ui( VikWindow *window ) action.name = vik_layer_get_interface(i)->name; action.stock_id = vik_layer_get_interface(i)->name; - action.label = g_strdup_printf( _("New _%s Layer"), vik_layer_get_interface(i)->name); + action.label = g_strdup_printf( _("New _%s Layer"), _(vik_layer_get_interface(i)->name)); action.accelerator = vik_layer_get_interface(i)->accelerator; action.tooltip = NULL; action.callback = (GCallback)menu_addlayer_cb; @@ -4745,7 +4745,7 @@ static void window_create_ui( VikWindow *window ) // This is to avoid clashing with just the layer name used above for the tool actions action_dl.name = g_strconcat("Layer", vik_layer_get_interface(i)->fixed_layer_name, NULL); action_dl.stock_id = NULL; - action_dl.label = g_strconcat("_", vik_layer_get_interface(i)->name, "...", NULL); // Prepend marker for keyboard accelerator + action_dl.label = g_strconcat(_(vik_layer_get_interface(i)->name), _("..."), NULL); action_dl.accelerator = NULL; action_dl.tooltip = NULL; action_dl.callback = (GCallback)layer_defaults_cb; -- 2.39.5