97351a2 · searx · git.iko.soy

fix after rebase

commit97351a2c725ce620d452c62da07379130bafdb95 authorNoémi Ványi <sitbackandwait@gmail.com> dateMon 7 Jan 2019, 21:28 (8 years ago) parentb63d645

2 files changed+1−4

unifiedsplit

searx/engines/wikipedia.py+1−1

@@ -32,7 +32,7 @@ supported_languages_url = 'https://meta.wikimedia.org/wiki/List_of_Wikipedias'

3232# set language in base_url

3333def url_lang(lang):

3434 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:

3636 return 'en'

3737 return match_language(lang, supported_languages, language_aliases).split('-')[0]

3838

tests/unit/engines/test_wikipedia.py−3

@@ -26,15 +26,12 @@ class TestWikipediaEngine(SearxTestCase):

2626 self.assertIn('Test_Query', params['url'])

2727 self.assertNotIn('test_query', params['url'])

2828

29−<<<<<<< HEAD

3029 dicto['language'] = 'nb'

3130 params = wikipedia.request(query, dicto)

3231 self.assertIn('no.wikipedia.org', params['url'])

33−=======

3432 dicto['language'] = 'all'

3533 params = wikipedia.request(query, dicto)

3634 self.assertIn('en', params['url'])

37−>>>>>>> Revert "remove 'all' option from search languages"

3835

3936 dicto['language'] = 'xx'

4037 params = wikipedia.request(query, dicto)