mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-31 15:23:02 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch '681/681-fix'

Browse Source
This commit is contained in:
Ozzieisaacs
2018-11-25 07:19:00 +01:00
parent 47424e5c1a e1b6fa25e9
commit b78130e3b1
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cps/web.py
View File

@@ -196,13 +196,8 @@ def get_locale():
if user is not None and hasattr(user, "locale"): if user is not None and hasattr(user, "locale"):
if user.nickname != 'Guest': # if the account is the guest account bypass the config lang settings if user.nickname != 'Guest': # if the account is the guest account bypass the config lang settings
return user.locale return user.locale
translations = [item.language for item in babel.list_translations()] + ['en'] translations = [str(item) for item in babel.list_translations()] + ['en']
preferred = [x.replace('-', '_') for x in request.accept_languages.values()] preferred = [str(LC.parse(x.replace('-','_'))) for x in request.accept_languages.values()]
# In the case of Simplified Chinese, Accept-Language is "zh-CN", while our translation of Simplified Chinese is "zh_Hans_CN".
# TODO: This is Not a good solution, should be improved.
if "zh_CN" in preferred:
return "zh_Hans_CN"
return negotiate_locale(preferred, translations) return negotiate_locale(preferred, translations)