Merge pull request #1654 from MarcAbonce/small_fixes

[fix] Small fixes in Preferences view's text

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]}

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)
 

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