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/google.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/engines/google.py') diff --git a/searx/engines/google.py b/searx/engines/google.py index 62e7d1170..49d7f6499 100644 --- a/searx/engines/google.py +++ b/searx/engines/google.py @@ -166,7 +166,7 @@ def extract_text_from_dom(result, xpath): def request(query, params): offset = (params['pageno'] - 1) * 10 - language = match_language(params['language'], supported_languages) + language = match_language(params['language'], supported_languages, language_aliases) language_array = language.split('-') if params['language'].find('-') > 0: country = params['language'].split('-')[1] -- cgit v1.2.3 From 0169b63e849d45b8d68e08dd324726cc61be5e46 Mon Sep 17 00:00:00 2001 From: Marc Abonce Seguin Date: Sun, 6 Jan 2019 21:31:45 -0600 Subject: [fix] fetch google's supported languages --- searx/engines/google.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'searx/engines/google.py') diff --git a/searx/engines/google.py b/searx/engines/google.py index 49d7f6499..7a4390fc6 100644 --- a/searx/engines/google.py +++ b/searx/engines/google.py @@ -381,10 +381,10 @@ def attributes_to_html(attributes): def _fetch_supported_languages(resp): supported_languages = {} dom = html.fromstring(resp.text) - options = dom.xpath('//table//td/font/label/span') + options = dom.xpath('//*[@id="langSec"]//input[@name="lr"]') for option in options: - code = option.xpath('./@id')[0][1:] - name = option.text.title() + code = option.xpath('./@value')[0].split('_')[-1] + name = option.xpath('./@data-name')[0].title() supported_languages[code] = {"name": name} return supported_languages -- 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/google.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'searx/engines/google.py') diff --git a/searx/engines/google.py b/searx/engines/google.py index 7a4390fc6..36ca7a116 100644 --- a/searx/engines/google.py +++ b/searx/engines/google.py @@ -166,7 +166,11 @@ def extract_text_from_dom(result, xpath): def request(query, params): offset = (params['pageno'] - 1) * 10 - language = match_language(params['language'], supported_languages, language_aliases) + if params['language'] == 'all' or params['language'] == 'en-US': + language = 'en-GB' + else: + language = match_language(params['language'], supported_languages, language_aliases) + language_array = language.split('-') if params['language'].find('-') > 0: country = params['language'].split('-')[1] -- cgit v1.2.3