summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Flament <alex@al-f.net>2019-07-28 10:31:57 +0200
committerGitHub <noreply@github.com>2019-07-28 10:31:57 +0200
commitc6ac39bceaf853f0afe89822b78370eb6457dc8d (patch)
treeeb87cb175ab53cd0199558e8dcd63bf4a60c4f40
parent204a2cbbf0618d1d8b7d4c52878e43afe4e92444 (diff)
parent59b1370824f7947a4450f540476d4a06d9abb58d (diff)
Merge pull request #1654 from MarcAbonce/small_fixes
[fix] Small fixes in Preferences view's text
-rw-r--r--searx/answerers/random/answerer.py2
-rw-r--r--searx/settings.yml2
-rw-r--r--searx/webapp.py3
3 files changed, 2 insertions, 5 deletions
diff --git a/searx/answerers/random/answerer.py b/searx/answerers/random/answerer.py
index b6e8422ad..2dfb08804 100644
--- a/searx/answerers/random/answerer.py
+++ b/searx/answerers/random/answerer.py
@@ -70,4 +70,4 @@ def answer(query):
def self_info():
return {'name': gettext('Random value generator'),
'description': gettext('Generate different random values'),
- 'examples': [u'random {}'.format(x) for x in random_types]}
+ 'examples': [u'random {}'.format(x.decode('utf-8')) for x in random_types]}
diff --git a/searx/settings.yml b/searx/settings.yml
index bdf9e6c33..490b3af04 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -792,7 +792,7 @@ locales:
te : తెలుగు (telugu)
tr : Türkçe (Turkish)
uk : українська мова (Ukrainian)
- vi : tiếng việt (㗂越)
+ vi : tiếng việt (Vietnamese)
zh : 中文 (Chinese)
zh_TW : 國語 (Taiwanese Mandarin)
diff --git a/searx/webapp.py b/searx/webapp.py
index ee445e6f7..8dd4af071 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -166,9 +166,6 @@ def get_locale():
and request.form['locale'] in settings['locales']:
locale = request.form['locale']
- if locale == 'zh_TW':
- locale = 'zh_Hant_TW'
-
return locale