summaryrefslogtreecommitdiff
path: root/searx/webapp.py
diff options
context:
space:
mode:
authorAlexandre Flament <alex@al-f.net>2017-01-15 22:18:20 +0100
committerGitHub <noreply@github.com>2017-01-15 22:18:20 +0100
commit7a16aca346c14994f304a6961c55b63ab260265a (patch)
tree4cd44fc2fe23d17d1cb574042c98a276f04253c9 /searx/webapp.py
parent627962ce40cd66d84f1be2d88907496fbd40b902 (diff)
parent1a9f8240b851c64a10be7b8990b6f3926ca506b3 (diff)
downloadsearxng-7a16aca346c14994f304a6961c55b63ab260265a.tar.gz
searxng-7a16aca346c14994f304a6961c55b63ab260265a.zip
Merge branch 'master' into flask_perimeter
Diffstat (limited to 'searx/webapp.py')
-rw-r--r--searx/webapp.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/searx/webapp.py b/searx/webapp.py
index 58f9815f9..18674edd9 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -752,7 +752,16 @@ def config():
'engines': [{'name': engine_name,
'categories': engine.categories,
'shortcut': engine.shortcut,
- 'enabled': not engine.disabled}
+ 'enabled': not engine.disabled,
+ 'paging': engine.paging,
+ 'language_support': engine.language_support,
+ 'supported_languages':
+ engine.supported_languages.keys()
+ if isinstance(engine.supported_languages, dict)
+ else engine.supported_languages,
+ 'safesearch': engine.safesearch,
+ 'time_range_support': engine.time_range_support,
+ 'timeout': engine.timeout}
for engine_name, engine in engines.items()],
'plugins': [{'name': plugin.name,
'enabled': plugin.default_on}