fix after rebase

searx/engines/wikipedia.py

@@ -32,7 +32,7 @@ supported_languages_url = 'https://meta.wikimedia.org/wiki/List_of_Wikipedias'
 # set language in base_url
 def url_lang(lang):
     lang_pre = lang.split('-')[0]
-    if lang_pre == 'all' or lang_pre not in supported_languages:
+    if lang_pre == 'all' or lang_pre not in supported_languages and lang_pre not in language_aliases:
         return 'en'
     return match_language(lang, supported_languages, language_aliases).split('-')[0]
 

tests/unit/engines/test_wikipedia.py

@@ -26,15 +26,12 @@ class TestWikipediaEngine(SearxTestCase):
         self.assertIn('Test_Query', params['url'])
         self.assertNotIn('test_query', params['url'])
 
-<<<<<<< HEAD
         dicto['language'] = 'nb'
         params = wikipedia.request(query, dicto)
         self.assertIn('no.wikipedia.org', params['url'])
-=======
         dicto['language'] = 'all'
         params = wikipedia.request(query, dicto)
         self.assertIn('en', params['url'])
->>>>>>> Revert "remove 'all' option from search languages"
 
         dicto['language'] = 'xx'
         params = wikipedia.request(query, dicto)