diff options
Diffstat (limited to 'searx/webapp.py')
| -rwxr-xr-x | searx/webapp.py | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/searx/webapp.py b/searx/webapp.py index 85eb003a7..d7009b33e 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -109,7 +109,7 @@ from searx.flaskfix import patch_application from searx.autocomplete import search_autocomplete, backends as autocomplete_backends from searx.languages import language_codes as languages -from searx.locales import LOCALE_NAMES, UI_LOCALE_CODES, RTL_LOCALES +from searx.locales import LOCALE_NAMES, RTL_LOCALES from searx.search import SearchWithPlugins, initialize as search_initialize from searx.network import stream as http_stream, set_context_network_name from searx.search.checker import get_result as checker_get_result @@ -223,6 +223,12 @@ def get_locale(): if locale == 'oc': request.form['use-translation'] = 'oc' locale = 'fr_FR' + if locale == '': + # if there is an error loading the preferences + # the locale is going to be '' + locale = 'en' + # babel uses underscore instead of hyphen. + locale = locale.replace('-', '_') logger.debug("%s uses locale `%s`", urllib.parse.quote(request.url), locale) return locale @@ -240,6 +246,16 @@ def _get_browser_language(req, lang_list): return 'en' +def _get_locale_rfc5646(locale): + """Get locale name for <html lang="..."> + Chrom* browsers don't detect the language when there is a subtag (ie a territory). + For example "zh-TW" is detected but not "zh-Hant-TW". + This function returns a locale without the subtag. + """ + parts = locale.split('-') + return parts[0].lower() + '-' + parts[-1].upper() + + # code-highlighter @app.template_filter('code_highlighter') def code_highlighter(codelines, language=None): @@ -398,11 +414,6 @@ def _get_enable_categories(all_categories): return [x for x in all_categories if x in enabled_categories] -def get_locale_rfc5646(locale): - parts = locale.split('_') - return parts[0].lower() + '-' + parts[-1].upper() - - def render(template_name, override_theme=None, **kwargs): # values from the HTTP requests kwargs['endpoint'] = 'results' if 'q' in kwargs else request.endpoint @@ -425,7 +436,7 @@ def render(template_name, override_theme=None, **kwargs): kwargs['translations'] = json.dumps(get_translations(), separators=(',', ':')) locale = request.preferences.get_value('locale') - kwargs['locale_rfc5646'] = get_locale_rfc5646(locale) + kwargs['locale_rfc5646'] = _get_locale_rfc5646(locale) if locale in RTL_LOCALES and 'rtl' not in kwargs: kwargs['rtl'] = True @@ -519,8 +530,7 @@ def pre_request(): # locale is defined neither in settings nor in preferences # use browser headers if not preferences.get_value("locale"): - locale = _get_browser_language(request, UI_LOCALE_CODES) - locale = locale.replace('-', '_') + locale = _get_browser_language(request, LOCALE_NAMES.keys()) preferences.parse_dict({"locale": locale}) # request.user_plugins |