i18n: _() now imported from bpython.translations

mmaker · mmaker · commit 5de0725d654b · 2010-07-19T16:59:35.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -57,6 +57,9 @@
 # This for keys
 from bpython.keys import key_dispatch
 
+# This for i18n
+from bpython.translations import _
+
 from bpython import repl
 from bpython.pager import page
 import bpython.args
@@ -1724,9 +1727,6 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
 def main(args=None, locals_=None, banner=None):
     global stdscr
 
-    import gettext
-    gettext.install('bpython')
-
     setlocale(LC_ALL, '')
 
     config, options, exec_args = bpython.args.parse(args)
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -41,8 +41,10 @@
 
 from bpython import importcompletion, repl
 from bpython.formatter import theme_map
+from bpython.translations import _
 import bpython.args
 
+
 py3 = sys.version_info[0] == 3
 
 _COLORS = dict(b='blue', c='cyan', g='green', m='magenta', r='red',
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -47,6 +47,7 @@
 from bpython import args as bpargs, repl
 from bpython.formatter import theme_map
 from bpython.importcompletion import find_coroutine
+from bpython.translations import _
 
 import urwid
 
@@ -842,9 +843,6 @@ def tab(self, back=False):
             self._completion_update_suppressed = False
 
 def main(args=None, locals_=None, banner=None):
-    import gettext
-    gettext.install('bpython')
-
     # 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, '')
