From 373a66be3046bbb7deca20f08468cb5dea44eaf9 Mon Sep 17 00:00:00 2001 From: Nicolas Gelot Date: Thu, 28 Mar 2019 18:07:03 +0100 Subject: Fix locale and search language Locale and search language was always defined with english value. This patch inits the locale on `pre_request` in order to define the default value of locale and language preferences. Plus the `best_match` function provided by flask babel library did not work as expected. So the function `match_language` provided by searx is used to detect that the language from Accepted-Language header can be used in searx project. --- searx/preferences.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'searx/preferences.py') diff --git a/searx/preferences.py b/searx/preferences.py index acaa67f66..912e89c01 100644 --- a/searx/preferences.py +++ b/searx/preferences.py @@ -243,8 +243,8 @@ class Preferences(object): super(Preferences, self).__init__() self.key_value_settings = {'categories': MultipleChoiceSetting(['general'], choices=categories + ['none']), - 'language': SearchLanguageSetting(settings['search']['language'], - choices=LANGUAGE_CODES), + 'language': SearchLanguageSetting(settings['ui']['default_locale'], + choices=list(LANGUAGE_CODES) + ['']), 'locale': EnumStringSetting(settings['ui']['default_locale'], choices=list(settings['locales'].keys()) + ['']), 'autocomplete': EnumStringSetting(settings['search']['autocomplete'], -- cgit v1.2.3