Fixed error when initializing search

This commit is contained in:
squidfunk
2017-10-31 20:48:41 +01:00
committed by Martin Donath
parent c5143e890f
commit 87d8855dfe
8 changed files with 38 additions and 34 deletions

View File

@@ -117,7 +117,7 @@ export default class Result {
lunr.tokenizer.separator = tokenizer
/* Load search languages */
this.lang_ = translate("search.languages").split(",")
this.lang_ = translate("search.language").split(",")
.filter(Boolean)
.map(lang => lang.trim())
}
@@ -180,7 +180,7 @@ export default class Result {
)
/* Set up alternate search languages */
if (lang.length === 1) {
if (lang.length === 1 && lang[0] !== "en") {
this.use(lunr[lang[0]])
} else if (lang.length > 1) {
this.use(lunr.multiLanguage(...lang))

View File

@@ -63,7 +63,7 @@
{% for key in [
"clipboard.copy",
"clipboard.copied",
"search.languages",
"search.language",
"search.result.none",
"search.result.one",
"search.result.other",
@@ -303,20 +303,22 @@
<script src="{{ base_url }}/assets/javascripts/application.js"></script>
<!-- Load additional languages for search -->
{% set languages = lang.t("search.languages").split(",") %}
{% if languages | length and languages[0] != "" %}
{% set path = base_url + "/assets/javascripts/lunr" %}
<script src="{{ path }}/lunr.stemmer.support.js"></script>
{% for language in languages | map("trim") %}
{% if language != "en" %}
{% if language == "jp" %}
<script src="{{ path }}/tinyseg.js"></script>
{% if lang.t("search.language") != "en" %}
{% set languages = lang.t("search.language").split(",") %}
{% if languages | length and languages[0] != "" %}
{% set path = base_url + "/assets/javascripts/lunr" %}
<script src="{{ path }}/lunr.stemmer.support.js"></script>
{% for language in languages | map("trim") %}
{% if language != "en" %}
{% if language == "jp" %}
<script src="{{ path }}/tinyseg.js"></script>
{% endif %}
<script src="{{ path }}/lunr.{{ language }}.js"></script>
{% endif %}
<script src="{{ path }}/lunr.{{ language }}.js"></script>
{% endfor %}
{% if languages | length > 1 %}
<script src="{{ path }}/lunr.multi.js"></script>
{% endif %}
{% endfor %}
{% if languages | length > 1 %}
<script src="{{ path }}/lunr.multi.js"></script>
{% endif %}
{% endif %}

View File

@@ -25,7 +25,7 @@
<!-- Re-export translations -->
{% macro t(key) %}{{ {
"search.languages": (
"search.language": (
config.extra.search | default({})
).language | default(config.theme.language, true),
"search.tokenizer": (