Bitmessage/PyBitmessage-2024-12-17
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 52 Actions Packages Projects Releases 5 Wiki Activity

Fix l10n so getTranslationLanguage always returns a string #705

Merged
bmng-dev merged 2 commits from l10n-fix into master 2014-08-08 22:58:30 +02:00
Conversation 1 Commits 2 Files Changed 1 +9 -5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0d2c94f060 - Show all commits

14
src/l10n.py
View File

@ -8,15 +8,19 @@ import shared
#logger = logging.getLogger(__name__) #logger = logging.getLogger(__name__)
logger = logging.getLogger('file_only') logger = logging.getLogger('file_only')
DEFAULT_ENCODING = 'ISO8859-1'
DEFAULT_LANGUAGE = 'en_US'
encoding = DEFAULT_ENCODING
language = DEFAULT_LANGUAGE
try: try:
import locale import locale
encoding = locale.getpreferredencoding(False) encoding = locale.getpreferredencoding(False) or DEFAULT_ENCODING
language = locale.getlocale()[0] or locale.getdefaultlocale()[0] language = locale.getlocale()[0] or locale.getdefaultlocale()[0] or DEFAULT_LANGUAGE
except: except:
logger.exception('Could not determine language or encoding') logger.exception('Could not determine language or encoding')
if not encoding:
encoding = 'ISO8859-1'
language = 'en_US'
time_format = shared.config.get('bitmessagesettings', 'timeformat') time_format = shared.config.get('bitmessagesettings', 'timeformat')