From 0d2c94f0603f493479f7131bf8a7e62c7a22950e Mon Sep 17 00:00:00 2001 From: bmng-dev Date: Fri, 8 Aug 2014 01:34:57 +0000 Subject: [PATCH] Fix l10n so getTranslationLanguage always returns a string --- src/l10n.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/l10n.py b/src/l10n.py index c04b5cdb..cab012bd 100644 --- a/src/l10n.py +++ b/src/l10n.py @@ -8,15 +8,19 @@ import shared #logger = logging.getLogger(__name__) logger = logging.getLogger('file_only') + +DEFAULT_ENCODING = 'ISO8859-1' +DEFAULT_LANGUAGE = 'en_US' + +encoding = DEFAULT_ENCODING +language = DEFAULT_LANGUAGE + try: import locale - encoding = locale.getpreferredencoding(False) - language = locale.getlocale()[0] or locale.getdefaultlocale()[0] + encoding = locale.getpreferredencoding(False) or DEFAULT_ENCODING + language = locale.getlocale()[0] or locale.getdefaultlocale()[0] or DEFAULT_LANGUAGE except: logger.exception('Could not determine language or encoding') - if not encoding: - encoding = 'ISO8859-1' - language = 'en_US' time_format = shared.config.get('bitmessagesettings', 'timeformat')