From 4a3f732038c72c2961d5c7fe194e7759108f7eb0 Mon Sep 17 00:00:00 2001
From: Mika Vaara <mika.vaara@helsinki.fi>
Date: Wed, 22 Dec 2021 18:31:36 +0200
Subject: [PATCH 1/2] The vocabulary list on the frontpage shows the vocabulary
 names in the default language of the vocabulary

---
 view/vocabularylist.twig | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/view/vocabularylist.twig b/view/vocabularylist.twig
index aab1edb83..ae30cac79 100644
--- a/view/vocabularylist.twig
+++ b/view/vocabularylist.twig
@@ -15,7 +15,14 @@
       <h3>{{ vocabClassName }}</h3>
       <ul>
       {% for vocab in vocabArray %}
-        <li><a class="navigation-font" href="{{ vocab.id }}/{{ request.lang }}/{% if request.contentLang != request.lang and request.contentLang != '' and request.contentLang in vocab.config.languages %}?clang={{ request.contentLang }}{% endif %}">{{ vocab.title }}</a></li>
+        {% set useDefaultLanguage = null %}
+        {% if request.contentLang not in vocab.config.languages and request.contentLang != '' %}
+          {% set useDefaultLanguage = true %}
+        {% endif %}
+        <li><a class="navigation-font" href="{{ vocab.id }}/{{ request.lang }}/{% if request.contentLang not in vocab.config.languages and request.contentLang != '' %}?clang={{ vocab.config.defaultLanguage }}{% endif %}">
+          {% if useDefaultLanguage is not null %} {{ vocab.title(vocab.config.defaultLanguage) }}
+            {% else %} {{ vocab.title(request.contentLang) }}
+          {% endif %} </a></li>
       {% endfor %}
       </ul>
     </div>

From 7d99329d9e58d4748084ccb8617aca27df813837 Mon Sep 17 00:00:00 2001
From: Mika Vaara <mika.vaara@helsinki.fi>
Date: Thu, 23 Dec 2021 14:56:59 +0200
Subject: [PATCH 2/2] A more elegant way to check if the default language
 should be used in the vocabulary listing

---
 view/vocabularylist.twig | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/view/vocabularylist.twig b/view/vocabularylist.twig
index ae30cac79..ee1033385 100644
--- a/view/vocabularylist.twig
+++ b/view/vocabularylist.twig
@@ -15,13 +15,12 @@
       <h3>{{ vocabClassName }}</h3>
       <ul>
       {% for vocab in vocabArray %}
-        {% set useDefaultLanguage = null %}
-        {% if request.contentLang not in vocab.config.languages and request.contentLang != '' %}
-          {% set useDefaultLanguage = true %}
-        {% endif %}
-        <li><a class="navigation-font" href="{{ vocab.id }}/{{ request.lang }}/{% if request.contentLang not in vocab.config.languages and request.contentLang != '' %}?clang={{ vocab.config.defaultLanguage }}{% endif %}">
-          {% if useDefaultLanguage is not null %} {{ vocab.title(vocab.config.defaultLanguage) }}
-            {% else %} {{ vocab.title(request.contentLang) }}
+        {% set useDefaultLanguage = request.contentLang not in vocab.config.languages and request.contentLang != '' %}
+        <li><a class="navigation-font" href="{{ vocab.id }}/{{ request.lang }}/{% if useDefaultLanguage %}?clang={{ vocab.config.defaultLanguage }}{% endif %}">
+          {% if useDefaultLanguage %}
+            {{ vocab.title(vocab.config.defaultLanguage) }}
+          {% else %}
+            {{ vocab.title(request.contentLang) }}
           {% endif %} </a></li>
       {% endfor %}
       </ul>
@@ -31,3 +30,8 @@
   </div>
   {% endif %}
 </div>
+
+
+
+
+