From 97aedc97f1f967b59df3b6bb16414c4ad2ad5614 Mon Sep 17 00:00:00 2001
From: Nicolas AMBROISE <nicolas.ambroise@ctie.etat.lu>
Date: Fri, 13 Jun 2025 12:56:44 +0200
Subject: [PATCH 1/2] Fix language v2

---
 .../v2/languagenavigation/group.html                 |  4 ++--
 .../v2/languagenavigation/itemContent.html           |  5 ++++-
 .../v2/languagenavigation/languagenavigation.html    | 12 +++++-------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/group.html b/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/group.html
index 6e2739c91b..69fd1d6799 100644
--- a/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/group.html
+++ b/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/group.html
@@ -13,8 +13,8 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-<template data-sly-template.group="${@ items='The language navigation items for the current level'}" data-sly-use.itemTemplate="item.html">
-    <ul class="cmp-languagenavigation__group" data-sly-list.item="${items}">
+<template data-sly-template.group="${@ items='The language navigation items for the current level', label='The language navigation label'}" data-sly-use.itemTemplate="item.html">
+    <ul class="cmp-languagenavigation__group" data-sly-list.item="${items}" aria-label="${label}">
         <sly data-sly-call="${itemTemplate.item @ item = item}"></sly>
     </ul>
 </template>
diff --git a/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/itemContent.html b/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/itemContent.html
index c2d4355909..f60c5de92c 100644
--- a/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/itemContent.html
+++ b/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/itemContent.html
@@ -20,5 +20,8 @@
        data-cmp-clickable="${item.data ? true : false}"
        class="cmp-languagenavigation__item-link"
        data-sly-attribute="${item.link.htmlAttributes}"
-       hreflang="${item.language}" lang="${item.language}" rel="alternate">${item.title}</a>
+       hreflang="${item.language}" lang="${item.language}" rel="alternate"
+       title="${item.language} - ${item.title}">
+        <span>${item.language}</span>
+        <span>${item.title}</span>
 </template>
diff --git a/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/languagenavigation.html b/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/languagenavigation.html
index f863d2f4dc..63ea1f3ccb 100644
--- a/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/languagenavigation.html
+++ b/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/languagenavigation.html
@@ -13,15 +13,13 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-<nav data-sly-use.languageNavigation="com.adobe.cq.wcm.core.components.models.LanguageNavigation"
+<div data-sly-use.languageNavigation="com.adobe.cq.wcm.core.components.models.LanguageNavigation"
      data-sly-use.commonsTemplates="core/wcm/components/commons/v1/templates.html"
      data-sly-use.groupTemplate="group.html"
-     data-sly-call="${groupTemplate.group @ items=languageNavigation.items}"
-     data-sly-test.hasContent="${languageNavigation.items.size > 0}"
+     data-sly-call="${groupTemplate.group @ items=languageNavigation.items, label=languageNavigation.accessibilityLabel}"
+     data-sly-test.hasContent="${languageNavigation.items.size > 1}"
      data-cmp-data-layer="${languageNavigation.data.json}"
      id="${languageNavigation.id}"
-     class="cmp-languagenavigation"
-     aria-label="${languageNavigation.accessibilityLabel}"
-     role="navigation">
-</nav>
+     class="cmp-languagenavigation">
+</div>
 <sly data-sly-call="${commonsTemplates.placeholder @ isEmpty = !hasContent, classAppend='cmp-languagenavigation'}"></sly>

From 98f355cf4c6fec28c2064c30f72bd81a1e4d1374 Mon Sep 17 00:00:00 2001
From: Nicolas AMBROISE <nicolas.ambroise@ctie.etat.lu>
Date: Fri, 13 Jun 2025 13:34:37 +0200
Subject: [PATCH 2/2] Add the disclosure pattern to Language navigation

---
 .../components/models/LanguageNavigation.java     |  9 +++++++++
 .../v2/languagenavigation/_cq_dialog/.content.xml |  9 +++++++++
 .../v2/languagenavigation/group.html              |  4 ++--
 .../v2/languagenavigation/languagenavigation.html | 15 +++++++++++++--
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/models/LanguageNavigation.java b/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/models/LanguageNavigation.java
index cb0742397e..b5156f7b34 100644
--- a/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/models/LanguageNavigation.java
+++ b/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/models/LanguageNavigation.java
@@ -60,4 +60,13 @@ default String getAccessibilityLabel() {
         return null;
     }
 
+    /**
+     * Indicates whether the language navigation use the disclosure pattern.
+     *
+     * @return true if the language navigation use the disclosure pattern; false otherwise
+     */
+    default boolean isDropdown() {
+        return false;
+    }
+
 }
diff --git a/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/_cq_dialog/.content.xml b/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/_cq_dialog/.content.xml
index b87205c027..e149ebc277 100644
--- a/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/_cq_dialog/.content.xml
+++ b/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/_cq_dialog/.content.xml
@@ -72,6 +72,15 @@
                                                 fieldLabel="ID"
                                                 name="./id"
 												validation="html-unique-id-validator"/>
+                                            <dropdown
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
+                                                checked="${not empty cqDesign.isDropdown ? cqDesign.isDropdown : false}"
+                                                fieldDescription="The language structure use the dislosure pattern."
+                                                forceIgnoreFreshness="true"
+                                                name="./isDropdown"
+                                                uncheckedValue="false"
+                                                value="{Boolean}true"/>
                                         </items>
                                     </column>
                                 </items>
diff --git a/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/group.html b/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/group.html
index 69fd1d6799..563da73a6b 100644
--- a/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/group.html
+++ b/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/group.html
@@ -13,8 +13,8 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-<template data-sly-template.group="${@ items='The language navigation items for the current level', label='The language navigation label'}" data-sly-use.itemTemplate="item.html">
-    <ul class="cmp-languagenavigation__group" data-sly-list.item="${items}" aria-label="${label}">
+<template data-sly-template.group="${@ items='The language navigation items for the current level', label='The language navigation label', id='The language navigation id'}" data-sly-use.itemTemplate="item.html">
+    <ul class="cmp-languagenavigation__group" data-sly-list.item="${items}" aria-label="${label} id="${id}">
         <sly data-sly-call="${itemTemplate.item @ item = item}"></sly>
     </ul>
 </template>
diff --git a/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/languagenavigation.html b/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/languagenavigation.html
index 63ea1f3ccb..95d249879a 100644
--- a/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/languagenavigation.html
+++ b/content/src/content/jcr_root/apps/core/wcm/components/languagenavigation/v2/languagenavigation/languagenavigation.html
@@ -16,10 +16,21 @@
 <div data-sly-use.languageNavigation="com.adobe.cq.wcm.core.components.models.LanguageNavigation"
      data-sly-use.commonsTemplates="core/wcm/components/commons/v1/templates.html"
      data-sly-use.groupTemplate="group.html"
-     data-sly-call="${groupTemplate.group @ items=languageNavigation.items, label=languageNavigation.accessibilityLabel}"
      data-sly-test.hasContent="${languageNavigation.items.size > 1}"
      data-cmp-data-layer="${languageNavigation.data.json}"
-     id="${languageNavigation.id}"
      class="cmp-languagenavigation">
+    <sly data-sly-list.item="${languageNavigation.items}"
+         data-sly-test="${languageNavigation.isDropdown}">
+        <button data-sly-test="${item.active}"
+                class="cmp-languagenavigation-button"
+                type="button"
+                aria-controls="${languageNavigation.id}"
+                aria-label="${languageNavigation.accessibilityLabel} : ${item.language} – ${item.title}"
+                aria-expanded="false">
+            <span>${item.language}</span>
+            <span>${item.title}</span>
+        </button>
+    </sly>
+    <sly data-sly-call="${groupTemplate.group @ items=languageNavigation.items, label=languageNavigation.accessibilityLabel, id=languageNavigation.id}"></sly>
 </div>
 <sly data-sly-call="${commonsTemplates.placeholder @ isEmpty = !hasContent, classAppend='cmp-languagenavigation'}"></sly>