Merge pull request #1234 from schlawiner/url-munching-language-switcher

Fix language switcher "eating" part of vocids that end in a langcode (e.g. "interessen" and "en")
NatLibFi · Nov 9, 2021 · 30ce5d0 · 30ce5d0
2 parents 3ea6c18 + 6787bd2
commit 30ce5d0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/view/topbar.twig b/view/topbar.twig
@@ -25,7 +25,7 @@
   <ul class="dropdown-menu dropdown-menu-right">
   {% for langcode, langdata in languages %}
   {% if request.lang != langcode %}
-  <li><a id="language-{{ langcode }}" class="versal" href="{{ request.langurl|replace({("#{request.lang}/"): "#{langcode}/"}) }}"> {{langdata.lemma}}</a></li>
+  <li><a id="language-{{ langcode }}" class="versal" href="{{ request.langurl|replace({("/#{request.lang}/"): "/#{langcode}/"}) }}"> {{langdata.lemma}}</a></li>
   {% endif %}
   {% endfor %}
   </ul>
@@ -34,7 +34,7 @@
 <div id="language"><span class="navigation-font">|</span>
   {% for langcode, langdata in languages %}
   {% if request.lang != langcode %}
-  <a id="language-{{ langcode}}" class="navigation-font" href="{{ request.langurl|replace({("#{request.lang}/"): "#{langcode}/"}) }}"> {{langdata.name}}</a>
+  <a id="language-{{ langcode}}" class="navigation-font" href="{{ request.langurl|replace({("/#{request.lang}/"): "/#{langcode}/"}) }}"> {{langdata.name}}</a>
   {% endif %}
   {% endfor %}
 </div>