From f50959837fee07c45094c2b23bc4047d12263579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Sun, 9 Oct 2022 20:11:48 +0200
Subject: [PATCH] Fixed issue that change of language via language selector did
 not changed the navbar and sidebar

---
 templates/_navbar.html.twig        | 7 +------
 templates/_turbo_control.html.twig | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/templates/_navbar.html.twig b/templates/_navbar.html.twig
index e6e96dd3..03e04632 100644
--- a/templates/_navbar.html.twig
+++ b/templates/_navbar.html.twig
@@ -68,12 +68,7 @@
                         <li role="separator" class="dropdown-divider"></li>
                         <h6 class="dropdown-header">{% trans %}user.language_select{% endtrans %}</h6>
                         <div id="locale-select-menu">
-                            {% for locale in locale_menu %}
-                                <a class="dropdown-item" data-turbo="false" data-turbo-frame="_top"
-                                   href="{{ path(app.request.attributes.get('_route'),
-                                       app.request.attributes.get('_route_params')|merge({'_locale': locale})) }}">
-                                    {{ locale|language_name }} ({{ locale|upper }})</a>
-                            {% endfor %}
+                            {# This menu is filled by 'turbo/locale_menu' controller from the _turbo_control.html.twig template, to always have the correct path #}
                         </div>
                     </ul>
                 </li>
diff --git a/templates/_turbo_control.html.twig b/templates/_turbo_control.html.twig
index ec203884..35140f62 100644
--- a/templates/_turbo_control.html.twig
+++ b/templates/_turbo_control.html.twig
@@ -22,7 +22,7 @@
 
 <div class="d-none" {{ stimulus_controller('turbo/locale_menu') }}>
     {% for locale in locale_menu %}
-        <a class="dropdown-item" data-turbo="false" href="{{ path(app.request.attributes.get('_route'),
+        <a class="dropdown-item" data-turbo="false" data-turbo-frame="_top" href="{{ path(app.request.attributes.get('_route'),
             app.request.attributes.get('_route_params')|merge({'_locale': locale})) }}">
             {{ locale|language_name }} ({{ locale|upper }})</a>
     {% endfor %}