From 57b5dc59a8d1b99cf41aa2a7c8a3903ce01813ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= <eepi1994@hotmail.com>
Date: Mon, 27 Nov 2023 11:49:38 +0200
Subject: [PATCH] TMS-940: mobile language-nav accessibility fix

---
 CHANGELOG.MD                           |  2 ++
 models/shared/header.php               | 16 +++++++++++++---
 partials/shared/header-inner.dust      | 22 ++++++++++++++--------
 partials/ui/menu/menu-item-simple.dust |  2 +-
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index aedc1463..4d46d69c 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- TMS-940: Hide current language on mobile header if only 2 languages in use
+
 ## [1.54.2] - 2023-11-22
 
 - TMS-974: Fix event formatting if only manual events are shown
diff --git a/models/shared/header.php b/models/shared/header.php
index 2eadf1d5..6cd1ebbf 100644
--- a/models/shared/header.php
+++ b/models/shared/header.php
@@ -86,9 +86,18 @@ public function language_nav() : ?array {
             'hide_empty' => 0,
         ];
 
-        $languages = pll_the_languages( $args );
+        $languages = \pll_the_languages( $args );
         $lang_data = [ 'all' => $languages ];
 
+        // If there are two languages, show only one in mobile view
+        if ( count( $languages ) === 2 ) {
+            $args['hide_current'] = 1;
+            $without_current      = \pll_the_languages( $args );
+            $lang_data_mobile     = [
+                'all' => $without_current,
+            ];
+        }
+
         foreach ( $languages as $lang ) {
             if ( ! empty( $lang['current_lang'] ) ) {
                 $lang_data['current'] = $lang;
@@ -99,10 +108,11 @@ public function language_nav() : ?array {
         }
 
         return [
-            'partial' => 'dropdown' === $lang_nav_display
+            'partial'               => 'dropdown' === $lang_nav_display
                 ? 'ui/menu/language-nav-dropdown'
                 : 'ui/menu/language-nav',
-            'links'   => $lang_data,
+            'links'                 => $lang_data,
+            'links_without_current' => $lang_data_mobile,
         ];
     }
 
diff --git a/partials/shared/header-inner.dust b/partials/shared/header-inner.dust
index 538f93c4..9d2d6b13 100644
--- a/partials/shared/header-inner.dust
+++ b/partials/shared/header-inner.dust
@@ -16,11 +16,17 @@
             {/Header.lang_nav_horizontal}
 
             {?Header.lang_nav_horizontal}
-            <div class="is-hidden-desktop">
+                <div class="is-hidden-desktop">
+                    {?Header.language_nav.links_without_current}
+                        {>"ui/menu/language-nav" links=Header.language_nav.links_without_current /}
+                    {:else}
+                        {>"ui/menu/language-nav-dropdown" links=Header.language_nav.links /}
+                    {/Header.language_nav.links_without_current}
+                </div>
             {/Header.lang_nav_horizontal}
-            {>"ui/menu/language-nav-dropdown" links=Header.language_nav.links /}
-            {?Header.lang_nav_horizontal}
-            </div>
+
+            {^Header.lang_nav_horizontal}
+                {>"ui/menu/language-nav-dropdown" links=Header.language_nav.links /}
             {/Header.lang_nav_horizontal}
 
             {^Header.hide_search}
@@ -31,7 +37,7 @@
                 <button class="fly-out-nav__trigger {?Header.hide_search}ml-4{/Header.hide_search} {^Header.hide_main_nav}is-hidden-widescreen{/Header.hide_main_nav}"
                         data-micromodal-trigger="js-fly-out-nav">
                     {>"ui/icon" icon="burger" class="icon--large" /}
-                    <span class="is-sr-only">{Strings.s.header.open_menu|s}</span>
+                    <span class="is-sr-only">{Strings.s.header.open_menu|html}</span>
                 </button>
             {/Header.has_nav_menu}
 
@@ -41,14 +47,14 @@
 
     {^Header.hide_search}
         <div id="js-search-toggle-target"
-             class="site-header__popup is-hidden is-absolute has-right-0 has-bottom-0 has-left-0 has-transform-y-100 {Header.colors.search_popup_container}"
+             class="site-header__popup is-hidden is-absolute has-right-0 has-bottom-0 has-left-0 has-transform-y-100 {Header.colors.search_popup_container|attr}"
              role="search">
             <div class="container">
                 <div class="columns">
                     <div class="column is-8 is-offset-2-tablet is-6-desktop is-offset-3-desktop">
                         <div class="pt-6 pb-6 pt-8-desktop pb-8-desktop">
                             <div class="popup__label h4 mb-6">
-                                {Strings.s.header.search_title|s}
+                                {Strings.s.header.search_title|html}
                             </div>
 
                             {>"ui/search-form" button_class="{Header.colors.search_button} mb-2 mb-0-tablet" /}
@@ -61,7 +67,7 @@
 </div>
 
 {^Header.hide_main_nav}
-    <div class="site-header__nav is-relative is-hidden-touch is-hidden-desktop-only {Header.colors.nav|s}">
+    <div class="site-header__nav is-relative is-hidden-touch is-hidden-desktop-only {Header.colors.nav|attr}">
         <div class="container">
             <div class="columns mt-0 mb-0">
                 <nav class="column pt-0 pb-0" aria-label="{Strings.s.header.main_navigation|attr}">
diff --git a/partials/ui/menu/menu-item-simple.dust b/partials/ui/menu/menu-item-simple.dust
index 85309a5c..b9ad0752 100644
--- a/partials/ui/menu/menu-item-simple.dust
+++ b/partials/ui/menu/menu-item-simple.dust
@@ -1,4 +1,4 @@
-<a href="{url}" class="navbar-item {#classes}{.}{@sep} {/sep}{/classes}" {?classes.is_current}aria-page="current"{/classes.is_current}>
+<a href="{url}" class="navbar-item {#classes}{.}{@sep} {/sep}{/classes}" {?classes.is_current}aria-current="page"{/classes.is_current}>
     {title|s}
 
     {?icon}