7c79eb9 · searx · git.iko.soy

git.iko.soy/searx

on master help sign in

Merge commit 'refs/pull/1621/head' of https://github.com/asciimoo/searx

7c79eb9Markus Heiser7 years ago

searx/preferences.py+2−2

compare with master

unifiedsplit

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

268 super(Preferences, self).__init__()

269

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

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

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

272− choices=LANGUAGE_CODES),

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

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

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

275 'autocomplete': EnumStringSetting(settings['search']['autocomplete'],

searx/settings.yml−1

@@ -5,7 +5,6 @@ general:

5search:

6 safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict

7 autocomplete : "" # Existing autocomplete backends: "dbpedia", "duckduckgo", "google", "startpage", "wikipedia" - leave blank to turn it off by default

8− language : "en-US"

9 ban_time_on_fail : 5 # ban time in seconds after engine errors

8 ban_time_on_fail : 5 # ban time in seconds after engine errors

10 max_ban_time_on_fail : 120 # max ban time in seconds after engine errors

9 max_ban_time_on_fail : 120 # max ban time in seconds after engine errors

searx/webapp.py+30−11

@@ -159,18 +159,28 @@ outgoing_proxies = settings['outgoing'].get('proxies') or None

159

160@babel.localeselector

161def 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+

162 if 'locale' in request.form\

174 if 'locale' in request.form\

163 and request.form['locale'] in settings['locales']:

175 and request.form['locale'] in settings['locales']:

164− return request.form['locale']

176+ locale = request.form['locale']

165

177

166− if 'locale' in request.args\

178+ if locale == 'zh_TW':

167− and request.args['locale'] in settings['locales']:

179+ locale = 'zh_Hant_TW'

168− return request.args['locale']

169

180

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

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

171− return request.preferences.get_value('locale')

172

182

173− return request.accept_languages.best_match(settings['locales'].keys())

183+ return locale

174

184

175

185

176# code-highlighter

186# code-highlighter

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

348 if 'autocomplete' not in kwargs:

358 if 'autocomplete' not in kwargs:

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

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

350

360

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

362+

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

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

352 kwargs['rtl'] = True

364 kwargs['rtl'] = True

353

365

354 kwargs['searx_version'] = VERSION_STRING

366 kwargs['searx_version'] = VERSION_STRING

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

361 if 'current_language' not in kwargs:

373 if 'current_language' not in kwargs:

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

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

363 LANGUAGE_CODES,

375 LANGUAGE_CODES,

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

376+ fallback=locale)

365

377

366 # override url_for function in templates

378 # override url_for function in templates

367 kwargs['url_for'] = url_for_theme

379 kwargs['url_for'] = url_for_theme

@@ -431,6 +443,13 @@ def pre_request():

431 logger.exception('invalid settings')

443 logger.exception('invalid settings')

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

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

433

445

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+

434 # request.user_plugins

453 # request.user_plugins

435 request.user_plugins = []

454 request.user_plugins = []

436 allowed_plugins = preferences.plugins.get_enabled()

455 allowed_plugins = preferences.plugins.get_enabled()

@@ -637,7 +656,7 @@ def index():

637 unresponsive_engines=result_container.unresponsive_engines,

656 unresponsive_engines=result_container.unresponsive_engines,

638 current_language=match_language(search_query.lang,

657 current_language=match_language(search_query.lang,

639 LANGUAGE_CODES,

658 LANGUAGE_CODES,

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

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

641 base_url=get_base_url(),

660 base_url=get_base_url(),

642 theme=get_current_theme_name(),

661 theme=get_current_theme_name(),

643 favicons=global_favicons[themes.index(get_current_theme_name())],

662 favicons=global_favicons[themes.index(get_current_theme_name())],

@@ -757,7 +776,7 @@ def preferences():

757

776

758 return render('preferences.html',

777 return render('preferences.html',

759 locales=settings['locales'],

778 locales=settings['locales'],

760− current_locale=get_locale(),

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

761 image_proxy=image_proxy,

780 image_proxy=image_proxy,

762 engines_by_category=engines_by_category,

781 engines_by_category=engines_by_category,

763 stats=stats,

782 stats=stats,