From 6e4bf6403102d2a19c9a0ce88f5714d7315bc8fd Mon Sep 17 00:00:00 2001 From: Guilhem Bonnefille Date: Sat, 19 Oct 2013 22:48:57 +0200 Subject: [PATCH] Fix translatable string with variable argument A good practice in translation is to avoid to concat strings but use %s C format argument. This allow translators to decide where to put the argument in the translated string. --- src/viktrwlayer.c | 4 ++-- src/vikwindow.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c index 6621f084..8aa1ca98 100644 --- a/src/viktrwlayer.c +++ b/src/viktrwlayer.c @@ -3855,14 +3855,14 @@ static void trw_layer_add_menu_items ( VikTrwLayer *vtl, GtkMenu *menu, gpointer gtk_menu_shell_append (GTK_MENU_SHELL (export_submenu), item); gtk_widget_show ( item ); - gchar* external1 = g_strconcat ( _("Open with External Program_1: "), a_vik_get_external_gpx_program_1(), NULL ); + gchar* external1 = g_strdup_printf ( _("Open with External Program_1: %s"), a_vik_get_external_gpx_program_1() ); item = gtk_menu_item_new_with_mnemonic ( external1 ); g_free ( external1 ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(trw_layer_export_external_gpx_1), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (export_submenu), item); gtk_widget_show ( item ); - gchar* external2 = g_strconcat ( _("Open with External Program_2: "), a_vik_get_external_gpx_program_2(), NULL ); + gchar* external2 = g_strdup_printf ( _("Open with External Program_2: %s"), a_vik_get_external_gpx_program_2() ); item = gtk_menu_item_new_with_mnemonic ( external2 ); g_free ( external2 ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(trw_layer_export_external_gpx_2), pass_along ); diff --git a/src/vikwindow.c b/src/vikwindow.c index 1281a2ab..bf76c996 100644 --- a/src/vikwindow.c +++ b/src/vikwindow.c @@ -2842,7 +2842,7 @@ static gboolean export_to ( VikWindow *vw, GList *gl, VikFileType_t vft, const g // Show some progress if ( this_success ) { export_count++; - gchar *message = g_strconcat ( _("Exporting to file: "), fn, NULL ); + gchar *message = g_strdup_printf ( _("Exporting to file: %s"), fn ); vik_statusbar_set_message ( vw->viking_vs, VIK_STATUSBAR_INFO, message ); while ( gtk_events_pending() ) gtk_main_iteration (); -- 2.39.5