X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=calibre-locales.patch;h=f95f78472b7150dedb6f0cd5ddbe47ee433fb700;hb=HEAD;hp=01b6084bd402482b6f3025070fe96b6991d36343;hpb=394abe0728c4d8a1362d3786f2f7f84d72ec2d3d;p=packages%2Fcalibre.git diff --git a/calibre-locales.patch b/calibre-locales.patch index 01b6084..f95f784 100644 --- a/calibre-locales.patch +++ b/calibre-locales.patch @@ -1,25 +1,23 @@ ---- calibre/setup/translations.py.wiget 2013-12-06 05:13:34.000000000 +0100 -+++ calibre/setup/translations.py 2013-12-09 09:28:32.349958101 +0100 -@@ -143,7 +143,7 @@ class Translations(POT): # {{{ +diff -urNp -x '*.orig' calibre-4.20.0.org/setup/translations.py calibre-4.20.0/setup/translations.py +--- calibre-4.20.0.org/setup/translations.py 2020-07-03 04:11:13.000000000 +0200 ++++ calibre-4.20.0/setup/translations.py 2021-06-23 14:08:43.642418411 +0200 +@@ -304,12 +304,11 @@ class Translations(POT): # {{{ def mo_file(self, po_file): locale = os.path.splitext(os.path.basename(po_file))[0] - return locale, os.path.join(self.DEST, locale, 'messages.mo') + return locale, os.path.join(self.DEST, locale, 'LC_MESSAGES', 'messages.mo') - def run(self, opts): - self.iso639_errors = [] -@@ -174,7 +175,6 @@ class Translations(POT): # {{{ def run(self, opts): self.compile_main_translations() self.compile_content_server_translations() - self.freeze_locales() self.compile_user_manual_translations() - - def compile_group(self, files, handle_stats=None, file_ok=None, action_per_file=None): -@@ -198,15 +198,6 @@ class Translations(POT): # {{{ - # raise SystemExit(1) - rmap[msgstr] = msgid + self.compile_website_translations() + self.compile_changelog_translations() +@@ -539,15 +538,6 @@ class Translations(POT): # {{{ + zi.compress_type = ZIP_STORED if is_ci else ZIP_DEFLATED + zf.writestr(zi, raw) - def freeze_locales(self): - zf = self.DEST + '.zip' @@ -32,26 +30,15 @@ - @property def stats(self): - return self.j(self.d(self.DEST), 'stats.pickle') ---- calibre/src/calibre/translations/dynamic.py.wiget 2013-12-06 05:13:34.000000000 +0100 -+++ calibre/src/calibre/translations/dynamic.py 2013-12-09 09:28:32.349958101 +0100 -@@ -5,10 +5,10 @@ Dynamic language lookup of translations - __license__ = 'GPL v3' - __copyright__ = '2008, Marshall T. Vandegrift ' - -+import os - import io - from gettext import GNUTranslations - from calibre.utils.localization import get_lc_messages_path --from zipfile import ZipFile - - __all__ = ['translate'] - -@@ -21,15 +21,10 @@ def translate(lang, text): + return self.j(self.d(self.DEST), 'stats.calibre_msgpack') +diff -urNp -x '*.orig' calibre-4.20.0.org/src/calibre/translations/dynamic.py calibre-4.20.0/src/calibre/translations/dynamic.py +--- calibre-4.20.0.org/src/calibre/translations/dynamic.py 2020-07-03 04:11:13.000000000 +0200 ++++ calibre-4.20.0/src/calibre/translations/dynamic.py 2021-06-23 14:08:43.642418411 +0200 +@@ -24,15 +24,10 @@ def translate(lang, text): else: mpath = get_lc_messages_path(lang) if mpath is not None: -- with ZipFile(P('localization/locales.zip', +- with ZipFile(get_path('localization/locales.zip', - allow_user_override=False), 'r') as zf: - try: - buf = io.BytesIO(zf.read(mpath + '/messages.mo')) @@ -66,10 +53,11 @@ + _CACHE[lang] = trans if trans is None: return getattr(__builtins__, '_', lambda x: x)(text) - return trans.ugettext(text) ---- calibre/src/calibre/utils/localization.py.wiget 2013-12-06 05:13:34.000000000 +0100 -+++ calibre/src/calibre/utils/localization.py 2013-12-09 09:31:05.694326467 +0100 -@@ -74,21 +74,20 @@ def get_lang(): + return trans.gettext(text) +diff -urNp -x '*.orig' calibre-4.20.0.org/src/calibre/utils/localization.py calibre-4.20.0/src/calibre/utils/localization.py +--- calibre-4.20.0.org/src/calibre/utils/localization.py 2020-07-03 04:11:13.000000000 +0200 ++++ calibre-4.20.0/src/calibre/utils/localization.py 2021-06-23 14:08:43.642418411 +0200 +@@ -104,51 +104,42 @@ def is_rtl(): return get_lang()[:2].lower() in {'he', 'ar'} @@ -101,10 +89,9 @@ + return messages_path(hlang) + return None - _lang_trans = None -@@ -99,13 +99,14 @@ - _lang_trans = None + _lang_trans = _country_trans = None + def get_all_translators(): - from zipfile import ZipFile @@ -113,25 +100,20 @@ - mpath = get_lc_messages_path(lang) - if mpath is not None: - buf = io.BytesIO(zf.read(mpath + '/messages.mo')) -- yield lang, GNUTranslations(buf) + for lang in available_translations(): + mpath = get_lc_messages_path(lang) + if mpath is not None: + try: + buf = open(os.path.join(mpath, 'calibre.mo'), 'rb') -+ yield lang, GNUTranslations(buf) + yield lang, GNUTranslations(buf) + except: + pass - lcdata = { - u'abday': (u'Sun', u'Mon', u'Tue', u'Wed', u'Thu', u'Fri', u'Sat'), -@@ -134,20 +134,11 @@ - def get_single_translator(mpath, which='messages'): - from zipfile import ZipFile - with ZipFile(P('localization/locales.zip', allow_user_override=False), 'r') as zf: -- path = '{}/{}.mo'.format(mpath, which) +- path = f'{mpath}/{which}.mo' - data = zf.read(path) - buf = io.BytesIO(data) try: @@ -148,33 +130,39 @@ def get_iso639_translator(lang): -@@ -145,22 +145,21 @@ - buf = io.BytesIO(buf.getvalue()) - - if mpath is not None: -- from zipfile import ZipFile -- with ZipFile(P('localization/locales.zip', -- allow_user_override=False), 'r') as zf: -- if buf is None: -- buf = io.BytesIO(zf.read(mpath + '/messages.mo')) -+ if buf is None: -+ try: -+ buf = open(os.path.join(mpath, 'calibre.mo'), 'rb') -+ except: -+ pass # No translations for this lang - if mpath == 'nds': - mpath = 'de' -- isof = mpath + '/iso639.mo' +@@ -219,27 +210,25 @@ def translator_for_lang(lang): + buf = load_po(mpath + '.po') + + if mpath is not None: +- from zipfile import ZipFile +- with ZipFile(P('localization/locales.zip', +- allow_user_override=False), 'r') as zf: +- if buf is None: +- buf = io.BytesIO(zf.read(mpath + '/messages.mo')) ++ if buf is None: ++ try: ++ buf = open(os.path.join(mpath, 'calibre.mo'), 'rb') ++ except: ++ pass # No translations for this lang + if mpath == 'nds': + mpath = 'de' +- isof = mpath + '/iso639.mo' + try: +- iso639 = io.BytesIO(zf.read(isof)) ++ iso639 = open(os.path.join(mpath, 'calibre_iso639.mo'), 'rb') + except: + pass # No iso639 translations for this lang +- isof = mpath + '/iso3166.mo' + try: +- iso3166 = io.BytesIO(zf.read(isof)) ++ iso3166 = open(os.path.join(mpath, 'calibre_iso3166.mo'), 'rb') + except: + pass # No iso3166 translations for this lang + if buf is not None: + from calibre.utils.serialize import msgpack_loads try: -- iso639 = io.BytesIO(zf.read(isof)) -+ iso639 = open(os.path.join(mpath, 'calibre_iso639.mo'), 'rb') +- lcdata = msgpack_loads(zf.read(mpath + '/lcdata.calibre_msgpack')) ++ lcdata = msgpack_loads(open(os.path.join(mpath, '/lcdata.calibre_msgpack'))) except: - pass # No iso639 translations for this lang - if buf is not None: - from calibre.utils.serialize import msgpack_loads - try: -- lcdata = msgpack_loads(zf.read(mpath + '/lcdata.calibre_msgpack')) -+ lcdata = msgpack_loads(open(os.path.join(mpath, '/lcdata.calibre_msgpack'))) - except: - pass # No lcdata + pass # No lcdata