diff options
| author | Alexandre Flament <alex@al-f.net> | 2023-01-27 10:43:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-27 10:43:17 +0100 |
| commit | 28356f4284ad3cb20b908ee0867cd86389be5d1b (patch) | |
| tree | 20fbfbee15a02542768cad10daec17f21b79a9b8 /searx | |
| parent | 522ba9a14b7872d95e3ae61bc3a652b50100cc3d (diff) | |
| parent | 70fff2ebf1a04a35ea650bb2251c0e1ba43e5015 (diff) | |
Merge pull request #2115 from searxng/dependabot/pip/master/flask-babel-3.0.0
Bump flask-babel from 2.0.0 to 3.0.0
Diffstat (limited to 'searx')
| -rw-r--r-- | searx/locales.py | 2 | ||||
| -rwxr-xr-x | searx/webapp.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/searx/locales.py b/searx/locales.py index 8547e7fa7..9e06bf39d 100644 --- a/searx/locales.py +++ b/searx/locales.py @@ -86,7 +86,7 @@ def get_translations(): use_translation = flask.request.form.get('use-translation') if use_translation in ADDITIONAL_TRANSLATIONS: babel_ext = flask_babel.current_app.extensions['babel'] - return Translations.load(next(babel_ext.translation_directories), use_translation) + return Translations.load(babel_ext.translation_directories[0], use_translation) return _flask_babel_get_translations() diff --git a/searx/webapp.py b/searx/webapp.py index d4206ca16..d9ca3941c 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -160,8 +160,6 @@ app.jinja_env.add_extension('jinja2.ext.loopcontrols') # pylint: disable=no-mem app.jinja_env.filters['group_engines_in_tab'] = group_engines_in_tab # pylint: disable=no-member app.secret_key = settings['server']['secret_key'] -babel = Babel(app) - timeout_text = gettext('timeout') parsing_error_text = gettext('parsing error') http_protocol_error_text = gettext('HTTP protocol error') @@ -211,13 +209,15 @@ class ExtendedRequest(flask.Request): request = typing.cast(ExtendedRequest, flask.request) -@babel.localeselector def get_locale(): locale = localeselector() logger.debug("%s uses locale `%s`", urllib.parse.quote(request.url), locale) return locale +babel = Babel(app, locale_selector=get_locale) + + def _get_browser_language(req, lang_list): for lang in req.headers.get("Accept-Language", "en").split(","): if ';' in lang: |