浏览代码

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
             for k in categoryPositions:
237
             for k in categoryPositions:
238
                 v = categoryPositions[k]['index']
238
                 v = categoryPositions[k]['index']
239
                 if v >= index:
239
                 if v >= index:
240
-                    categoryPositions[k]['index'] = v+1
240
+                    categoryPositions[k]['index'] = v + 1
241
 
241
 
242
             # update this category
242
             # update this category
243
             current['count'] -= 1
243
             current['count'] -= 1
306
 
306
 
307
         if add_infobox:
307
         if add_infobox:
308
             results.append(infobox)
308
             results.append(infobox)
309
-            infoboxes_id[infobox_id] = len(results)-1
309
+            infoboxes_id[infobox_id] = len(results) - 1
310
 
310
 
311
     return results
311
     return results
312
 
312
 
472
             request_params['category'] = selected_engine['category']
472
             request_params['category'] = selected_engine['category']
473
             request_params['started'] = time()
473
             request_params['started'] = time()
474
             request_params['pageno'] = self.pageno
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
             try:
481
             try:
477
                 # 0 = None, 1 = Moderate, 2 = Strict
482
                 # 0 = None, 1 = Moderate, 2 = Strict
478
                 request_params['safesearch'] = int(request.cookies.get('safesearch', 1))
483
                 request_params['safesearch'] = int(request.cookies.get('safesearch', 1))