i18n: merge from Trundle repo.

mmaker · mmaker · commit 5361e2be68bb · 2010-08-26T18:20:48.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -37,7 +37,6 @@
 import unicodedata
 import errno
 
-from locale import LC_ALL, setlocale
 import locale
 from types import ModuleType
 
@@ -58,6 +57,7 @@
 from bpython.keys import key_dispatch
 
 # This for i18n
+from bpython import translations
 from bpython.translations import _
 
 from bpython import repl
@@ -1736,7 +1736,7 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
 def main(args=None, locals_=None, banner=None):
     global stdscr
 
-    setlocale(LC_ALL, '')
+    translations.init()
 
     config, options, exec_args = bpython.args.parse(args)
 
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -32,14 +32,14 @@
 import optparse
 import os
 import sys
-from locale import LC_ALL, getpreferredencoding, setlocale
+from locale import getpreferredencoding
 
 import gobject
 import gtk
 import pango
 from pygments.lexers import PythonLexer
 
-from bpython import importcompletion, repl
+from bpython import importcompletion, repl, translations
 from bpython.formatter import theme_map
 from bpython.translations import _
 import bpython.args
@@ -767,7 +767,7 @@ def init_import_completion():
 
 
 def main(args=None):
-    setlocale(LC_ALL, '')
+    translations.init()
 
     gtk_options = (_('gtk-specific options'),
                    _("Options specific to bpython's Gtk+ front end"),
diff --git a/bpython/translations/__init__.py b/bpython/translations/__init__.py
@@ -1,17 +1,20 @@
-import os.path
 import gettext
+from sys import version_info
 
-try:
-    translation = gettext.translation('bpython')
-except IOError:
-    # try to load .mo files created with babel on i18n/ dir
-    try:
-        translation = gettext.translation('bpython', 'i18n')
-    except IOError:
-        translation = None
 
-if translation is None:
-    def _(s):
-        return s
+translator = None
+
+if version_info >= (3, 0):
+    def _(message):
+        return translator.gettext(message)
 else:
-    _ = translation.ugettext
+    def _(message):
+        return translator.ugettext(message)
+
+
+def init(locale_dir=None, languages=None):
+    global translator
+    translator = gettext.translation('bpython', locale_dir, languages,
+                                     fallback=True)
+
+init()
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -44,7 +44,7 @@
 
 from pygments.token import Token
 
-from bpython import args as bpargs, repl
+from bpython import args as bpargs, repl, translations
 from bpython.formatter import theme_map
 from bpython.importcompletion import find_coroutine
 from bpython.translations import _
@@ -859,9 +859,7 @@ def tab(self, back=False):
             self._completion_update_suppressed = False
 
 def main(args=None, locals_=None, banner=None):
-    # Err, somewhat redundant. There is a call to this buried in urwid.util.
-    # That seems unfortunate though, so assume that's going away...
-    locale.setlocale(locale.LC_ALL, '')
+    translations.init()
 
     # TODO: maybe support displays other than raw_display?
     config, options, exec_args = bpargs.parse(args, (
