[Xfce4-commits] r29410 - in libxfcegui4/trunk: . libxfce4kbd-private

[Jannis Pohlmann]

Author: jannis
Date: 2009-01-29 21:18:06 +0000 (Thu, 29 Jan 2009)
New Revision: 29410

Modified:
   libxfcegui4/trunk/NEWS
   libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.c
   libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcuts.c
Log:
Call xfce_textdomain() in libxfce4kbd-private so that translations for
it actually used. This should fix bug #4784.

Modified: libxfcegui4/trunk/NEWS
===================================================================
--- libxfcegui4/trunk/NEWS	2009-01-29 20:50:40 UTC (rev 29409)
+++ libxfcegui4/trunk/NEWS	2009-01-29 21:18:06 UTC (rev 29410)
@@ -1,5 +1,6 @@
 4.6.0 (Xfce 4.6.0)
 ==================
+- Fix translations of libxfce4kbd-private not being used (Bug #4784).
 - Fix lib ageing (Bug #4864)
 
 4.5.99.1 (Xfce 4.6rc1)

Modified: libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.c
===================================================================
--- libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.c	2009-01-29 20:50:40 UTC (rev 29409)
+++ libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.c	2009-01-29 21:18:06 UTC (rev 29410)
@@ -159,6 +159,9 @@
 {
   GObjectClass *gobject_class;
 
+  /* Make sure to use the translations from libxfcegui4 */
+  xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+
   /* Determine parent type class */
   xfce_shortcut_dialog_parent_class = g_type_class_peek_parent (klass);
 

Modified: libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcuts.c
===================================================================
--- libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcuts.c	2009-01-29 20:50:40 UTC (rev 29409)
+++ libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcuts.c	2009-01-29 21:18:06 UTC (rev 29410)
@@ -84,6 +84,9 @@
   gint     response = GTK_RESPONSE_ACCEPT;
   gint     i;
 
+  /* Make sure to use the translations from libxfcegui4 */
+  xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+
   if (g_utf8_collate (owner, other) == 0 && ignore_same_provider)
     return GTK_RESPONSE_ACCEPT;
 
@@ -99,10 +102,10 @@
         owner_action_name = owner_action == NULL ? NULL : g_markup_escape_text (owner_action, -1);
         other_action_name = other_action == NULL ? NULL : g_markup_escape_text (other_action, -1);
 
-        secondary_text = g_strdup_printf (conflict_messages[i].message, other_action_name);
+        secondary_text = g_strdup_printf (_(conflict_messages[i].message), other_action_name);
 
-        owner_button_text = g_markup_printf_escaped (conflict_messages[i].owner_button_text, owner_action_name);
-        other_button_text = g_markup_printf_escaped (conflict_messages[i].other_button_text, other_action_name);
+        owner_button_text = g_markup_printf_escaped (_(conflict_messages[i].owner_button_text), owner_action_name);
+        other_button_text = g_markup_printf_escaped (_(conflict_messages[i].other_button_text), other_action_name);
 
         response = xfce_message_dialog (NULL, title, GTK_STOCK_DIALOG_QUESTION,
                                         title, secondary_text,