git.iko.soy/searx
on master help sign in
Merge pull request #1860 from MarcAbonce/fix-default-locale

Fix default locale and language issues

commit90d23e7ef6666408e4ad49841e89ca086568e5b1 authorMarkus Heiser <markus.heiser@darmarIT.de> dateSun 23 Feb 2020, 11:39 (7 years ago) parent2ade2cec0006ca
3 files changed+19−13
compare with master
unifiedsplit
searx/preferences.py+7−2 searx/settings.yml+1 searx/webapp.py+11−11
searx/preferences.py+7−2
@@ -4,6 +4,7 @@ from sys import version
44
55from searx import settings, autocomplete
66from searx.languages import language_codes as languages
7+from searx.utils import match_language
78from searx.url_utils import parse_qs, urlencode
89
910if version[0] == '3':
@@ -11,7 +12,7 @@ if version[0] == '3':
1112
1213
1314COOKIE_MAX_AGE = 60 * 60 * 24 * 365 * 5 # 5 years
14−LANGUAGE_CODES = [l[0].split('-')[0] for l in languages]
15+LANGUAGE_CODES = [l[0] for l in languages]
1516LANGUAGE_CODES.append('all')
1617DISABLED = 0
1718ENABLED = 1
@@ -132,6 +133,10 @@ class SetSetting(Setting):
132133class SearchLanguageSetting(EnumStringSetting):
133134 """Available choices may change, so user's value may not be in choices anymore"""
134135
136+ def _validate_selection(self, selection):
137+ if not match_language(selection, self.choices, fallback=None) and selection != "":
138+ raise ValidationException('Invalid language code: "{0}"'.format(selection))
139+
135140 def parse(self, data):
136141 if data not in self.choices and data != self.value:
137142 # hack to give some backwards compatibility with old language cookies
@@ -268,7 +273,7 @@ class Preferences(object):
268273 super(Preferences, self).__init__()
269274
270275 self.key_value_settings = {'categories': MultipleChoiceSetting(['general'], choices=categories + ['none']),
271− 'language': SearchLanguageSetting(settings['ui']['default_locale'],
276+ 'language': SearchLanguageSetting(settings['search']['default_lang'],
272277 choices=list(LANGUAGE_CODES) + ['']),
273278 'locale': EnumStringSetting(settings['ui']['default_locale'],
274279 choices=list(settings['locales'].keys()) + ['']),
searx/settings.yml+1
@@ -5,6 +5,7 @@ general:
55search:
66 safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict
77 autocomplete : "" # Existing autocomplete backends: "dbpedia", "duckduckgo", "google", "startpage", "wikipedia" - leave blank to turn it off by default
8+ default_lang : "" # Default search language - leave blank to detect from browser information or use codes from 'languages.py'
89 ban_time_on_fail : 5 # ban time in seconds after engine errors
910 max_ban_time_on_fail : 120 # max ban time in seconds after engine errors
1011
searx/webapp.py+11−11
@@ -157,14 +157,16 @@ _category_names = (gettext('files'),
157157outgoing_proxies = settings['outgoing'].get('proxies') or None
158158
159159
160+def _get_browser_language(request, lang_list):
161+ for lang in request.headers.get("Accept-Language", "en").split(","):
162+ locale = match_language(lang, lang_list, fallback=None)
163+ if locale is not None:
164+ return locale
165+
166+
160167@babel.localeselector
161168def get_locale():
162− locale = "en-US"
163−
164− for lang in request.headers.get("Accept-Language", locale).split(","):
165− locale = match_language(lang, settings['locales'].keys(), fallback=None)
166− if locale is not None:
167− break
169+ locale = _get_browser_language(request, settings['locales'].keys())
168170
169171 logger.debug("default locale from browser info is `%s`", locale)
170172
@@ -372,8 +374,7 @@ def render(template_name, override_theme=None, **kwargs):
372374 kwargs['language_codes'] = languages
373375 if 'current_language' not in kwargs:
374376 kwargs['current_language'] = match_language(request.preferences.get_value('language'),
375− LANGUAGE_CODES,
376− fallback=locale)
377+ LANGUAGE_CODES)
377378
378379 # override url_for function in templates
379380 kwargs['url_for'] = url_for_theme
@@ -444,11 +445,10 @@ def pre_request():
444445 request.errors.append(gettext('Invalid settings'))
445446
446447 # init search language and locale
447− locale = get_locale()
448448 if not preferences.get_value("language"):
449− preferences.parse_dict({"language": locale})
449+ preferences.parse_dict({"language": _get_browser_language(request, LANGUAGE_CODES)})
450450 if not preferences.get_value("locale"):
451− preferences.parse_dict({"locale": locale})
451+ preferences.parse_dict({"locale": get_locale()})
452452
453453 # request.user_plugins
454454 request.user_plugins = []