瀏覽代碼

Merge pull request #353 from Cqoicebordel/languages

New feature : language per search engine !
Adam Tauber 10 年之前
父節點
當前提交
cdf931f949
共有 1 個檔案被更改,包括 8 行新增3 行删除
  1. 8
    3
      searx/search.py

+ 8
- 3
searx/search.py 查看文件

@@ -237,7 +237,7 @@ def score_results(results):
237 237
             for k in categoryPositions:
238 238
                 v = categoryPositions[k]['index']
239 239
                 if v >= index:
240
-                    categoryPositions[k]['index'] = v+1
240
+                    categoryPositions[k]['index'] = v + 1
241 241
 
242 242
             # update this category
243 243
             current['count'] -= 1
@@ -306,7 +306,7 @@ def merge_infoboxes(infoboxes):
306 306
 
307 307
         if add_infobox:
308 308
             results.append(infobox)
309
-            infoboxes_id[infobox_id] = len(results)-1
309
+            infoboxes_id[infobox_id] = len(results) - 1
310 310
 
311 311
     return results
312 312
 
@@ -472,7 +472,12 @@ class Search(object):
472 472
             request_params['category'] = selected_engine['category']
473 473
             request_params['started'] = time()
474 474
             request_params['pageno'] = self.pageno
475
-            request_params['language'] = self.lang
475
+
476
+            if hasattr(engine, 'language'):
477
+                request_params['language'] = engine.language
478
+            else:
479
+                request_params['language'] = self.lang
480
+
476 481
             try:
477 482
                 # 0 = None, 1 = Moderate, 2 = Strict
478 483
                 request_params['safesearch'] = int(request.cookies.get('safesearch', 1))