UHF-8088: Add language attributes to header top and branding regions.

hdbt.theme

@@ -36,16 +36,15 @@ function hdbt_preprocess(&$variables): void {
   $language = Drupal::languageManager()->getCurrentLanguage(LanguageInterface::TYPE_CONTENT);
   $variables['current_langcode'] = $language->getId();
   $variables['current_language'] = $language->getName();
-  $primary_languages = [
-    'fi',
-    'en',
-    'sv',
-  ];
-  $variables['alternative_language'] = !in_array($variables['current_langcode'], $primary_languages);
+
+  /** @var \Drupal\helfi_api_base\Language\DefaultLanguageResolver $defaultLanguageResolver */
+  $defaultLanguageResolver = Drupal::service('helfi_api_base.default_language_resolver');
+  $variables['alternative_language'] = $defaultLanguageResolver->isAltLanguage($language->getId());
 
   if ($variables['alternative_language']) {
-    $variables['lang_attributes']['fallback_lang'] = 'en';
-    $variables['lang_attributes']['fallback_dir'] = 'ltr';
+    $attributes = $defaultLanguageResolver->getFallbackLangAttributes();
+    $variables['lang_attributes']['fallback_lang'] = $attributes['lang'];
+    $variables['lang_attributes']['fallback_dir'] = $attributes['dir'];
   }
 
   // Toggle between global and local navigation in twig templates.
@@ -296,6 +295,9 @@ function hdbt_preprocess_node(&$variables): void {
   /** @var \Drupal\node\NodeInterface $node */
   $node = $variables['node'];
 
+  // Add current langcode for easy access.
+  $variables['node_langcode'] = $node->get('langcode')->value;
+
   // Add current node Url to variable.
   $variables['node_url'] = !$node->isNew() ? $node->toUrl('canonical') : NULL;
 
@@ -1437,8 +1439,11 @@ function hdbt_preprocess_social_media_links(&$variables): void {
       // Add lang and dir attributes if the link text is not translated.
       if ($key === 'email' && $variables['alternative_language']) {
         if (!isset(\Drupal::languageManager()->getLanguageConfigOverride($variables['current_langcode'], 'social_media.settings')->get('social_media')['email']['text'])) {
-          $element['attr']['lang'] = 'en';
-          $element['attr']['dir'] = 'ltr';
+          /** @var \Drupal\helfi_api_base\Language\DefaultLanguageResolver $defaultLanguageResolver */
+          $defaultLanguageResolver = Drupal::service('helfi_api_base.default_language_resolver');
+          $attributes = $defaultLanguageResolver->getFallbackLangAttributes();
+          $element['attr']['lang'] = $attributes['lang'];
+          $element['attr']['dir'] = $attributes['dir'];
         }
       }
     }

templates/block/block--external-menu-block-fallback.html.twig

@@ -55,10 +55,10 @@
     anchor_target: '#menu',
     js_target: 'js-menu-toggle-button',
 
-    open_label: 'Menu'|t,
+    open_label: 'Menu'|t({}, {'context': 'Mobile navigation menu open button text'}),
     open_screenreader: 'Open navigation menu'|t({}, {'context': 'Mobile navigation menu open button text for screen readers'}),
 
-    close_label: 'Close'|t,
+    close_label: 'Close'|t({}, {'context': 'Mobile navigation menu close button text'}),
     close_screenreader: 'Close navigation menu'|t({}, {'context': 'Mobile navigation menu close button text for screen readers'})
   } %}
   {% endembed %}

templates/content/node--announcement--default.html.twig

@@ -6,10 +6,23 @@
   {% set block_modifier = 'announcement--notification' %}
 {% endif %}
 
+{% set announcement_attributes = {
+  'class': [
+    'announcement__container',
+  ]
+} %}
+{% if current_langcode != node_langcode %}
+  {% set announcement_attributes = announcement_attributes|merge({
+    'dir': lang_attributes.fallback_dir,
+    'lang': lang_attributes.fallback_lang
+  })
+  %}
+{% endif %}
+
 {% set link = content.field_announcement_link[0] %}
 
 <section aria-label="{{ type_label }}" class="announcement js-announcement {{ block_modifier }} container" data-uuid="{{ node.uuid.value }}">
-  <div class="announcement__container">
+  <div {{ create_attribute(announcement_attributes) }}>
     <div class="announcement__content">
       {% if content.body|render != null %}
         <span class="announcenemnt__content-body">

templates/layout/page.html.twig

@@ -66,7 +66,19 @@
       {% endif %}
 
       {% if page.header_branding %}
-        <div id="header-branding" class="header-branding">
+        {% set header_branding_attributes = {
+            'id': 'header-branding',
+            'class': ['header-branding']
+          }
+        %}
+        {% if alternative_language %}
+          {% set header_branding_attributes = header_branding_attributes|merge({
+              'dir': lang_attributes.fallback_dir,
+              'lang': lang_attributes.fallback_lang
+            })
+          %}
+        {% endif %}
+        <div {{ create_attribute(header_branding_attributes) }}>
           {% set prefix = active_theme == 'hdbt_subtheme' ? 'hdbt_subtheme_' : '' %}
 
           {# Manually select which blocks to render in header branding region. #}

templates/layout/region--header-top.html.twig

@@ -13,7 +13,7 @@
  */
 #}
 {% if content %}
-  <div class="header-top">
+  <div{{ attributes.addClass(region|clean_class) }}>
     {{ content }}
   </div>
 {% endif %}

translations/fi.po

@@ -173,6 +173,14 @@ msgstr "Päivitämme sivustoa tällä hetkellä"
 msgid "You do not have permission to access this page"
 msgstr "Sinulla ei ole käyttöoikeutta tälle sivulle"
 
+msgctxt "Mobile navigation menu open button text"
+msgid "Menu"
+msgstr "Valikko"
+
+msgctxt "Mobile navigation menu close button text"
+msgid "Close"
+msgstr "Sulje"
+
 msgctxt "Mobile navigation menu open button text for screen readers"
 msgid "Open navigation menu"
 msgstr "Avaa navigaatiovalikko"

translations/sv.po

@@ -171,6 +171,14 @@ msgstr ""
 msgid "You do not have permission to access this page"
 msgstr "Du har inte användarrätt till sidan"
 
+msgctxt "Mobile navigation menu open button text"
+msgid "Menu"
+msgstr "Meny"
+
+msgctxt "Mobile navigation menu close button text"
+msgid "Close"
+msgstr "Stäng"
+
 msgctxt "Mobile navigation menu open button text for screen readers"
 msgid "Open navigation menu"
 msgstr "Öppna navigeringsmenyn"