Enables back languages. Filters dev search by language

looterz · Nov 24, 2017 · 38fd71d · 38fd71d
1 parent c310832
commit 38fd71d
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 67 deletions.
diff --git a/_config.yml b/_config.yml
@@ -1,58 +1,58 @@
 langsorder:
-# - 'id'
-# - 'da'
-# - 'de'
+- 'id'
+- 'da'
+- 'de'
 - 'en'
-# - 'es'
-# - 'fr'
-# - 'it'
-# - 'hu'
-# - 'nl'
-# - 'pl'
-# - 'pt_BR'
-# - 'ro'
-# - 'sl'
-# - 'sv'
-# - 'tr'
-# - 'el'
-# - 'bg'
-# - 'ru'
+- 'es'
+- 'fr'
+- 'it'
+- 'hu'
+- 'nl'
+- 'pl'
+- 'pt_BR'
+- 'ro'
+- 'sl'
+- 'sv'
+- 'tr'
+- 'el'
+- 'bg'
+- 'ru'
 - 'uk'
-# - 'ar'
-# - 'fa'
-# - 'hi'
-# - 'ko'
-# - 'ja'
-# - 'zh_CN'
-# - 'zh_TW'
+- 'ar'
+- 'fa'
+- 'hi'
+- 'ko'
+- 'ja'
+- 'zh_CN'
+- 'zh_TW'
 
 langs:
-  # 'ar': 'العربية'
-  # 'bg': 'български'
-  # 'da': 'Dansk'
-  # 'de': 'Deutsch'
+  'ar': 'العربية'
+  'bg': 'български'
+  'da': 'Dansk'
+  'de': 'Deutsch'
   'en': 'English'
-  # 'el': 'Ελληνικά'
-  # 'es': 'Español'
-  # 'fa': 'فارسی'
-  # 'fr': 'Français'
-  # 'hi': 'हिन्दी'
-  # 'hu': 'Magyar'
-  # 'id': 'Bahasa Indonesia'
-  # 'it': 'Italiano'
-  # 'ja': '日本語'
-  # 'ko': '한국의'
-  # 'nl': 'Nederlands'
-  # 'pl': 'Polski'
-  # 'pt_BR': 'Português Brasil'
-  # 'ro': 'Română'
-  # 'ru': 'Русский'
-  # 'sl': 'Slovenščina'
-  # 'sv': 'Svenska'
-  # 'tr': 'Türkçe'
+  'el': 'Ελληνικά'
+  'es': 'Español'
+  'fa': 'فارسی'
+  'fr': 'Français'
+  'hi': 'हिन्दी'
+  'hu': 'Magyar'
+  'id': 'Bahasa Indonesia'
+  'it': 'Italiano'
+  'ja': '日本語'
+  'ko': '한국의'
+  'nl': 'Nederlands'
+  'pl': 'Polski'
+  'pt_BR': 'Português Brasil'
+  'ro': 'Română'
+  'ru': 'Русский'
+  'sl': 'Slovenščina'
+  'sv': 'Svenska'
+  'tr': 'Türkçe'
   'uk': 'Українська'
-  # 'zh_CN': '简体中文'
-  # 'zh_TW': '繁體中文'
+  'zh_CN': '简体中文'
+  'zh_TW': '繁體中文'
 
 redirects:
   /news: /en/version-history

diff --git a/js/devsearch.js b/js/devsearch.js
@@ -2,28 +2,10 @@
 # This file is licensed under the MIT License (MIT) available on
 # http://opensource.org/licenses/MIT.
 ---
-{% comment %}
-
-NOTICE: if you edit this template, you should also edit
-        /quality-assurance/devsearches.html which creates a page whose
-        links can be checked by HTML proofer
-
-Nested loops below:
-  1. site.devsearches: container for all searches defined in _config.yaml in
-     the arbitrary order they should appear
-  2. list: a list item in devsearches; only has two elements:
-     a. the name of the category
-     b. an array containing the sublist items (pre-sorted)
-  3. sublist: a list of the items we want to display as a one-entry hash table
-  4. term: the term as the key [0] and the uri as the value [1]
-
-{% endcomment %}
-
 "use strict";
 
 var search_data = {{ site.devsearches_json }}
 
-
 {% raw %}
 // code adapted from http://jqueryui.com/autocomplete/#categories
 // MIT license: https://jquery.org/license/
@@ -51,7 +33,18 @@ $.widget("custom.catcomplete", $.ui.autocomplete, {
 });
 $(function() {
   $("#glossary_term").catcomplete({
-    source: search_data,
+    source: function(request, respond) {
+        var lang = $('html').attr('lang');
+        var term = request.term;
+
+        var results = search_data.filter(function(data) {
+            return (
+                (data.label.indexOf(term) !== -1 && data.lang === lang) || data.category !== "Glossary"
+            );
+        });
+
+        respond(results);
+    },
     delay: 0,
     minLength: 2,
     autoFocus: true,