From 5568f24d6ca9ae9a7eca27c107982b2689e40105 Mon Sep 17 00:00:00 2001 From: Marc Abonce Seguin Date: Sun, 25 Nov 2018 23:32:48 -0600 Subject: [fix] check language aliases when setting search language --- searx/engines/wikipedia.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/engines/wikipedia.py') diff --git a/searx/engines/wikipedia.py b/searx/engines/wikipedia.py index 6cd17e378..23f23db4d 100644 --- a/searx/engines/wikipedia.py +++ b/searx/engines/wikipedia.py @@ -31,7 +31,7 @@ supported_languages_url = 'https://meta.wikimedia.org/wiki/List_of_Wikipedias' # set language in base_url def url_lang(lang): - return match_language(lang, supported_languages).split('-')[0] + return match_language(lang, supported_languages, language_aliases).split('-')[0] # do search-request -- cgit v1.2.3 From b63d645a52d663036b97e31a59818d79faa4da81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Sun, 6 Jan 2019 15:27:46 +0100 Subject: Revert "remove 'all' option from search languages" This reverts commit 4d1770398a6af8902e75c0bd885781584d39e796. --- searx/engines/wikipedia.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'searx/engines/wikipedia.py') diff --git a/searx/engines/wikipedia.py b/searx/engines/wikipedia.py index 23f23db4d..39aec1c81 100644 --- a/searx/engines/wikipedia.py +++ b/searx/engines/wikipedia.py @@ -31,6 +31,9 @@ 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: + return 'en' return match_language(lang, supported_languages, language_aliases).split('-')[0] -- cgit v1.2.3 From 97351a2c725ce620d452c62da07379130bafdb95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Mon, 7 Jan 2019 21:28:58 +0100 Subject: fix after rebase --- searx/engines/wikipedia.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/engines/wikipedia.py') diff --git a/searx/engines/wikipedia.py b/searx/engines/wikipedia.py index 39aec1c81..4dae735d1 100644 --- a/searx/engines/wikipedia.py +++ b/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] -- cgit v1.2.3