searx

commit: e6aaf20898240a6fdc97490f6d522e0ddb839a49
parent: 49b6206d6cbfdc19e2bb2c42e999fd7caa776a09
Author: Adam Tauber <asciimoo@gmail.com>
Date:   Fri, 20 Apr 2018 19:45:37 +0200

Merge pull request #1273 from MarcAbonce/google-hotfix

[fix] Force English results in Google when using en-US
Diffstat:
M
searx/engines/google.py
9
+++------
M
tests/unit/engines/test_google.py
5
++++-

2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/searx/engines/google.py b/searx/engines/google.py
@@ -91,7 +91,7 @@ url_map = 'https://www.openstreetmap.org/'\
 search_path = '/search'
 search_url = ('https://{hostname}' +
               search_path +
-              '?{query}&start={offset}&gws_rd=cr&gbv=1&lr={lang}&ei=x')
+              '?{query}&start={offset}&gws_rd=cr&gbv=1&lr={lang}&hl={lang_short}&ei=x')
 
 time_range_search = "&tbs=qdr:{range}"
 time_range_dict = {'day': 'd',
@@ -175,10 +175,6 @@ def request(query, params):
     else:
         country = 'US'
 
-    # temporary fix until a way of supporting en-US is found
-    if language == 'en-US':
-        country = 'GB'
-
     url_lang = 'lang_' + language
 
     if use_locale_domain:
@@ -191,7 +187,8 @@ def request(query, params):
     params['url'] = search_url.format(offset=offset,
                                       query=urlencode({'q': query}),
                                       hostname=google_hostname,
-                                      lang=url_lang)
+                                      lang=url_lang,
+                                      lang_short=language)
     if params['time_range'] in time_range_dict:
         params['url'] += time_range_search.format(range=time_range_dict[params['time_range']])
 
diff --git a/tests/unit/engines/test_google.py b/tests/unit/engines/test_google.py
@@ -26,16 +26,19 @@ class TestGoogleEngine(SearxTestCase):
         self.assertIn('url', params)
         self.assertIn(query, params['url'])
         self.assertIn('google.fr', params['url'])
+        self.assertIn('fr', params['url'])
         self.assertIn('fr', params['headers']['Accept-Language'])
 
         dicto['language'] = 'en-US'
         params = google.request(query, dicto)
-        self.assertIn('google.co', params['url'])
+        self.assertIn('google.com', params['url'])
+        self.assertIn('en', params['url'])
         self.assertIn('en', params['headers']['Accept-Language'])
 
         dicto['language'] = 'zh'
         params = google.request(query, dicto)
         self.assertIn('google.com', params['url'])
+        self.assertIn('zh-CN', params['url'])
         self.assertIn('zh-CN', params['headers']['Accept-Language'])
 
     def test_response(self):