Refactored search language handling

material/partials/language/zh.html

@@ -7,6 +7,7 @@
   "footer.next": "前进",
   "meta.comments": "评论",
   "meta.source": "来源",
+  "search.language": "jp",
   "search.placeholder": "搜索",
   "search.result.placeholder": "键入以开始搜索",
   "search.result.none": "没有找到符合条件的结果",

src/assets/javascripts/components/Material/Search/Result.jsx

@@ -179,7 +179,7 @@ export default class Result {
           )
 
           /* Set up alternate search languages */
-          if (lang.length === 1 && lang[0] !== "en") {
+          if (lang.length === 1 && lang[0] !== "en" && lunr[lang[0]]) {
             this.use(lunr[lang[0]])
           } else if (lang.length > 1) {
             this.use(lunr.multiLanguage(...lang))

src/base.html

@@ -318,8 +318,10 @@
               {% if language == "jp" %}
                 <script src="{{ path }}/tinyseg.js"></script>
               {% endif %}
+              {% if language in ($md-lunr-languages$) %}
                 <script src="{{ path }}/lunr.{{ language }}.js"></script>
               {% endif %}
+            {% endif %}
           {% endfor %}
           {% if languages | length > 1 %}
             <script src="{{ path }}/lunr.multi.js"></script>

src/partials/language.html

@@ -30,7 +30,7 @@
 {% macro t(key) %}{{ {
   "search.language": (
     config.extra.search | default({})
-  ).language | default(config.theme.language, true),
+  ).language,
   "search.tokenizer": (
     config.extra.search | default({})
   ).tokenizer | default("", true),

src/partials/language/da.html

@@ -30,6 +30,7 @@
   "footer.next": "Næste",
   "meta.comments": "Kommentarer",
   "meta.source": "Kilde",
+  "search.language": "da",
   "search.placeholder": "Søg",
   "search.result.placeholder": "Indtask søgeord",
   "search.result.none": "Ingen resultater fundet",

src/partials/language/de.html

@@ -30,6 +30,7 @@
   "footer.next": "Nächste Seite",
   "meta.comments": "Kommentare",
   "meta.source": "Quellcode",
+  "search.language": "de",
   "search.placeholder": "Suche",
   "search.result.placeholder": "Suchbegriff eingeben",
   "search.result.none": "Keine Suchergebnisse",

src/partials/language/en.html

@@ -30,6 +30,7 @@
   "footer.next": "Next",
   "meta.comments": "Comments",
   "meta.source": "Source",
+  "search.language": "en",
   "search.placeholder": "Search",
   "search.result.placeholder": "Type to start searching",
   "search.result.none": "No matching documents",

src/partials/language/es.html

@@ -30,6 +30,7 @@
   "footer.next": "Siguiente",
   "meta.comments": "Comentarios",
   "meta.source": "Fuente",
+  "search.language": "es",
   "search.placeholder": "Búsqueda",
   "search.result.placeholder": "Teclee para comenzar búsqueda",
   "search.result.none": "No se encontraron documentos",

src/partials/language/fr.html

@@ -30,6 +30,7 @@
   "footer.next": "Suivant",
   "meta.comments": "Commentaires",
   "meta.source": "Source",
+  "search.language": "fr",
   "search.placeholder": "Rechercher",
   "search.result.placeholder": "Taper pour démarrer la recherche",
   "search.result.none": "Aucun document trouvé",

src/partials/language/it.html

@@ -30,6 +30,7 @@
   "footer.next": "Prossimo",
   "meta.comments": "Commenti",
   "meta.source": "Sorgente",
+  "search.language": "it",
   "search.placeholder": "Cerca",
   "search.result.placeholder": "Scrivi per iniziare a cercare",
   "search.result.none": "Nessun documento trovato",

src/partials/language/ja.html

@@ -30,6 +30,7 @@
   "footer.next": "次",
   "meta.comments": "コメント",
   "meta.source": "ソース",
+  "search.language": "jp",
   "search.placeholder": "検索",
   "search.result.placeholder": "検索キーワードを入力してください",
   "search.result.none": "何も見つかりませんでした",

src/partials/language/kr.html

@@ -30,6 +30,7 @@
   "footer.next": "다음",
   "meta.comments": "댓글",
   "meta.source": "출처",
+  "search.language": "jp",
   "search.placeholder": "검색",
   "search.result.placeholder": "검색어를 입력하세요",
   "search.result.none": "검색어와 일치하는 문서가 없습니다",

src/partials/language/nl.html

@@ -30,6 +30,7 @@
   "footer.next": "Volgende",
   "meta.comments": "Reacties",
   "meta.source": "Bron",
+  "search.language": "du",
   "search.placeholder": "Zoeken",
   "search.result.placeholder": "Typ om te beginnen met zoeken",
   "search.result.none": "Geen overeenkomende documenten",

src/partials/language/no.html

@@ -30,6 +30,7 @@
   "footer.next": "Neste",
   "meta.comments": "Kommentarer",
   "meta.source": "Kilde",
+  "search.language": "no",
   "search.placeholder": "Søk",
   "search.result.placeholder": "Skriv søkeord",
   "search.result.none": "Ingen treff",

src/partials/language/pt.html

@@ -30,6 +30,7 @@
   "footer.next": "Próximo",
   "meta.comments": "Comentários",
   "meta.source": "Fonte",
+  "search.language": "pt",
   "search.placeholder": "Buscar",
   "search.result.placeholder": "Digite para iniciar a busca",
   "search.result.none": "Nenhum resultado encontrado",

src/partials/language/ru.html

@@ -30,6 +30,7 @@
   "footer.next": "Вперед",
   "meta.comments": "Комментарии",
   "meta.source": "Исходный код",
+  "search.language": "ru",
   "search.placeholder": "Поиск",
   "search.result.placeholder": "Начните печатать для поиска",
   "search.result.none": "Совпадений не найдено",

src/partials/language/sv.html

@@ -30,6 +30,7 @@
   "footer.next": "Nästa",
   "meta.comments": "Kommentarer",
   "meta.source": "Källa",
+  "search.language": "sv",
   "search.placeholder": "Sök",
   "search.result.placeholder": "Skriv sökord",
   "search.result.none": "Inga sökresultat",

src/partials/language/tr.html

@@ -30,6 +30,7 @@
   "footer.next": "Sonraki",
   "meta.comments": "Yorumlar",
   "meta.source": "Kaynak",
+  "search.language": "tr",
   "search.placeholder": "Ara",
   "search.result.placeholder": "Aramaya başlamak için yazın",
   "search.result.none": "Eşleşen doküman bulunamadı",

src/partials/language/zh-Hant.html

@@ -30,6 +30,7 @@
   "footer.next": "下一頁",
   "meta.comments": "評論",
   "meta.source": "來源",
+  "search.language": "jp",
   "search.placeholder": "搜尋",
   "search.result.placeholder": "鍵入以開始檢索",
   "search.result.none": "沒有找到符合條件的結果",

src/partials/language/zh.html

@@ -30,6 +30,7 @@
   "footer.next": "前进",
   "meta.comments": "评论",
   "meta.source": "来源",
+  "search.language": "jp",
   "search.placeholder": "搜索",
   "search.result.placeholder": "键入以开始搜索",
   "search.result.none": "没有找到符合条件的结果",