summaryrefslogtreecommitdiff
path: root/searx/search.py
diff options
context:
space:
mode:
authorAdam Tauber <asciimoo@gmail.com>2017-12-06 14:34:26 +0100
committerGitHub <noreply@github.com>2017-12-06 14:34:26 +0100
commit49b845051f027cf9d29a20821968103a0f55c9d9 (patch)
tree249693fb31423283ee21c5ded4bed844d7250f2e /searx/search.py
parentdf0b8ee5270a37642ccf5f42e95b0656aefc7fda (diff)
parent4d1770398a6af8902e75c0bd885781584d39e796 (diff)
Merge pull request #973 from MarcAbonce/languages
Remove 'all' option from search languages
Diffstat (limited to 'searx/search.py')
-rw-r--r--searx/search.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/searx/search.py b/searx/search.py
index 1bfb47260..b523c2754 100644
--- a/searx/search.py
+++ b/searx/search.py
@@ -24,7 +24,7 @@ from flask_babel import gettext
import requests.exceptions
import searx.poolrequests as requests_lib
from searx.engines import (
- categories, engines
+ categories, engines, settings
)
from searx.answerers import ask
from searx.utils import gen_useragent
@@ -220,6 +220,10 @@ def get_search_query_from_webapp(preferences, form):
else:
query_lang = preferences.get_value('language')
+ # provides backwards compatibility for requests using old language default
+ if query_lang == 'all':
+ query_lang = settings['search']['language']
+
# check language
if not VALID_LANGUAGE_CODE.match(query_lang):
raise SearxParameterException('language', query_lang)