git.iko.soy/searx
on master help sign in
Merge pull request #2531 from MarcAbonce/fix-browser-locale
1e35c3cAlexandre Flament
searx/webapp.py+6−5
compare with master
unifiedsplit
@@ -142,6 +142,7 @@ babel = Babel(app)
142
142
143rtl_locales = ['ar', 'arc', 'bcc', 'bqi', 'ckb', 'dv', 'fa', 'fa_IR', 'glk', 'he',
143rtl_locales = ['ar', 'arc', 'bcc', 'bqi', 'ckb', 'dv', 'fa', 'fa_IR', 'glk', 'he',
144 'ku', 'mzn', 'pnb', 'ps', 'sd', 'ug', 'ur', 'yi']
144 'ku', 'mzn', 'pnb', 'ps', 'sd', 'ug', 'ur', 'yi']
145+ui_locale_codes = [l.replace('_', '-') for l in settings['locales'].keys()]
145
146
146# used when translating category names
147# used when translating category names
147_category_names = (gettext('files'),
148_category_names = (gettext('files'),
@@ -175,6 +176,9 @@ def _get_browser_or_settings_language(request, lang_list):
175 for lang in request.headers.get("Accept-Language", "en").split(","):
176 for lang in request.headers.get("Accept-Language", "en").split(","):
176 if ';' in lang:
177 if ';' in lang:
177 lang = lang.split(';')[0]
178 lang = lang.split(';')[0]
179+ if '-' in lang:
180+ lang_parts = lang.split('-')
181+ lang = "{}-{}".format(lang_parts[0], lang_parts[-1].upper())
178 locale = match_language(lang, lang_list, fallback=None)
182 locale = match_language(lang, lang_list, fallback=None)
179 if locale is not None:
183 if locale is not None:
180 return locale
184 return locale
@@ -194,13 +198,10 @@ def get_locale():
194 locale_source = 'preferences'
198 locale_source = 'preferences'
195 else:
199 else:
196 # use local from the browser
200 # use local from the browser
197− locale = _get_browser_or_settings_language(request, settings['locales'].keys())
201+ locale = _get_browser_or_settings_language(request, ui_locale_codes)
202+ locale = locale.replace('-', '_')
198 locale_source = 'browser'
203 locale_source = 'browser'
199
204
200− #
201− if locale == 'zh_TW':
202− locale = 'zh_Hant_TW'
203−
204 # see _get_translations function
205 # see _get_translations function
205 # and https://github.com/searx/searx/pull/1863
206 # and https://github.com/searx/searx/pull/1863
206 if locale == 'oc':
207 if locale == 'oc':
tests/unit/test_webapp.py+14
@@ -198,6 +198,20 @@ class ViewsTestCase(SearxTestCase):
198 result.data
198 result.data
199 )
199 )
200
200
201+ def test_browser_locale(self):
202+ result = self.app.get('/preferences', headers={'Accept-Language': 'zh-tw;q=0.8'})
203+ self.assertEqual(result.status_code, 200)
204+ self.assertIn(
205+ b'<option value="zh_TW" selected="selected">',
206+ result.data,
207+ 'Interface locale ignored browser preference.'
208+ )
209+ self.assertIn(
210+ b'<option value="zh-TW" selected="selected">',
211+ result.data,
212+ 'Search language ignored browser preference.'
213+ )
214+
201 def test_stats(self):
215 def test_stats(self):
202 result = self.app.get('/stats')
216 result = self.app.get('/stats')
203 self.assertEqual(result.status_code, 200)
217 self.assertEqual(result.status_code, 200)