minor fixes in utils/fetch_languages.py

searx/engines/wikipedia.py

@@ -131,7 +131,8 @@ def _fetch_supported_languages(resp):
             name = td[2].xpath('./a')[0].text
             english_name = td[1].xpath('./a')[0].text
             articles = int(td[4].xpath('./a/b')[0].text.replace(',', ''))
-            if articles >= 10000:
+            # exclude languages with too few articles
+            if articles >= 100000:
                 supported_languages[code] = {"name": name, "english_name": english_name, "articles": articles}
 
     return supported_languages

searx/languages.py

@@ -124,8 +124,8 @@ language_codes = (
     (u"war", u"Winaray", u"", u"Waray-Waray"),
     (u"xh", u"Xhosa", u"", u"Xhosa"),
     (u"zh", u"中文", u"", u"Chinese"),
-    (u"zh-CN", u"中文", u"中国", u""),
+    (u"zh-CN", u"中文", u"中国", u"Chinese"),
     (u"zh-HK", u"中文", u"香港", u"Chinese"),
-    (u"zh-TW", u"中文", u"台湾", u""),
+    (u"zh-TW", u"中文", u"台湾", u"Chinese"),
     (u"zu", u"Isi-Zulu", u"", u"Zulu")
 )

searx/templates/oscar/preferences.html

@@ -172,7 +172,7 @@
                                     </td>
                                     <th>{{ search_engine.name }}</th>
 				    <td>{{ shortcuts[search_engine.name] }}</td>
-				    <td><input type="checkbox" {{ "checked" if current_language in search_engine.supported_languages or current_language.split('-')[0] in search_engine.supported_languages else ""}} readonly="readonly" disabled="disabled"></td>
+				    <td><input type="checkbox" {{ "checked" if current_language == 'all' and current_language in search_engine.supported_languages or current_language.split('-')[0] in search_engine.supported_languages else ""}} readonly="readonly" disabled="disabled"></td>
 				    <td><input type="checkbox" {{ "checked" if search_engine.safesearch==True else ""}} readonly="readonly" disabled="disabled"></td>
 				    <td><input type="checkbox" {{ "checked" if search_engine.time_range_support==True else ""}} readonly="readonly" disabled="disabled"></td>
 				    <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td>
@@ -181,7 +181,7 @@
 				    <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td>
 				    <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td>
 				    <td><input type="checkbox" {{ "checked" if search_engine.safesearch==True else ""}} readonly="readonly" disabled="disabled"></td>
-				    <td><input type="checkbox" {{ "checked" if current_language in search_engine.supported_languages or current_language.split('-')[0] in search_engine.supported_languages else ""}} readonly="readonly" disabled="disabled"></td>
+				    <td><input type="checkbox" {{ "checked" if current_language == 'all' and current_language in search_engine.supported_languages or current_language.split('-')[0] in search_engine.supported_languages else ""}} readonly="readonly" disabled="disabled"></td>
 				    <td>{{ shortcuts[search_engine.name] }}</td>
                                     <th>{{ search_engine.name }}</th>
                                     <td class="onoff-checkbox">

utils/fetch_languages.py

@@ -32,23 +32,26 @@ languages = {}
 def valid_code(lang_code):
     # filter invalid codes
     # sl-SL is technically not invalid, but still a mistake
+    invalid_codes = ['sl-SL', 'wt-WT', 'jw']
+    invalid_countries = ['UK', 'XA', 'XL']
     if lang_code[:2] == 'xx'\
-       or lang_code == 'sl-SL'\
-       or lang_code == 'wt-WT'\
-       or lang_code == 'jw'\
-       or lang_code[-2:] == 'UK'\
-       or lang_code[-2:] == 'XA'\
-       or lang_code[-2:] == 'XL':
+       or lang_code in invalid_codes\
+       or lang_code[-2:] in invalid_countries\
+       or is_dialect(lang_code):
         return False
 
-    # filter dialects
+    return True
+
+
+# Language codes with any additional tags other than language and country.
+def is_dialect(lang_code):
     lang_code = lang_code.split('-')
     if len(lang_code) > 2 or len(lang_code[0]) > 3:
-        return False
+        return True
     if len(lang_code) == 2 and len(lang_code[1]) > 2:
-        return False
+        return True
 
-    return True
+    return False
 
 
 # Get country name in specified language.
@@ -83,19 +86,17 @@ def fetch_supported_languages():
                 print e
 
     # write json file
-    f = io.open(engines_languages_file, "w", encoding="utf-8")
-    f.write(unicode(dumps(engines_languages, ensure_ascii=False, encoding="utf-8")))
-    f.close()
+    with io.open(engines_languages_file, "w", encoding="utf-8") as f:
+        f.write(unicode(dumps(engines_languages, ensure_ascii=False, encoding="utf-8")))
 
 
 # Join all language lists.
 # Iterate all languages supported by each engine.
 def join_language_lists():
     # include wikipedia first for more accurate language names
-    # exclude languages with too few articles
     languages.update({code: lang for code, lang
                       in engines_languages['wikipedia'].iteritems()
-                      if valid_code(code) and lang['articles'] >= 100000})
+                      if valid_code(code)})
 
     for engine_name in engines_languages:
         for locale in engines_languages[engine_name]:
@@ -104,25 +105,27 @@ def join_language_lists():
 
             # if language is not on list or if it has no name yet
             if locale not in languages or not languages[locale].get('name'):
-                if isinstance(engines_languages[engine_name], dict) \
-                  and engines_languages[engine_name][locale].get('articles', float('inf')) >= 100000:
+                if isinstance(engines_languages[engine_name], dict):
                     languages[locale] = engines_languages[engine_name][locale]
                 else:
                     languages[locale] = {}
 
     # get locales that have no name or country yet
     for locale in languages.keys():
+        # try to get language names
         if not languages[locale].get('name'):
-            # try to get language names
             name = languages.get(locale.split('-')[0], {}).get('name', None)
             if name:
                 languages[locale]['name'] = name
-                languages[locale]['english_name'] = languages.get(locale.split('-')[0], {}).get('english_name', '')
             else:
                 # filter out locales with no name
                 del languages[locale]
                 continue
 
+        # try to get language name in english
+        if not languages[locale].get('english_name'):
+            languages[locale]['english_name'] = languages.get(locale.split('-')[0], {}).get('english_name', '')
+
         # try to get country name
         if locale.find('-') > 0 and not languages[locale].get('country'):
             languages[locale]['country'] = get_country_name(locale) or ''
@@ -145,10 +148,10 @@ def filter_single_country_languages():
 # Write languages.py.
 def write_languages_file():
     new_file = open(languages_file, 'w')
-    file_content = '# -*- coding: utf-8 -*-\n'
-    file_content += '# list of language codes\n'
-    file_content += '# this file is generated automatically by utils/update_search_languages.py\n'
-    file_content += '\nlanguage_codes = ('
+    file_content = '# -*- coding: utf-8 -*-\n'\
+                   + '# list of language codes\n'\
+                   + '# this file is generated automatically by utils/update_search_languages.py\n'\
+                   + '\nlanguage_codes = ('
     for code in sorted(languages):
         file_content += '\n    (u"' + code + '"'\
                         + ', u"' + languages[code]['name'].split(' (')[0] + '"'\