summaryrefslogtreecommitdiff
path: root/searx
diff options
context:
space:
mode:
authorAdam Tauber <asciimoo@gmail.com>2015-05-02 13:34:53 -0400
committerAdam Tauber <asciimoo@gmail.com>2015-05-02 13:34:53 -0400
commit01de1c6f7808f45698c2207ae1f1b73c1132b088 (patch)
treea239f683d515ad60fd9672da1f4fece21684303c /searx
parentbbd83f5a519381ac7ea690a1645258d106a9ba8a (diff)
parent65e6737413ee1cc27348258ff1586c98bf38da37 (diff)
Merge pull request #303 from dalf/patch-1
Revert of #195 when the search language is not english
Diffstat (limited to 'searx')
-rw-r--r--searx/engines/google.py3
-rw-r--r--searx/tests/engines/test_google.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/searx/engines/google.py b/searx/engines/google.py
index 9c768260a..807c58ed5 100644
--- a/searx/engines/google.py
+++ b/searx/engines/google.py
@@ -76,7 +76,8 @@ def request(query, params):
query=urlencode({'q': query}))
params['headers']['Accept-Language'] = language
- params['cookies']['PREF'] = get_google_pref_cookie()
+ if language.startswith('en'):
+ params['cookies']['PREF'] = get_google_pref_cookie()
return params
diff --git a/searx/tests/engines/test_google.py b/searx/tests/engines/test_google.py
index 2c3d8e5f6..2a90fc5ec 100644
--- a/searx/tests/engines/test_google.py
+++ b/searx/tests/engines/test_google.py
@@ -17,12 +17,13 @@ class TestGoogleEngine(SearxTestCase):
self.assertIn('url', params)
self.assertIn(query, params['url'])
self.assertIn('google.com', params['url'])
- self.assertIn('PREF', params['cookies'])
+ self.assertNotIn('PREF', params['cookies'])
self.assertIn('fr', params['headers']['Accept-Language'])
dicto['language'] = 'all'
params = google.request(query, dicto)
self.assertIn('en', params['headers']['Accept-Language'])
+ self.assertIn('PREF', params['cookies'])
def test_response(self):
self.assertRaises(AttributeError, google.response, None)