Merge pull request #191 from zas/PICARD-539

PICARD-539: ensure we append preferred encoding to normalized locale
This commit is contained in:
Laurent Monin
2013-12-20 09:11:33 -08:00

View File

@@ -14,7 +14,7 @@ def setup_gettext(localedir, ui_language=None, logdebug=None):
os.environ['LANGUAGE'] = ''
os.environ['LANG'] = ui_language
try:
current_locale = locale.normalize(ui_language)
current_locale = locale.normalize(ui_language + '.' + locale.getpreferredencoding())
locale.setlocale(locale.LC_ALL, current_locale)
except:
pass