Browse Source

[mod] bing and duckduckgo engines : add / rename locale parameter

Dalf 11 years ago
parent
commit
bf56ec4fb1
3 changed files with 7 additions and 5 deletions
  1. 2 1
      engines.cfg_sample
  2. 2 2
      searx/engines/bing.py
  3. 3 2
      searx/engines/duckduckgo.py

+ 2 - 1
engines.cfg_sample

@@ -5,7 +5,7 @@ number_of_results = 1
 
 [bing]
 engine = bing
-language = en-us
+locale = en-us
 
 [cc]
 engine=currency_convert
@@ -20,6 +20,7 @@ engine = duckduckgo_definitions
 
 [duckduckgo]
 engine = duckduckgo
+locale = en-us
 
 [flickr]
 engine = flickr

+ 2 - 2
searx/engines/bing.py

@@ -4,11 +4,11 @@ from cgi import escape
 
 base_url = 'http://www.bing.com/'
 search_string = 'search?{query}'
-language = 'en-us' # see http://msdn.microsoft.com/en-us/library/dd251064.aspx
+locale = 'en-US' # see http://msdn.microsoft.com/en-us/library/dd251064.aspx
 
 
 def request(query, params):
-    search_path = search_string.format(query=urlencode({'q': query, 'setmkt': language}))
+    search_path = search_string.format(query=urlencode({'q': query, 'setmkt': locale}))
     #if params['category'] == 'images':
     #    params['url'] = base_url + 'images/' + search_path
     params['url'] = base_url + search_path

+ 3 - 2
searx/engines/duckduckgo.py

@@ -3,10 +3,11 @@ from urllib import urlencode
 from searx.utils import html_to_text
 
 url = 'https://duckduckgo.com/'
-search_url = url + 'd.js?{query}&l=us-en&p=1&s=0'
+search_url = url + 'd.js?{query}&p=1&s=0'
+locale = 'us-en'
 
 def request(query, params):
-    params['url'] = search_url.format(query=urlencode({'q': query}))
+    params['url'] = search_url.format(query=urlencode({'q': query, 'l': locale}))
     return params