Handle locale.setlocale error.

sebastinas · sebastinas · commit c83f10aa7ad6 · 2012-07-16T17:24:52.000+02:00
If locale.setlocale throws an exception this most probably means that the users environment is fucked up. In this case an error message is printed to stderr and the C locale is used as fallback. This is not an optimal solution at all since the user might see the error message only after he quit bpython. It seems to be common to fall back to the C locale and continue as if nothing has happened, so we do the same. Closes: bpython#217
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1861,7 +1861,6 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
 
 
 def main(args=None, locals_=None, banner=None):
-    locale.setlocale(locale.LC_ALL, "")
     translations.init()
 
 
diff --git a/bpython/translations/__init__.py b/bpython/translations/__init__.py
@@ -1,12 +1,13 @@
 import gettext
+import locale
 import os.path
-from sys import version_info
+import sys
 
 from bpython import package_dir
 
 translator = None
 
-if version_info >= (3, 0):
+if sys.version_info >= (3, 0):
     def _(message):
         return translator.gettext(message)
 else:
@@ -15,6 +16,15 @@ def _(message):
 
 
 def init(locale_dir=None, languages=None):
+    try:
+        locale.setlocale(locale.LC_ALL, '')
+    except locale.Error:
+        # This means that the user's environment is broken. Let's just continue
+        # with the default C locale.
+        sys.stderr.write("Error: Your locale settings are not supported by "
+                         "the system. Using the fallback 'C' locale instead. "
+                         "Please fix your locale settings.\n")
+
     global translator
     if locale_dir is None:
         locale_dir = os.path.join(package_dir, 'translations')
diff --git a/bpython/translations/de/LC_MESSAGES/bpython.po b/bpython/translations/de/LC_MESSAGES/bpython.po
@@ -26,7 +26,7 @@ msgstr ""
 
 #: bpython/args.py:63
 msgid "Use CONFIG instead of default config file."
-msgstr ""
+msgstr "Verwende CONFIG antatt der standardmäßigen Konfigurationsdatei."
 
 #: bpython/args.py:65
 msgid "Drop to bpython shell after running file instead of exiting."
@@ -38,7 +38,7 @@ msgstr ""
 
 #: bpython/args.py:70
 msgid "Print version and exit."
-msgstr ""
+msgstr "Zeige Versionsinformationen an und beende."
 
 #: bpython/cli.py:303 bpython/urwid.py:550
 msgid "y"
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -1098,7 +1098,6 @@ def tab(self, back=False):
             self._completion_update_suppressed = False
 
 def main(args=None, locals_=None, banner=None):
-    locale.setlocale(locale.LC_ALL, "")
     translations.init()
 
     # TODO: maybe support displays other than raw_display?

Original file line number	Diff line number	Diff line change
`@@ -1861,7 +1861,6 @@ def main_curses(scr, args, config, interactive=True, locals_=None,`
`1861`	`1861`
`1862`	`1862`
`1863`	`1863`	`def main(args=None, locals_=None, banner=None):`
`1864`		`- locale.setlocale(locale.LC_ALL, "")`
`1865`	`1864`	`translations.init()`
`1866`	`1865`
`1867`	`1866`