From 96429111a11adc70d61be6349907c00b20e074d5 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 9 May 2019 16:17:12 +0530 Subject: [PATCH] Fix a regression in get_trnaslator d1f94b510c meant that English null translator was not being returned for lang when language included country code. --- src/calibre/utils/localization.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/calibre/utils/localization.py b/src/calibre/utils/localization.py index d7f89632cc..4ac0b13285 100644 --- a/src/calibre/utils/localization.py +++ b/src/calibre/utils/localization.py @@ -155,7 +155,7 @@ def get_translator(bcp_47_code): lang = {'pt':'pt_BR', 'zh':'zh_CN'}.get(lang, lang) available = available_translations() found = True - if lang == 'en': + if lang == 'en' or lang.startswith('en_'): return found, lang, NullTranslations() if lang not in available: lang = {'pt':'pt_BR', 'zh':'zh_CN'}.get(parts[0], parts[0]) @@ -164,6 +164,8 @@ def get_translator(bcp_47_code): if lang not in available: lang = 'en' found = False + if lang == 'en': + return True, lang, NullTranslations() return found, lang, get_single_translator(lang)