Few revisions about i18n.

mmaker · mmaker · commit 579393243e66 · 2010-08-26T16:36:19.000+02:00
Merge from Trundle bpython-i18n repo.
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -87,7 +87,9 @@ def formatvalue(self, value):
 
 
 class ExceptionDialog(gtk.MessageDialog):
-    def __init__(self, exc_type, exc_value, tb, text=_('An error occurred.')):
+    def __init__(self, exc_type, exc_value, tb, text=None):
+        if text is None:
+            text = _('An error occurred.')
         gtk.MessageDialog.__init__(self, buttons=gtk.BUTTONS_CLOSE,
                                    type=gtk.MESSAGE_ERROR,
                                    message_format=text)
@@ -110,9 +112,9 @@ class ExceptionManager(object):
     the exception's type, value, a traceback and a text to display as
     arguments.
     """
-    def __init__(self, DialogType, text=_('An error occurred.')):
+    def __init__(self, DialogType, text=None):
         self.DialogType = DialogType
-        self.text = text
+        self.text = text or _('An error occurred.')
 
     def __enter__(self):
         return self
@@ -765,9 +767,6 @@ def init_import_completion():
 
 
 def main(args=None):
-    import gettext
-    gettext.install('bpython')
-
     setlocale(LC_ALL, '')
 
     gtk_options = (_('gtk-specific options'),
diff --git a/setup.py b/setup.py
@@ -70,7 +70,7 @@ def initialize_options(self):
 
 cmdclass = dict(build_py=build_py,
                 build = build)
-# localization options: see i18n/README for more informations
+# localization options
 if using_translations:
     cmdclass['compile_catalog'] = compile_catalog
     cmdclass['extract_messages'] = extract_messages
