diff --git a/searx/answerers/random/answerer.py b/searx/answerers/random/answerer.py index b6e8422a..2dfb0880 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 bdf9e6c3..490b3af0 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 ee445e6f..8dd4af07 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