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

Another couple of ispy3

Browse Source
This commit is contained in:
Kovid Goyal 2019-12-19 15:57:41 +05:30
parent c4eedda5f2
commit 151fa406f6
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/translations/dynamic.py
View File

@ -8,7 +8,6 @@ __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
import io import io
from gettext import GNUTranslations from gettext import GNUTranslations
from calibre.constants import ispy3
from calibre.utils.localization import get_lc_messages_path from calibre.utils.localization import get_lc_messages_path
from zipfile import ZipFile from zipfile import ZipFile
@ -35,5 +34,4 @@ def translate(lang, text):
_CACHE[lang] = trans _CACHE[lang] = trans
if trans is None: if trans is None:
return getattr(__builtins__, '_', lambda x: x)(text) return getattr(__builtins__, '_', lambda x: x)(text)
f = getattr(trans, 'gettext' if ispy3 else 'ugettext') return trans.gettext(text)
return f(text)

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

@ -6,7 +6,7 @@ __license__ = 'GPL v3'
__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import os, locale, re, io, sys import os, locale, re, io
from gettext import GNUTranslations, NullTranslations from gettext import GNUTranslations, NullTranslations
from polyglot.builtins import iteritems, unicode_type from polyglot.builtins import iteritems, unicode_type
@ -402,8 +402,7 @@ def get_language(lang, gettext_func=None):
# re-translate # re-translate
return translate(_extra_lang_codes[lang]) return translate(_extra_lang_codes[lang])
if gettext_func is None: if gettext_func is None:
attr = 'gettext' if sys.version_info.major > 2 else 'ugettext' gettext_func = getattr(_lang_trans, 'gettext', translate)
gettext_func = getattr(_lang_trans, attr, translate)
return get_iso_language(gettext_func, lang) return get_iso_language(gettext_func, lang)