on master help sign in
Merge commit 'refs/pull/1621/head' of https://github.com/asciimoo/searx

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

commit7c79eb9b1b05fa762c3896b92b97f624732e3673 authorMarkus Heiser <markus.heiser@darmarit.de> dateSat 8 Feb 2020, 15:08 (7 years ago) parent50b070c373a66b
3 files changed+32−14
searx/preferences.py+2−2 searx/settings.yml−1 searx/webapp.py+30−11
searx/preferences.py+2−2
@@ -268,8 +268,8 @@ class Preferences(object):
268268 super(Preferences, self).__init__()
269269
270270 self.key_value_settings = {'categories': MultipleChoiceSetting(['general'], choices=categories + ['none']),
271− 'language': SearchLanguageSetting(settings['search']['language'],
272− choices=LANGUAGE_CODES),
271+ 'language': SearchLanguageSetting(settings['ui']['default_locale'],
272+ choices=list(LANGUAGE_CODES) + ['']),
273273 'locale': EnumStringSetting(settings['ui']['default_locale'],
274274 choices=list(settings['locales'].keys()) + ['']),
275275 'autocomplete': EnumStringSetting(settings['search']['autocomplete'],
searx/settings.yml−1
@@ -5,7 +5,6 @@ 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− language : "en-US"
98 ban_time_on_fail : 5 # ban time in seconds after engine errors
109 max_ban_time_on_fail : 120 # max ban time in seconds after engine errors
1110
searx/webapp.py+30−11
@@ -159,18 +159,28 @@ outgoing_proxies = settings['outgoing'].get('proxies') or None
159159
160160@babel.localeselector
161161def 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
168+
169+ logger.debug("default locale from browser info is `%s`", locale)
170+
171+ if request.preferences.get_value('locale') != '':
172+ locale = request.preferences.get_value('locale')
173+
162174 if 'locale' in request.form\
163175 and request.form['locale'] in settings['locales']:
164− return request.form['locale']
176+ locale = request.form['locale']
165177
166− if 'locale' in request.args\
167− and request.args['locale'] in settings['locales']:
168− return request.args['locale']
178+ if locale == 'zh_TW':
179+ locale = 'zh_Hant_TW'
169180
170− if request.preferences.get_value('locale') != '':
171− return request.preferences.get_value('locale')
181+ logger.debug("selected locale is `%s`", locale)
172182
173− return request.accept_languages.best_match(settings['locales'].keys())
183+ return locale
174184
175185
176186# code-highlighter
@@ -348,7 +358,9 @@ def render(template_name, override_theme=None, **kwargs):
348358 if 'autocomplete' not in kwargs:
349359 kwargs['autocomplete'] = request.preferences.get_value('autocomplete')
350360
351− if get_locale() in rtl_locales and 'rtl' not in kwargs:
361+ locale = request.preferences.get_value('locale')
362+
363+ if locale in rtl_locales and 'rtl' not in kwargs:
352364 kwargs['rtl'] = True
353365
354366 kwargs['searx_version'] = VERSION_STRING
@@ -361,7 +373,7 @@ def render(template_name, override_theme=None, **kwargs):
361373 if 'current_language' not in kwargs:
362374 kwargs['current_language'] = match_language(request.preferences.get_value('language'),
363375 LANGUAGE_CODES,
364− fallback=settings['search']['language'])
376+ fallback=locale)
365377
366378 # override url_for function in templates
367379 kwargs['url_for'] = url_for_theme
@@ -431,6 +443,13 @@ def pre_request():
431443 logger.exception('invalid settings')
432444 request.errors.append(gettext('Invalid settings'))
433445
446+ # init search language and locale
447+ locale = get_locale()
448+ if not preferences.get_value("language"):
449+ preferences.parse_dict({"language": locale})
450+ if not preferences.get_value("locale"):
451+ preferences.parse_dict({"locale": locale})
452+
434453 # request.user_plugins
435454 request.user_plugins = []
436455 allowed_plugins = preferences.plugins.get_enabled()
@@ -637,7 +656,7 @@ def index():
637656 unresponsive_engines=result_container.unresponsive_engines,
638657 current_language=match_language(search_query.lang,
639658 LANGUAGE_CODES,
640− fallback=settings['search']['language']),
659+ fallback=request.preferences.get_value("language")),
641660 base_url=get_base_url(),
642661 theme=get_current_theme_name(),
643662 favicons=global_favicons[themes.index(get_current_theme_name())],
@@ -757,7 +776,7 @@ def preferences():
757776
758777 return render('preferences.html',
759778 locales=settings['locales'],
760− current_locale=get_locale(),
779+ current_locale=request.preferences.get_value("locale"),
761780 image_proxy=image_proxy,
762781 engines_by_category=engines_by_category,
763782 stats=stats,