浏览代码

search: make language configurable from settings.yml

Noémi Ványi 8 年前
父节点
当前提交
299c882304
共有 3 个文件被更改,包括 4 次插入1 次删除
  1. 2
    1
      searx/preferences.py
  2. 1
    0
      searx/settings.yml
  3. 1
    0
      searx/settings_robot.yml

+ 2
- 1
searx/preferences.py 查看文件

216
         super(Preferences, self).__init__()
216
         super(Preferences, self).__init__()
217
 
217
 
218
         self.key_value_settings = {'categories': MultipleChoiceSetting(['general'], choices=categories),
218
         self.key_value_settings = {'categories': MultipleChoiceSetting(['general'], choices=categories),
219
-                                   'language': EnumStringSetting('all', choices=LANGUAGE_CODES),
219
+                                   'language': EnumStringSetting(settings['search']['language'],
220
+                                                                 choices=LANGUAGE_CODES),
220
                                    'locale': EnumStringSetting(settings['ui']['default_locale'],
221
                                    'locale': EnumStringSetting(settings['ui']['default_locale'],
221
                                                                choices=settings['locales'].keys() + ['']),
222
                                                                choices=settings['locales'].keys() + ['']),
222
                                    'autocomplete': EnumStringSetting(settings['search']['autocomplete'],
223
                                    'autocomplete': EnumStringSetting(settings['search']['autocomplete'],

+ 1
- 0
searx/settings.yml 查看文件

5
 search:
5
 search:
6
     safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict
6
     safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict
7
     autocomplete : "" # Existing autocomplete backends: "dbpedia", "duckduckgo", "google", "startpage", "wikipedia" - leave blank to turn it off by default
7
     autocomplete : "" # Existing autocomplete backends: "dbpedia", "duckduckgo", "google", "startpage", "wikipedia" - leave blank to turn it off by default
8
+    language : "all"
8
 
9
 
9
 server:
10
 server:
10
     port : 8888
11
     port : 8888

+ 1
- 0
searx/settings_robot.yml 查看文件

5
 search:
5
 search:
6
     safe_search : 0
6
     safe_search : 0
7
     autocomplete : ""
7
     autocomplete : ""
8
+    language: "all"
8
 
9
 
9
 server:
10
 server:
10
     port : 11111
11
     port : 11111