reenable startup logging
Bugfixes from refactoring and merge
This commit is contained in:
+14
-4
@@ -1,4 +1,4 @@
|
||||
from babel import Locale as LC
|
||||
from babel import Locale
|
||||
from babel import negotiate_locale
|
||||
from flask_babel import Babel
|
||||
from babel.core import UnknownLocaleError
|
||||
@@ -9,7 +9,7 @@ from . import logger
|
||||
log = logger.create()
|
||||
|
||||
babel = Babel()
|
||||
BABEL_TRANSLATIONS = set()
|
||||
|
||||
|
||||
@babel.localeselector
|
||||
def get_locale():
|
||||
@@ -23,8 +23,18 @@ def get_locale():
|
||||
if request.accept_languages:
|
||||
for x in request.accept_languages.values():
|
||||
try:
|
||||
preferred.append(str(LC.parse(x.replace('-', '_'))))
|
||||
preferred.append(str(Locale.parse(x.replace('-', '_'))))
|
||||
except (UnknownLocaleError, ValueError) as e:
|
||||
log.debug('Could not parse locale "%s": %s', x, e)
|
||||
|
||||
return negotiate_locale(preferred or ['en'], BABEL_TRANSLATIONS)
|
||||
return negotiate_locale(preferred or ['en'], get_available_translations())
|
||||
|
||||
|
||||
def get_user_locale_language(user_language):
|
||||
return Locale.parse(user_language).get_language_name(get_locale())
|
||||
|
||||
def get_available_locale():
|
||||
return [Locale('en')] + babel.list_translations()
|
||||
|
||||
def get_available_translations():
|
||||
return set(str(item) for item in get_available_locale())
|
||||
|
||||
Reference in New Issue
Block a user