[network-manager-openvpn/NM_0_8] ui: fix gtk_builder_set_translation_domain() calling



commit 27aa3d2ee1b883b5a75c73e4e28070f0c7e12d4c
Author: Ozan ÃaÄlayan <ozan pardus org tr>
Date:   Wed Aug 17 14:14:23 2011 +0300

    ui: fix gtk_builder_set_translation_domain() calling
    
    gtk_builder_set_translation_domain() should be called before
    gtk_builder_add_from_file(). This fixes UI messages always in English
    problem.

 properties/auth-helpers.c |    4 ++--
 properties/nm-openvpn.c   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
index 02655fd..0fb750d 100644
--- a/properties/auth-helpers.c
+++ b/properties/auth-helpers.c
@@ -1225,6 +1225,8 @@ advanced_dialog_new (GHashTable *hash, const char *contype)
 	ui_file = g_strdup_printf ("%s/%s", UIDIR, "nm-openvpn-dialog.ui");
 	builder = gtk_builder_new ();
 
+	gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
+
 	if (!gtk_builder_add_from_file (builder, ui_file, &error)) {
 		g_warning ("Couldn't load builder file: %s", error->message);
 		g_error_free (error);
@@ -1232,8 +1234,6 @@ advanced_dialog_new (GHashTable *hash, const char *contype)
 		goto out;
 	}
 
-	gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
-
 	dialog = GTK_WIDGET (gtk_builder_get_object (builder, "openvpn-advanced-dialog"));
 	if (!dialog) {
 		g_object_unref (G_OBJECT (builder));
diff --git a/properties/nm-openvpn.c b/properties/nm-openvpn.c
index 7fa645a..e69655b 100644
--- a/properties/nm-openvpn.c
+++ b/properties/nm-openvpn.c
@@ -553,6 +553,8 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
 	ui_file = g_strdup_printf ("%s/%s", UIDIR, "nm-openvpn-dialog.ui");
 	priv->builder = gtk_builder_new ();
 
+	gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE);
+
 	if (!gtk_builder_add_from_file (priv->builder, ui_file, error)) {
 		g_warning ("Couldn't load builder file: %s",
 		           error && *error ? (*error)->message : "(unknown)");
@@ -564,8 +566,6 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
 		return NULL;
 	}
 
-	gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE);
-
 	g_free (ui_file);
 
 	priv->widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "openvpn-vbox"));



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]