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

Fix calibre not running on linux systems that set LANG to an empty string

Browse Source
This commit is contained in:
Kovid Goyal 2012-01-24 10:15:11 +05:30
parent d28ea799f2
commit c90199efc3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@ def get_lang():
from calibre.utils.config_base import prefs from calibre.utils.config_base import prefs
lang = prefs['language'] lang = prefs['language']
lang = os.environ.get('CALIBRE_OVERRIDE_LANG', lang) lang = os.environ.get('CALIBRE_OVERRIDE_LANG', lang)
if lang is not None: if lang:
return lang return lang
try: try:
lang = locale.getdefaultlocale(['LANGUAGE', 'LC_ALL', 'LC_CTYPE', lang = locale.getdefaultlocale(['LANGUAGE', 'LC_ALL', 'LC_CTYPE',
@ -45,7 +45,7 @@ def get_lang():
lang = match.group() lang = match.group()
if lang == 'zh': if lang == 'zh':
lang = 'zh_CN' lang = 'zh_CN'
if lang is None: if not lang:
lang = 'en' lang = 'en'
return lang return lang
@ -68,6 +68,8 @@ def set_translators():
# To test different translations invoke as # To test different translations invoke as
# CALIBRE_OVERRIDE_LANG=de_DE.utf8 program # CALIBRE_OVERRIDE_LANG=de_DE.utf8 program
lang = get_lang() lang = get_lang()
t = None
if lang: if lang:
buf = iso639 = None buf = iso639 = None
mpath = get_lc_messages_path(lang) mpath = get_lc_messages_path(lang)
@ -97,7 +99,6 @@ def set_translators():
except: except:
pass # No iso639 translations for this lang pass # No iso639 translations for this lang
t = None
if buf is not None: if buf is not None:
t = GNUTranslations(buf) t = GNUTranslations(buf)
if iso639 is not None: if iso639 is not None: