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/duckduckgo.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'searx/engines/duckduckgo.py') diff --git a/searx/engines/duckduckgo.py b/searx/engines/duckduckgo.py index 2c5dc50d8..fb8f523ac 100644 --- a/searx/engines/duckduckgo.py +++ b/searx/engines/duckduckgo.py @@ -54,6 +54,9 @@ content_xpath = './/a[@class="result__snippet"]' # match query's language to a region code that duckduckgo will accept def get_region_code(lang, lang_list=[]): + if lang == 'all': + return None + lang_code = match_language(lang, lang_list, language_aliases, 'wt-WT') lang_parts = lang_code.split('-') @@ -61,7 +64,6 @@ def get_region_code(lang, lang_list=[]): return lang_parts[1].lower() + '-' + lang_parts[0].lower() -# do search-request def request(query, params): if params['time_range'] and params['time_range'] not in time_range_dict: return params @@ -69,8 +71,12 @@ def request(query, params): offset = (params['pageno'] - 1) * 30 region_code = get_region_code(params['language'], supported_languages) - params['url'] = url.format( - query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=offset) + if region_code: + params['url'] = url.format( + query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=offset) + else: + params['url'] = url.format( + query=urlencode({'q': query}), offset=offset, dc_param=offset) if params['time_range'] in time_range_dict: params['url'] += time_range_url.format(range=time_range_dict[params['time_range']]) -- cgit v1.2.3