Francesco SARDARA · 48d22393 · 48d22393 · 48d22393 · 48d22393 · 48d22393
--- a/composer.json
+++ b/composer.json
       "drupal/core": "^8.9 || ^9.1",
       "drupal/ui_patterns": "^1.0",
       "drupal/ui_patterns_settings": "^1.0",
-       "openeuropa/oe_bootstrap_theme": "0.100920211846",
+       "openeuropa/oe_bootstrap_theme": "0.140920211750",
       "openeuropa/oe_authentication": "^1.4",
+       "openeuropa/oe_multilingual": "^1.8",
--- a/templates/overrides/navigation/links--language-block.html.twig
+++ b/templates/overrides/navigation/links--language-block.html.twig
+   - link
+     - label
+     - href
+     - target
+   - modal
+#}
+
+{% set _language = {
+ link: {
+   label: language.link.label|default(''),
+   href: language.link.href|default('#'),
+   target: language.link.target|default(language.modal.id|default('')),
+ },
+ modal: language.modal,
+} %}
+
--- a/templates/patterns/modal/modal-language.html.twig
+++ b/templates/patterns/modal/modal-language.html.twig
+     {% for link in eu_links|batch(_number_items) %}
+       {% if loop.index % 2 == 0 %}
+         <div class="col col-lg-4 offset-lg-2">
+       {% else %}
+         <div class="col col-lg-4">
+       {% endif %}
+           <div class="oe-language__list">
+             {% for id, data in link %}
+               <a id="{{ data.id }}" href="{{ data.href|default('#') }}" class="oe-language__item">{{ data.name }}</a>
+             {% endfor %}
+           </div>
+         </div>
+     {% endfor %}
+     </div>
+     {% if non_eu_links %}
+       <div class="row">
--- a/templates/patterns/modal/modal-language.html.twig
+++ b/templates/patterns/modal/modal-language.html.twig
+     - links
+   - footer
+     - label
+#}
+
+{% if header %}
+ {% set _header %}
+   <h5 class="modal-title" id="languageeModalLabel">{{ header.title|default('Select your language') }}</h5>
+   <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{ header.label|default('Close') }}"></button>
+ {% endset %}
+{% endif %}
+
+{% if eu_links or non_eu_links %}
+ {% set _body %}
+   <div class="container">
+     <div class="row">
--- a/tests/src/Kernel/MultilingualBlockTest.php
+++ b/tests/src/Kernel/MultilingualBlockTest.php
+   $crawler = new Crawler($render->__toString());
+
+   $block = $crawler->filter('#block-languageswitcherinterfacetext');
+   $this->assertCount(1, $block);
+   $link = $crawler->filter('a.nav-link');
+   $this->assertSame('English', trim($link->text()));
+   $this->assertSame('English', $link->attr('href'));
+   $title = $crawler->filter('h5#languageeModalLabel');
+   $this->assertSame('Select your language', $title->text());
+   $button_header = $crawler->filter('button.btn-close');
+   $this->assertSame('Close', $button_header->attr('aria-label'));
+   $title = $crawler->filter('h5.oe-language__title');
+   $this->assertSame('EU official languages', $title->text());
+   $link_language = $crawler->filter('a#link_en');
+   $this->assertSame('/en/<none>', $link_language->attr('href'));
+   $this->assertSame('English', $link_language->text());
--- a/oe_whitelabel.theme
+++ b/oe_whitelabel.theme
+function oe_whitelabel_preprocess_links__language_block(&$variables) {
+ /** @var \Drupal\Core\Language\LanguageInterface[] $original_languages */
+ $original_languages = \Drupal::service('language_manager')->getNativeLanguages();
+ $currentLanguage = \Drupal::languageManager()->getCurrentLanguage()->getName();
+ $variables['language']['link'] = [
+   'label' => $currentLanguage,
+   'href' => $currentLanguage,
+   'target' => 'languageModal',
+ ];
+
+ $eu_links = [];
+ $non_eu_links = [];
+ foreach ($original_languages as $language) {
+   $url = $variables['links'][$language->getId()]['link']['#url'];
+   $host = \Drupal::request()->getHost();
+
--- a/oe_whitelabel.theme
+++ b/oe_whitelabel.theme
+ unset($variables['links']);
+ $variables['language']['modal'] = [
+   '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'),
+   ],
+ ];
+ unset($variables['links']);
+