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

Undo the fudge for tanslations failing on macOS as it causes another test to fail

Browse Source
This commit is contained in:
Kovid Goyal 2019-06-11 16:14:15 +05:30
parent 529033ff78
commit ed85704799
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
setup/translations.py
View File

@ -11,7 +11,7 @@ from collections import defaultdict
from locale import normalize as normalize_locale from locale import normalize as normalize_locale
from functools import partial from functools import partial
from setup import Command, __appname__, __version__, require_git_master, build_cache_dir, edit_file, dump_json, ispy3, isosx from setup import Command, __appname__, __version__, require_git_master, build_cache_dir, edit_file, dump_json, ispy3
from setup.parallel_build import parallel_check_output from setup.parallel_build import parallel_check_output
from polyglot.builtins import codepoint_to_chr, iteritems, range from polyglot.builtins import codepoint_to_chr, iteritems, range
is_ci = os.environ.get('CI', '').lower() == 'true' is_ci = os.environ.get('CI', '').lower() == 'true'
@ -508,14 +508,8 @@ class Translations(POT): # {{{
if l == 'en': if l == 'en':
t = get_language t = get_language
else: else:
try: t = getattr(get_iso639_translator(l), 'gettext' if ispy3 else 'ugettext')
t = getattr(get_iso639_translator(l), 'gettext' if ispy3 else 'ugettext') t = partial(get_iso_language, t)
t = partial(get_iso_language, t)
except Exception:
if is_ci and isosx:
t = get_language
else:
raise
lang_names[l] = {x: t(x) for x in dl} lang_names[l] = {x: t(x) for x in dl}
zi = ZipInfo('lang-names.json') zi = ZipInfo('lang-names.json')
zi.compress_type = ZIP_STORED zi.compress_type = ZIP_STORED