373a66b · searx · git.iko.soy

git.iko.soy/searx

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.

commit373a66be3046bbb7deca20f08468cb5dea44eaf9 authorNicolas Gelot <nicofonk@gmail.com> dateThu 28 Mar 2019, 18:07 (8 years ago) parenta818d32

3 files changed+25−8

compare with master

unifiedsplit

searx/preferences.py+2−2 searx/settings.yml−1 searx/webapp.py+23−5

searx/preferences.py+2−2

@@ -243,8 +243,8 @@ class Preferences(object):

243243 super(Preferences, self).__init__()

244244

245245 self.key_value_settings = {'categories': MultipleChoiceSetting(['general'], choices=categories + ['none']),

246− 'language': SearchLanguageSetting(settings['search']['language'],

247− choices=LANGUAGE_CODES),

246+ 'language': SearchLanguageSetting(settings['ui']['default_locale'],

247+ choices=list(LANGUAGE_CODES) + ['']),

248248 'locale': EnumStringSetting(settings['ui']['default_locale'],

249249 choices=list(settings['locales'].keys()) + ['']),

250250 '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+23−5

@@ -152,7 +152,14 @@ outgoing_proxies = settings['outgoing'].get('proxies') or None

152152

153153@babel.localeselector

154154def get_locale():

155− locale = request.accept_languages.best_match(settings['locales'].keys())

155+ locale = "en-US"

156+

157+ for lang in request.headers.get("Accept-Language", locale).split(","):

158+ locale = match_language(lang, settings['locales'].keys(), fallback=None)

159+ if locale is not None:

160+ break

161+

162+ logger.debug("default locale from browser info is `%s`", locale)

156163

157164 if request.preferences.get_value('locale') != '':

158165 locale = request.preferences.get_value('locale')

@@ -164,6 +171,8 @@ def get_locale():

164171 if locale == 'zh_TW':

165172 locale = 'zh_Hant_TW'

166173

174+ logger.debug("selected locale is `%s`", locale)

175+

167176 return locale

168177

169178

@@ -342,7 +351,9 @@ def render(template_name, override_theme=None, **kwargs):

342351 if 'autocomplete' not in kwargs:

343352 kwargs['autocomplete'] = request.preferences.get_value('autocomplete')

344353

345− if get_locale() in rtl_locales and 'rtl' not in kwargs:

354+ locale = request.preferences.get_value('locale')

355+

356+ if locale in rtl_locales and 'rtl' not in kwargs:

346357 kwargs['rtl'] = True

347358

348359 kwargs['searx_version'] = VERSION_STRING

@@ -355,7 +366,7 @@ def render(template_name, override_theme=None, **kwargs):

355366 if 'current_language' not in kwargs:

356367 kwargs['current_language'] = match_language(request.preferences.get_value('language'),

357368 LANGUAGE_CODES,

358− fallback=settings['search']['language'])

369+ fallback=locale)

359370

360371 # override url_for function in templates

361372 kwargs['url_for'] = url_for_theme

@@ -423,6 +434,13 @@ def pre_request():

423434 logger.exception('invalid settings')

424435 request.errors.append(gettext('Invalid settings'))

425436

437+ # init search language and locale

438+ locale = get_locale()

439+ if not preferences.get_value("language"):

440+ preferences.parse_dict({"language": locale})

441+ if not preferences.get_value("locale"):

442+ preferences.parse_dict({"locale": locale})

443+

426444 # request.user_plugins

427445 request.user_plugins = []

428446 allowed_plugins = preferences.plugins.get_enabled()

@@ -593,7 +611,7 @@ def index():

593611 unresponsive_engines=result_container.unresponsive_engines,

594612 current_language=match_language(search_query.lang,

595613 LANGUAGE_CODES,

596− fallback=settings['search']['language']),

614+ fallback=request.preferences.get_value("language")),

597615 base_url=get_base_url(),

598616 theme=get_current_theme_name(),

599617 favicons=global_favicons[themes.index(get_current_theme_name())]

@@ -702,7 +720,7 @@ def preferences():

702720

703721 return render('preferences.html',

704722 locales=settings['locales'],

705− current_locale=get_locale(),

723+ current_locale=request.preferences.get_value("locale"),

706724 image_proxy=image_proxy,

707725 engines_by_category=categories,

708726 stats=stats,