Merge pull request #486 from devgeniem/TMS-940

TMS-940: mobile language-nav accessibility fix
devgeniem · Dec 4, 2023 · ee0095d · ee0095d
2 parents 9f06e6b + 4a50ede
commit ee0095d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
     - Search-page form accessibility fixes
     - Header search accessibility fixes
     - Added focus on input when opening header search
+- TMS-940: Hide current language on mobile header if only 2 languages in use
 
 ## [1.54.2] - 2023-11-22
 

diff --git 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
@@ -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}

diff --git 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}