Commit ff41775d authored by Ozzieisaacs's avatar Ozzieisaacs

Merge remote-tracking branch 'pwr/unpickle-iso-languages' into Develop

parents d04a78af 9f8cab99
#!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web) # This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
...@@ -18,14 +17,8 @@ ...@@ -18,14 +17,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import division, print_function, unicode_literals from __future__ import division, print_function, unicode_literals
import sys
import os
try:
import cPickle
except ImportError:
import pickle as cPickle
from .constants import TRANSLATIONS_DIR as _TRANSLATIONS_DIR from .iso_language_names import LANGUAGE_NAMES as _LANGUAGE_NAMES
try: try:
...@@ -54,16 +47,8 @@ except ImportError: ...@@ -54,16 +47,8 @@ except ImportError:
return _copy_fields(pyc_languages.get(name=name)) return _copy_fields(pyc_languages.get(name=name))
try:
with open(os.path.join(_TRANSLATIONS_DIR, 'iso639.pickle'), 'rb') as f:
_LANGUAGES = cPickle.load(f)
except cPickle.UnpicklingError as error:
print("Can't read file cps/translations/iso639.pickle: %s" % error)
sys.exit(1)
def get_language_names(locale): def get_language_names(locale):
return _LANGUAGES.get(locale) return _LANGUAGE_NAMES.get(locale)
def get_language_name(locale, lang_code): def get_language_name(locale, lang_code):
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment