on master help sign in
[mod] bing and duckduckgo engines : add / rename locale parameter
bf56ec4Dalf
engines.cfg_sample+2−1
@@ -5,7 +5,7 @@ number_of_results = 1
5
5
6[bing]
6[bing]
7engine = bing
7engine = bing
8−language = en-us
8+locale = en-us
9
9
10[cc]
10[cc]
11engine=currency_convert
11engine=currency_convert
@@ -20,6 +20,7 @@ engine = duckduckgo_definitions
20
20
21[duckduckgo]
21[duckduckgo]
22engine = duckduckgo
22engine = duckduckgo
23+locale = en-us
23
24
24[flickr]
25[flickr]
25engine = flickr
26engine = flickr
searx/engines/bing.py+2−2
@@ -4,11 +4,11 @@ from cgi import escape
4
4
5base_url = 'http://www.bing.com/'
5base_url = 'http://www.bing.com/'
6search_string = 'search?{query}'
6search_string = 'search?{query}'
7−language = 'en-us' # see http://msdn.microsoft.com/en-us/library/dd251064.aspx
7+locale = 'en-US' # see http://msdn.microsoft.com/en-us/library/dd251064.aspx
8
8
9
9
10def request(query, params):
10def request(query, params):
11− search_path = search_string.format(query=urlencode({'q': query, 'setmkt': language}))
11+ search_path = search_string.format(query=urlencode({'q': query, 'setmkt': locale}))
12 #if params['category'] == 'images':
12 #if params['category'] == 'images':
13 # params['url'] = base_url + 'images/' + search_path
13 # params['url'] = base_url + 'images/' + search_path
14 params['url'] = base_url + search_path
14 params['url'] = base_url + search_path
searx/engines/duckduckgo.py+3−2
@@ -3,10 +3,11 @@ from urllib import urlencode
3from searx.utils import html_to_text
3from searx.utils import html_to_text
4
4
5url = 'https://duckduckgo.com/'
5url = 'https://duckduckgo.com/'
6−search_url = url + 'd.js?{query}&l=us-en&p=1&s=0'
6+search_url = url + 'd.js?{query}&p=1&s=0'
7+locale = 'us-en'
7
8
8def request(query, params):
9def request(query, params):
9− params['url'] = search_url.format(query=urlencode({'q': query}))
10+ params['url'] = search_url.format(query=urlencode({'q': query, 'l': locale}))
10 return params
11 return params
11
12
12
13