meld r1002 - trunk

[stevek svn gnome org]

Author: stevek
Date: Thu Jun 19 22:42:20 2008
New Revision: 1002
URL: http://svn.gnome.org/viewvc/meld?rev=1002&view=rev

Log:
Fix crasher i18n bug. Bug 527665 from Kai Willadsen

Modified:
   trunk/gnomeglade.py
   trunk/meld

Modified: trunk/gnomeglade.py
==============================================================================
--- trunk/gnomeglade.py	(original)
+++ trunk/gnomeglade.py	Thu Jun 19 22:42:20 2008
@@ -43,7 +43,7 @@
 
         Automatically connects signal handlers named 'on_*'.
         """
-        self.xml = gtk.glade.XML(file, root, gettext.textdomain(), override )
+        self.xml = gtk.glade.XML(file, root, typedict=override)
         handlers = {}
         for h in filter(lambda x:x.startswith("on_"), dir(self.__class__)):
             handlers[h] = getattr(self, h)

Modified: trunk/meld
==============================================================================
--- trunk/meld	(original)
+++ trunk/meld	Thu Jun 19 22:42:20 2008
@@ -33,14 +33,12 @@
 ]
 import paths
 import gettext
-import locale
 
 try:
-    locale.setlocale(locale.LC_ALL, '')
-    locale.bindtextdomain("meld", paths.locale_dir() )
+    gettext.bindtextdomain("meld", paths.locale_dir())
     gettext.textdomain("meld")
     gettext.install("meld", paths.locale_dir(), unicode=1)
-except (IOError,locale.Error), e:
+except IOError, e:
     # fake gettext until translations in place
     print "(meld): WARNING **: %s" % e
     __builtins__.__dict__["_"] = lambda x : x
@@ -76,6 +74,7 @@
 # pygtk version
 #
 import gtk
+import gtk.glade
 if gtk.pygtk_version < pygtkver:
     print _("Meld requires %s or higher.") % ("pygtk%s"%ver2str(pygtkver))
     print _("Due to incompatible API changes some functions may not operate as expected.")
@@ -87,6 +86,9 @@
     import warnings
     warnings.filterwarnings("ignore", category=DeprecationWarning)
 
+gtk.glade.bindtextdomain("meld", paths.locale_dir())
+gtk.glade.textdomain("meld")
+
 #
 # main
 #