mirror of
https://github.com/janeczku/calibre-web
synced 2024-12-25 09:30:31 +00:00
Merge remote-tracking branch 'lang/patch-1'
This commit is contained in:
commit
013f7bf53e
@ -194,7 +194,13 @@ def get_locale():
|
||||
if user.nickname != 'Guest': # if the account is the guest account bypass the config lang settings
|
||||
return user.locale
|
||||
translations = [str(item) for item in babel.list_translations()] + ['en']
|
||||
preferred = [str(LC.parse(x.replace('-','_').replace('*','en'))) for x in request.accept_languages.values()]
|
||||
preferred = list()
|
||||
for x in request.accept_languages.values():
|
||||
try:
|
||||
preferred.append(str(LC.parse(x.replace('-', '_'))))
|
||||
except (UnknownLocaleError, ValueError) as e:
|
||||
app.logger.debug("Could not parse locale: %s", e)
|
||||
preferred.append('en')
|
||||
return negotiate_locale(preferred, translations)
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user