git.iko.soy/searx
on master help sign in
fix after rebase
97351a2Noémi Ványi
searx/engines/wikipedia.py+1−1
compare with master
unifiedsplit
@@ -32,7 +32,7 @@ supported_languages_url = 'https://meta.wikimedia.org/wiki/List_of_Wikipedias'
32# set language in base_url
32# set language in base_url
33def url_lang(lang):
33def url_lang(lang):
34 lang_pre = lang.split('-')[0]
34 lang_pre = lang.split('-')[0]
35− if lang_pre == 'all' or lang_pre not in supported_languages:
35+ if lang_pre == 'all' or lang_pre not in supported_languages and lang_pre not in language_aliases:
36 return 'en'
36 return 'en'
37 return match_language(lang, supported_languages, language_aliases).split('-')[0]
37 return match_language(lang, supported_languages, language_aliases).split('-')[0]
38
38
tests/unit/engines/test_wikipedia.py−3
@@ -26,15 +26,12 @@ class TestWikipediaEngine(SearxTestCase):
26 self.assertIn('Test_Query', params['url'])
26 self.assertIn('Test_Query', params['url'])
27 self.assertNotIn('test_query', params['url'])
27 self.assertNotIn('test_query', params['url'])
28
28
29−<<<<<<< HEAD
30 dicto['language'] = 'nb'
29 dicto['language'] = 'nb'
31 params = wikipedia.request(query, dicto)
30 params = wikipedia.request(query, dicto)
32 self.assertIn('no.wikipedia.org', params['url'])
31 self.assertIn('no.wikipedia.org', params['url'])
33−=======
34 dicto['language'] = 'all'
32 dicto['language'] = 'all'
35 params = wikipedia.request(query, dicto)
33 params = wikipedia.request(query, dicto)
36 self.assertIn('en', params['url'])
34 self.assertIn('en', params['url'])
37−>>>>>>> Revert "remove 'all' option from search languages"
38
35
39 dicto['language'] = 'xx'
36 dicto['language'] = 'xx'
40 params = wikipedia.request(query, dicto)
37 params = wikipedia.request(query, dicto)