[nanny] Some i18n gtk.Builder bugfixes

[Roberto Majadas <telemaco src gnome org>]

commit 8dbe30ba67c8cb0d90c0295b73c4c13de6422d39
Author: Roberto Majadas <roberto majadas openshine com>
Date:   Wed Feb 10 02:35:21 2010 +0100

    Some i18n gtk.Builder bugfixes

 client/common/src/Categories.py       |    6 +++---
 client/common/src/Utils.py            |   32 ++++++++++++++++++++++----------
 client/gnome/admin/src/__init__.py.in |   13 ++++++++-----
 configure.ac                          |    2 +-
 4 files changed, 34 insertions(+), 19 deletions(-)
---
diff --git a/client/common/src/Categories.py b/client/common/src/Categories.py
index 4f40dd2..ffe4207 100644
--- a/client/common/src/Categories.py
+++ b/client/common/src/Categories.py
@@ -23,9 +23,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
 # USA
 
-import gettext
-import __builtin__
-__builtin__._ = gettext.gettext
+#import gettext
+#import __builtin__
+#__builtin__._ = gettext.gettext
 
 category_strings = {
     # To translators : This string is a category name or a category description
diff --git a/client/common/src/Utils.py b/client/common/src/Utils.py
index 600ea34..54be3fe 100644
--- a/client/common/src/Utils.py
+++ b/client/common/src/Utils.py
@@ -27,13 +27,25 @@ import os
 import gtk
 
 def ui_magic(object, ui_file, prefix):
-    main_ui_filename = ui_file
-    object.xml = gtk.Builder ()
-    object.xml.add_from_file (main_ui_filename)
-    objects = object.xml.get_objects()
-    for content in objects:
-        if isinstance (content, gtk.Widget):
-            widget_name = content.get_name ()
-            if widget_name.startswith (prefix):
-                widget_name = widget_name[len(prefix)+1:]
-                exec ('object.%s = content' % widget_name)
+     main_ui_filename = ui_file
+     object.xml = gtk.Builder ()
+     object.xml.add_from_file (main_ui_filename)
+     objects = object.xml.get_objects()
+     for content in objects:
+          try:
+               if isinstance(content, gtk.Label):
+                    content.set_markup(_(content.get_label()))
+               elif isinstance(content, gtk.Button):
+                    content.set_label(_(content.get_label()))
+               else:
+                    content.set_text(_(content.get_text()))
+                    
+          except AttributeError:
+               pass
+          
+          if isinstance (content, gtk.Widget):
+               widget_name = content.get_name ()
+               if widget_name.startswith (prefix):
+                    widget_name = widget_name[len(prefix)+1:]
+                    exec ('object.%s = content' % widget_name)
+                    
diff --git a/client/gnome/admin/src/__init__.py.in b/client/gnome/admin/src/__init__.py.in
index 62a04e8..25acb5b 100644
--- a/client/gnome/admin/src/__init__.py.in
+++ b/client/gnome/admin/src/__init__.py.in
@@ -27,18 +27,21 @@
 import os
 import gtk
 import gettext
-
-from AdminConsole import AdminConsole
-from ConfigureProxyDialog import ConfigureProxyDialog
-from ScheduleCalendar import ScheduleCalendar
-from BlacklistManager import BlacklistManager
+import __builtin__
 
 share_files_dir= os.path.join("@prefix@","share/","nanny/client/gnome/admin/")
 ui_files_dir= os.path.join(share_files_dir,"ui/")
 icons_files_dir= os.path.join(share_files_dir,"icons/")
 
+__builtin__._ = gettext.gettext
+
 GETTEXT_DOMAIN = 'nanny'
 locale_dir = os.path.join("@prefix@", "share/" ,"locale/")
 
 gettext.bindtextdomain(GETTEXT_DOMAIN, locale_dir)
 gettext.textdomain(GETTEXT_DOMAIN)
+
+from AdminConsole import AdminConsole
+from ConfigureProxyDialog import ConfigureProxyDialog
+from ScheduleCalendar import ScheduleCalendar
+from BlacklistManager import BlacklistManager
diff --git a/configure.ac b/configure.ac
index a863e65..c8a0d56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,7 +173,7 @@ AM_CONDITIONAL(NANNY_INIT_SCRIPTS_DEBIAN, test x$with_init_scripts = xdebian)
 dnl *******************************
 dnl Internationalization
 dnl *******************************
-GETTEXT_PACKAGE=gnome-nanny
+GETTEXT_PACKAGE=nanny
 AC_DEFINE(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", "nanny")
 AC_SUBST(GETTEXT_PACKAGE)
 GNOME_DOC_INIT