OEL-1307: Move language_modal to oe_whitelabel_multilingual module.

composer.json

@@ -10,7 +10,7 @@
         "cweagans/composer-patches": "^1.7",
         "drupal/core": "^9.2",
         "drupal/twig_field_value": "^2.0",
-        "openeuropa/oe_bootstrap_theme": "0.1307.202203181216"
+        "openeuropa/oe_bootstrap_theme": "0.1307.202203281705"
     },
     "require-dev": {
         "composer/installers": "^1.11",

modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.module

@@ -8,6 +8,7 @@
 declare(strict_types =  1);
 
 use Drupal\Component\Utility\Html;
+use Drupal\oe_whitelabel_helper\EuropeanUnionLanguages;
 
 /**
  * Implements hook_preprocess_links().
@@ -70,6 +71,10 @@ function oe_whitelabel_multilingual_preprocess_links__oe_multilingual_content_la
 function oe_whitelabel_multilingual_preprocess_links__language_block(&$variables) {
   $currentLanguage = \Drupal::languageManager()->getCurrentLanguage();
   $current_language_id = $currentLanguage->getId();
+  $language_internal = $current_language_id;
+  if (EuropeanUnionLanguages::hasLanguage($current_language_id)) {
+    $language_internal = EuropeanUnionLanguages::getInternalLanguageCode($current_language_id);
+  }
   $language_config_storage = \Drupal::entityTypeManager()->getStorage('configurable_language');
   $eu_links = [];
   $non_eu_links = [];
@@ -84,10 +89,11 @@ function oe_whitelabel_multilingual_preprocess_links__language_block(&$variables
     $label = $link['link']['#title'];
 
     $link = [
-      'href' => $href,
+      'path' => $href,
       'name' => $label,
       'id' => 'link_' . $language_code,
-      'hreflang' => $language_code,
+      'label' => $label,
+      'lang' => $language_internal,
     ];
 
     if (!empty($current_language_id) && $language_code === $current_language_id) {
@@ -107,17 +113,14 @@ function oe_whitelabel_multilingual_preprocess_links__language_block(&$variables
     }
   }
 
-  $variables['language']['modal'] = [
+  $variables['language']['modal']['language_list'] = [
+    'overlay' => TRUE,
+    'variant' => $variables['bcl_component_library'],
+    'title' => t('Select your language'),
+    'items' => $eu_links,
+    'non_eu_items' => $non_eu_links,
+    'icon_path' => $variables['bcl_icon_path'],
     'id' => 'languageModal',
     'size' => 'fullscreen',
-    'header' => [
-      'title' => t('Select your language'),
-      'label' => t('Close'),
-    ],
-    'eu_links' => $eu_links,
-    'non_eu_links' => $non_eu_links,
-    'footer' => [
-      'label' => t('Close'),
-    ],
   ];
 }

oe_whitelabel.theme

@@ -11,66 +11,6 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 use Drupal\oe_whitelabel_helper\EuropeanUnionLanguages;
 
-/**
- * Implements hook__preprocess_links__language_block().
- */
-function oe_whitelabel_preprocess_links__language_block(&$variables) {
-  $currentLanguage = \Drupal::languageManager()->getCurrentLanguage();
-  $current_language_id = $currentLanguage->getId();
-  $language_internal = $current_language_id;
-  if (EuropeanUnionLanguages::hasLanguage($current_language_id)) {
-    $language_internal = EuropeanUnionLanguages::getInternalLanguageCode($current_language_id);
-  }
-  $language_config_storage = \Drupal::entityTypeManager()->getStorage('configurable_language');
-  $eu_links = [];
-  $non_eu_links = [];
-
-  foreach ($variables['links'] as $language_code => $link) {
-    /** @var \Drupal\Core\Url $url */
-    $url = $link['link']['#url'];
-    $href = $url
-      ->setOptions($link['link']['#options'])
-      ->setAbsolute(TRUE)
-      ->toString();
-    $label = $link['link']['#title'];
-
-    $link = [
-      'path' => $href,
-      'name' => $label,
-      'id' => 'link_' . $language_code,
-      'label' => $label,
-      'lang' => $language_internal,
-    ];
-
-    if (!empty($current_language_id) && $language_code === $current_language_id) {
-      $variables['language']['link'] = $link;
-      $variables['language']['link']['target'] = 'languageModal';
-      $link['active'] = TRUE;
-    }
-
-    $language_config = $language_config_storage->load($language_code);
-    $category = $language_config->getThirdPartySetting('oe_multilingual', 'category');
-
-    if ($category === 'eu') {
-      $eu_links[$language_code] = $link;
-    }
-    else {
-      $non_eu_links[$language_code] = $link;
-    }
-  }
-
-  $variables['language']['modal']['language_list'] = [
-    'overlay' => TRUE,
-    'variant' => $variables['bcl_component_library'],
-    'title' => t('Select your language'),
-    'items' => $eu_links,
-    'non_eu_items' => $non_eu_links,
-    'icon_path' => $variables['bcl_icon_path'],
-    'id' => 'languageModal',
-    'size' => 'fullscreen',
-  ];
-}
-
 /**
  * Implements hook_form_FORM_ID_alter() for facets_forms.
  */