Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

localization: differentiate between C and not set Linux env. variables

Browse Source 
In case of e.g. LANG=hu_HU.UTF-8 and LC_MESSAGES=C, the expected
behavior is that the UI is English, not Hungarian.

The problem was that we did not differentiate between a not set
LC_MESSAGES and one that is set to C, as locale.getdefaultlocale()
returns None in both cases.
This commit is contained in:
Miklos Vajna 2017-12-08 22:35:45 +01:00 committed by Miklos Vajna
parent f66f9aced1
commit f333b208a4
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/utils/localization.py
View File

@ -45,8 +45,16 @@ def get_system_locale():
traceback.print_exc()
if lang is None:
try:
lang = locale.getdefaultlocale(['LANGUAGE', 'LC_ALL', 'LC_CTYPE',
'LC_MESSAGES', 'LANG'])[0]
envvars = ['LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LC_MESSAGES', 'LANG']
lang = locale.getdefaultlocale(envvars)[0]
# lang is None in two cases: either the environment variable is not
# set or it's "C". Stop looking for a language in the later case.
if lang is None:
for var in envvars:
if var in os.environ.keys() and os.environ[var] == 'C':
lang = 'en_US'
break
except:
pass # This happens on Ubuntu apparently
if lang is None and 'LANG' in os.environ: # Needed for OS X