From b59ccffbfa57b7821a6d7d652845cb0fae5e52e4 Mon Sep 17 00:00:00 2001
From: Elisabeth Dickinson <edi@odoo.com>
Date: Fri, 19 Feb 2021 11:13:04 +0100
Subject: [PATCH] fix lang/version switchers

---
 .../odoo_theme/layout_templates/language_switcher.html    | 8 +++++---
 .../odoo_theme/layout_templates/version_switcher.html     | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/extensions/odoo_theme/layout_templates/language_switcher.html b/extensions/odoo_theme/layout_templates/language_switcher.html
index ee9f67b9a..326a1db16 100644
--- a/extensions/odoo_theme/layout_templates/language_switcher.html
+++ b/extensions/odoo_theme/layout_templates/language_switcher.html
@@ -1,9 +1,11 @@
 <div class="o_languages me-2">
-	<div class="languages dropdown">
-        <button class="btn border dropdown-toggle" id="languages">{{ language }}</button>
+	<div class="dropdown">
+        <button class="btn border dropdown-toggle" id="languages" data-bs-toggle="dropdown">
+            {{ language }} {# The current language #}
+        </button>
         <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="languages">
             {% for alternate_language, language_code, url in alternate_languages %}
-            <li><a class="dropdown-item" href="{{ url }}">{{ alternate_language }}</a></li>
+                <li><a class="dropdown-item" href="{{ url }}">{{ alternate_language }}</a></li>
             {% endfor %}
         </ul>
 	</div>
diff --git a/extensions/odoo_theme/layout_templates/version_switcher.html b/extensions/odoo_theme/layout_templates/version_switcher.html
index a1e64bd10..a07b37976 100644
--- a/extensions/odoo_theme/layout_templates/version_switcher.html
+++ b/extensions/odoo_theme/layout_templates/version_switcher.html
@@ -4,10 +4,12 @@
     </div>
     <div class="col-8">
         <div class="dropdown">
-            <button class="btn border dropdown-toggle" id="versions">{{ version }}</button>
-            <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="versions">
+            <button class="btn border dropdown-toggle" id="versions" data-bs-toggle="dropdown">
+                {{ version }} {# The current version #}
+            </button>
+            <ul class="dropdown-menu" aria-labelledby="versions">
                 {% for alternate_version, url in alternate_versions %}
-                <li><a class="dropdown-item" href="{{ url }}">{{ alternate_version }}</a></li>
+                    <li><a class="dropdown-item" href="{{ url }}">{{ alternate_version }}</a></li>
                 {% endfor %}
             </ul>
         </div>