From 293da1ab5f2dfb39212b821164e86931dee716f9 Mon Sep 17 00:00:00 2001
From: barbara oliveira <barbarafictiovore@gmail.com>
Date: Tue, 17 Dec 2024 15:32:33 +0100
Subject: [PATCH 1/7] add role & aria-label to nav menu for accessibility
 compliance

---
 decidim-core/app/views/decidim/pages/_tabbed.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/decidim-core/app/views/decidim/pages/_tabbed.html.erb b/decidim-core/app/views/decidim/pages/_tabbed.html.erb
index 63e76d04627f4..458ee656e1244 100644
--- a/decidim-core/app/views/decidim/pages/_tabbed.html.erb
+++ b/decidim-core/app/views/decidim/pages/_tabbed.html.erb
@@ -10,7 +10,7 @@
   </header>
 
   <div class="vertical-tabs">
-    <nav>
+    <nav role="navigation" aria-label="Sous menu - <%= translated_attribute(page.title) %>">
       <button id="dropdown-trigger-pages" data-component="dropdown" data-target="dropdown-menu-pages" data-open-md="true" data-auto-close="true">
         <span>
           <%= translated_attribute(page.title) %>

From 4683b532396675d2075896e0905dc2c39cc30313 Mon Sep 17 00:00:00 2001
From: barbara oliveira <barbarafictiovore@gmail.com>
Date: Tue, 17 Dec 2024 17:00:00 +0100
Subject: [PATCH 2/7] try fix one failed test

---
 .../spec/services/decidim/accountability/diff_renderer_spec.rb  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/decidim-accountability/spec/services/decidim/accountability/diff_renderer_spec.rb b/decidim-accountability/spec/services/decidim/accountability/diff_renderer_spec.rb
index c1f13012e9790..cc8b00c9ca377 100644
--- a/decidim-accountability/spec/services/decidim/accountability/diff_renderer_spec.rb
+++ b/decidim-accountability/spec/services/decidim/accountability/diff_renderer_spec.rb
@@ -50,7 +50,7 @@
     it "generates the labels correctly" do
       expected_labels = {
         description_ca: "Description (Català)",
-        description_machine_translations_es: "Description (automatic translation in Castellano)",
+        description_machine_translations_es: "Description (traducción automática a Castellano)",
         progress: "Progress",
         start_date: "Start date",
         title_en: "Title (English)",

From f44b979e4fe33841514f970bdf5bfac8d1549742 Mon Sep 17 00:00:00 2001
From: barbara oliveira <barbarafictiovore@gmail.com>
Date: Wed, 18 Dec 2024 16:38:13 +0100
Subject: [PATCH 3/7] aria-current to active links in navigation menu

---
 decidim-core/app/views/decidim/pages/_tabbed.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/decidim-core/app/views/decidim/pages/_tabbed.html.erb b/decidim-core/app/views/decidim/pages/_tabbed.html.erb
index 458ee656e1244..c5d88648c7e8f 100644
--- a/decidim-core/app/views/decidim/pages/_tabbed.html.erb
+++ b/decidim-core/app/views/decidim/pages/_tabbed.html.erb
@@ -21,7 +21,7 @@
       <ul id="dropdown-menu-pages" class="vertical-tabs__list" role="menu">
         <% pages.each do |sibling| %>
           <li class="<%= "is-active" if page == sibling %>" role="menuitem">
-            <%= link_to translated_attribute(sibling.title), page_path(sibling.slug) %>
+            <%= link_to translated_attribute(sibling.title), page_path(sibling.slug), aria_current: ("true"if page == sibling) %>
           </li>
         <% end %>
       </ul>

From 601a7c0be43ef4d794be3cc63a4e3315923b772c Mon Sep 17 00:00:00 2001
From: barbara oliveira <barbarafictiovore@gmail.com>
Date: Wed, 18 Dec 2024 17:21:19 +0100
Subject: [PATCH 4/7] update update aria-label in nav menu

---
 decidim-core/app/views/decidim/pages/_tabbed.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/decidim-core/app/views/decidim/pages/_tabbed.html.erb b/decidim-core/app/views/decidim/pages/_tabbed.html.erb
index c5d88648c7e8f..15af4b4d19d42 100644
--- a/decidim-core/app/views/decidim/pages/_tabbed.html.erb
+++ b/decidim-core/app/views/decidim/pages/_tabbed.html.erb
@@ -10,7 +10,7 @@
   </header>
 
   <div class="vertical-tabs">
-    <nav role="navigation" aria-label="Sous menu - <%= translated_attribute(page.title) %>">
+    <nav role="navigation" aria-label="<%= i18n.t(".navigation.aria_label", title: translated_attribute(page.title)) %>">
       <button id="dropdown-trigger-pages" data-component="dropdown" data-target="dropdown-menu-pages" data-open-md="true" data-auto-close="true">
         <span>
           <%= translated_attribute(page.title) %>

From 8f00d456929fb4c05dea8a16951bac998a58a7f2 Mon Sep 17 00:00:00 2001
From: barbara oliveira <barbarafictiovore@gmail.com>
Date: Wed, 18 Dec 2024 17:48:31 +0100
Subject: [PATCH 5/7] refactor: use translation key for aria-label in response
 to review feedback

---
 decidim-core/app/views/decidim/pages/_tabbed.html.erb | 4 ++--
 decidim-core/config/locales/en.yml                    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/decidim-core/app/views/decidim/pages/_tabbed.html.erb b/decidim-core/app/views/decidim/pages/_tabbed.html.erb
index 15af4b4d19d42..0557719c0e007 100644
--- a/decidim-core/app/views/decidim/pages/_tabbed.html.erb
+++ b/decidim-core/app/views/decidim/pages/_tabbed.html.erb
@@ -10,8 +10,8 @@
   </header>
 
   <div class="vertical-tabs">
-    <nav role="navigation" aria-label="<%= i18n.t(".navigation.aria_label", title: translated_attribute(page.title)) %>">
-      <button id="dropdown-trigger-pages" data-component="dropdown" data-target="dropdown-menu-pages" data-open-md="true" data-auto-close="true">
+    <nav role="navigation" aria-label="<%= I18n.t("layouts.decidim.navigation.aria_label", title: translated_attribute(page.title)) %>">
+    <button id="dropdown-trigger-pages" data-component="dropdown" data-target="dropdown-menu-pages" data-open-md="true" data-auto-close="true">
         <span>
           <%= translated_attribute(page.title) %>
         </span>
diff --git a/decidim-core/config/locales/en.yml b/decidim-core/config/locales/en.yml
index 5319f4b968057..2105956070262 100644
--- a/decidim-core/config/locales/en.yml
+++ b/decidim-core/config/locales/en.yml
@@ -2123,6 +2123,8 @@ en:
         expire_time_html: Your session will expire in <b><span class="minutes">%{minutes}</span> minutes</b>.
       language_chooser:
         choose_language: Choose language
+      navigation:
+        aria_label: Navigation menu - %{title}
       notifications_dashboard:
         mark_all_as_read: Mark all as read
         mark_as_read: Mark as read

From 8acb9d27e5f2b3b53ac37f416b2ca9ae1cb35815 Mon Sep 17 00:00:00 2001
From: barbara oliveira <barbarafictiovore@gmail.com>
Date: Wed, 18 Dec 2024 18:01:18 +0100
Subject: [PATCH 6/7] reset changing spec

---
 .../spec/services/decidim/accountability/diff_renderer_spec.rb  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/decidim-accountability/spec/services/decidim/accountability/diff_renderer_spec.rb b/decidim-accountability/spec/services/decidim/accountability/diff_renderer_spec.rb
index cc8b00c9ca377..c1f13012e9790 100644
--- a/decidim-accountability/spec/services/decidim/accountability/diff_renderer_spec.rb
+++ b/decidim-accountability/spec/services/decidim/accountability/diff_renderer_spec.rb
@@ -50,7 +50,7 @@
     it "generates the labels correctly" do
       expected_labels = {
         description_ca: "Description (Català)",
-        description_machine_translations_es: "Description (traducción automática a Castellano)",
+        description_machine_translations_es: "Description (automatic translation in Castellano)",
         progress: "Progress",
         start_date: "Start date",
         title_en: "Title (English)",

From e064a3ecd46e28b05bd14c95e8b829994f30d154 Mon Sep 17 00:00:00 2001
From: barbara oliveira <barbarafictiovore@gmail.com>
Date: Thu, 19 Dec 2024 17:29:01 +0100
Subject: [PATCH 7/7] update condition in response to review feedback

---
 decidim-core/app/views/decidim/pages/_tabbed.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/decidim-core/app/views/decidim/pages/_tabbed.html.erb b/decidim-core/app/views/decidim/pages/_tabbed.html.erb
index 0557719c0e007..840d5f5a89392 100644
--- a/decidim-core/app/views/decidim/pages/_tabbed.html.erb
+++ b/decidim-core/app/views/decidim/pages/_tabbed.html.erb
@@ -21,7 +21,7 @@
       <ul id="dropdown-menu-pages" class="vertical-tabs__list" role="menu">
         <% pages.each do |sibling| %>
           <li class="<%= "is-active" if page == sibling %>" role="menuitem">
-            <%= link_to translated_attribute(sibling.title), page_path(sibling.slug), aria_current: ("true"if page == sibling) %>
+            <%= link_to translated_attribute(sibling.title), page_path(sibling.slug), aria_current: (page == sibling).to_s %>
           </li>
         <% end %>
       </ul>