[FIX] try to set the locale to utf8 before using the preferred encoding
authorChristophe Simonis <christophe@tinyerp.com>
Thu, 5 Feb 2009 10:02:29 +0000 (11:02 +0100)
committerChristophe Simonis <christophe@tinyerp.com>
Thu, 5 Feb 2009 10:02:29 +0000 (11:02 +0100)
lp bug: https://launchpad.net/bugs/322432 fixed

bzr revid: christophe@tinyerp.com-20090205100229-igxb3dnne8e34evg

bin/tools/translate.py

index a935661..8670c30 100644 (file)
@@ -648,12 +648,16 @@ def trans_load_data(db_name, fileobj, fileformat, lang, strict=False, lang_name=
 def resetlocale():
     # locale.resetlocale is bugged with some locales. 
     loc = locale.getdefaultlocale()[0]
-    enc = locale.getpreferredencoding()
-    ln = locale._build_localename((loc, enc))
     try:
+        ln = locale._build_localename((loc, 'utf8'))
         locale.setlocale(locale.LC_ALL, ln)
     except locale.Error:
-        locale.setlocale(locale.LC_ALL, loc)
+        enc = locale.getpreferredencoding()
+        ln = locale._build_localename((loc, enc))
+        try:
+            locale.setlocale(locale.LC_ALL, ln)
+        except locale.Error:
+            locale.setlocale(locale.LC_ALL, loc)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: