Francesco SARDARA · 6a0fbd27 · 6a0fbd27 · 6a0fbd27 · 6a0fbd27 · 6a0fbd27
--- a/tests/src/Kernel/ContentLanguageSwitcherTest.php
+++ b/tests/src/Kernel/ContentLanguageSwitcherTest.php
+   $plugin_block = $block_manager->createInstance('oe_multilingual_content_language_switcher', $config);
+   $render = $plugin_block->build();
+   $html = (string) $this->container->get('renderer')->renderRoot($render);
+   $crawler = new Crawler($html);
+
+   // Make sure that content language switcher block is present.
+   $actual = $crawler->filter('#dropdown-languages');
+   $this->assertCount(1, $actual);
+
+   // Warning message doesn't contain the unavailable language, the translation
+   // will have it.
+   $this->assertUnavailableLanguage($crawler, 'This page is not available in български.');
+
+   // Make sure that available languages are properly rendered.
+   $this->assertTranslationLinks($crawler, ['español', 'English']);
+ }
--- a/tests/src/Kernel/ContentLanguageSwitcherTest.php
+++ b/tests/src/Kernel/ContentLanguageSwitcherTest.php
+*/
+class ContentLanguageSwitcherTest extends KernelTestBase {
+ /**
+  * {@inheritdoc}
+  */
+ public static $modules = [
+   'block',
+   'content_translation',
+   'language',
+   'locale',
+   'node',
+   'oe_bootstrap_theme_helper',
+   'oe_multilingual',
+   'oe_whitelabel_helper',
+   'oe_whitelabel_multilingual',
+   'system',
--- a/tests/src/Kernel/ContentLanguageSwitcherTest.php
+++ b/tests/src/Kernel/ContentLanguageSwitcherTest.php
+namespace Drupal\Tests\oe_whitelabel\Kernel;
+
+use Drupal\node\Entity\Node;
+use Drupal\KernelTests\KernelTestBase;
+use Symfony\Component\DomCrawler\Crawler;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+* Test content language switcher rendering.
+*/
+class ContentLanguageSwitcherTest extends KernelTestBase {
+ /**
+  * {@inheritdoc}
+  */
+ public static $modules = [
+   'block',
--- a/tests/src/Kernel/ContentLanguageSwitcherTest.php
+++ b/tests/src/Kernel/ContentLanguageSwitcherTest.php
+   $html = (string) $this->container->get('renderer')->renderRoot($render);
+   $crawler = new Crawler($html);
+
+   // Verify that the requested language is set as unavailable.
+   $this->assertUnavailableLanguage($crawler, 'This page is not available in español.');
+
+   // Verify that the content has been rendered in the fallback language.
+   $this->assertSelectedLanguage($crawler, 'English');
+   
+   // Re-render the block assuming a request to the base language English
+   // version of the node.
+   $this->setCurrentRequest('/en/node/' . $node->id());
+
+   $html = (string) $this->container->get('renderer')->renderRoot($render);
+   $crawler = new Crawler($html);
+   $render = $plugin_block->build();
--- a/tests/src/Kernel/ContentLanguageSwitcherTest.php
+++ b/tests/src/Kernel/ContentLanguageSwitcherTest.php
+
+   $html = (string) $this->container->get('renderer')->renderRoot($render);
+   $crawler = new Crawler($html);
+
+   // Verify that the requested language is set as unavailable.
+   $this->assertUnavailableLanguage($crawler, 'This page is not available in español.');
+
+   // Verify that the content has been rendered in the fallback language.
+   $this->assertSelectedLanguage($crawler, 'English');
+
+   // Simulate a request to the canonical route of the node base language.
+   $this->setCurrentRequest('/node/' . $node->id());
+
+   $html = (string) $this->container->get('renderer')->renderRoot($render);
+   $crawler = new Crawler($html);
+
--- a/templates/overrides/navigation/links--oe-multilingual-content-language-block.html.twig
+++ b/templates/overrides/navigation/links--oe-multilingual-content-language-block.html.twig
+ {% set _message = {
+   message: "This page is not available in @language."|t({'@language': unavailable_language}),
+   path: bcl_icon_path,
+   variant: "warning",
+ }%}
+ {% set _expandable = {
+   label: "Choose another language"|t,
+   icon: {
+     name: "caret-down-fill",
+     path: bcl_icon_path,
+   },
+   outline: "true",
+ } %}
+
+ {% set _languages = languages|default([]) %}
+ {% set _expandable_attributes = _expandable.attributes ?: create_attribute() %}
--- a/templates/overrides/navigation/links--oe-multilingual-content-language-block.html.twig
+++ b/templates/overrides/navigation/links--oe-multilingual-content-language-block.html.twig
+ @todo Call include once BCL 0.20 is available.
+ #}
+ {% set _id = "dropdown-languages" %}
+ {% set _message = {
+   message: "This page is not available in @language."|t({'@language': unavailable_language}),
+   path: bcl_icon_path,
+   variant: "warning",
+ }%}
+ {% set _expandable = {
+   label: "Choose another language"|t,
+   icon: {
+     name: "caret-down-fill",
+     path: bcl_icon_path,
+   },
+   outline: "true",
+ } %}
--- a/templates/overrides/navigation/links--oe-multilingual-content-language-block.html.twig
+++ b/templates/overrides/navigation/links--oe-multilingual-content-language-block.html.twig
+
+ {% set _languages = languages|default([]) %}
+ {% set _expandable_attributes = _expandable.attributes ?: create_attribute() %}
+ {% set _expandable_attributes = _expandable_attributes
+   .setAttribute('data-bs-toggle', 'collapse')
+   .setAttribute('autocomplete', 'off')
+   .setAttribute('aria-expanded', 'false')
+   .setAttribute('aria-controls', _id)
+   .setAttribute('data-bs-target', '#' ~ _id)
+ %}
+
+ {% include '@oe-bcl/bcl-alert/alert.html.twig' with _message only %}
+ <div class="mb-3">
+   {% include '@oe-bcl/bcl-button/button.html.twig' with _expandable|merge({
+     attributes: _expandable_attributes
+   }) only %}
--- a/templates/overrides/navigation/links--oe-multilingual-content-language-block.html.twig
+++ b/templates/overrides/navigation/links--oe-multilingual-content-language-block.html.twig
+   .setAttribute('aria-expanded', 'false')
+   .setAttribute('aria-controls', _id)
+   .setAttribute('data-bs-target', '#' ~ _id)
+ %}
+
+ {% include '@oe-bcl/bcl-alert/alert.html.twig' with _message only %}
+ <div class="mb-3">
+   {% include '@oe-bcl/bcl-button/button.html.twig' with _expandable|merge({
+     attributes: _expandable_attributes
+   }) only %}
+
+   <div class="collapse mt-3" id="{{ _id }}">
+     <div
+       class="d-md-grid"
+       style="grid-auto-flow: column; grid-template-rows: repeat(4, 1fr)"
+     >
--- a/templates/overrides/navigation/links--oe-multilingual-content-language-block.html.twig
+++ b/templates/overrides/navigation/links--oe-multilingual-content-language-block.html.twig
+ {% set _id = "dropdown-languages" %}
+ {% set _message = {
+   message: "This page is not available in @language."|t({'@language': unavailable_language}),
+   path: bcl_icon_path,
+   variant: "warning",
+ }%}
+ {% set _expandable = {
+   label: "Choose another language"|t,
+   icon: {
+     name: "caret-down-fill",
+     path: bcl_icon_path,
+   },
+   outline: "true",
+ } %}
+
+ {% set _languages = languages|default([]) %}
--- a/templates/overrides/navigation/links--oe-multilingual-content-language-block.html.twig
+++ b/templates/overrides/navigation/links--oe-multilingual-content-language-block.html.twig
+     path: bcl_icon_path,
+   },
+   outline: "true",
+ } %}
+
+ {% set _languages = languages|default([]) %}
+ {% set _expandable_attributes = _expandable.attributes ?: create_attribute() %}
+ {% set _expandable_attributes = _expandable_attributes
+   .setAttribute('data-bs-toggle', 'collapse')
+   .setAttribute('autocomplete', 'off')
+   .setAttribute('aria-expanded', 'false')
+   .setAttribute('aria-controls', _id)
+   .setAttribute('data-bs-target', '#' ~ _id)
+ %}
+
+ {% include '@oe-bcl/bcl-alert/alert.html.twig' with _message only %}
--- a/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.module
+++ b/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.module
+ /** @var \Drupal\Core\Entity\EntityInterface $translation */
+ $translation = $multilingual_helper->getCurrentLanguageEntityTranslation($entity);
+ $variables['languages'][] = [
+   'path' => $translation->toUrl()->setAbsolute(TRUE)->toString(),
+   'hreflang' => $translation->language()->getId(),
+   'label' => $languages[$translation->language()->getId()]->getName(),
+   'current' => TRUE,
+   'icon_position' => 'before',
+   'remove_icon_spacers' => FALSE,
+   'icon' => [
+     'name' => 'check-lg',
+     'path' => $variables['bcl_icon_path'],
+     'size' => 'xs',
+     '#attributes' => ['class' => ['me-2']],
+   ],
+ ];
--- a/oe_whitelabel.info.yml
+++ b/oe_whitelabel.info.yml
   - block.block.oe_whitelabel_branding
+   - block.block.oe_whitelabel_breadcrumbs
+   - block.block.oe_whitelabel_ec_corporate_footer
+   - block.block.oe_whitelabel_eu_corporate_footer
+   - block.block.oe_whitelabel_eulogin
+   - block.block.oe_whitelabel_language_switcher
   - block.block.oe_whitelabel_local_actions
   - block.block.oe_whitelabel_local_tasks
+   - block.block.oe_whitelabel_main_navigation
+   - block.block.oe_whitelabel_main_page_content
   - block.block.oe_whitelabel_messages
-   - block.block.oe_whitelabel_page_title
-   - block.block.whitelabelsearchblock
-   - cas.settings.yml
+   - block.block.oe_whitelabel_neutral_footer
+   - block.block.oe_whitelabel_search_form
--- a/config/optional/block.block.oe_whitelabel_ec_corporate_footer.yml
+++ b/config/optional/block.block.oe_whitelabel_ec_corporate_footer.yml
 dependencies:
 module:
   - oe_corporate_blocks
+   - oe_whitelabel_helper
--- a/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.module
+++ b/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.module
+   'current' => TRUE,
+   'icon_position' => 'before',
+   'remove_icon_spacers' => FALSE,
+   'icon' => [
+     'name' => 'check-lg',
+     'path' => $variables['bcl_icon_path'],
+     'size' => 'xs',
+     '#attributes' => ['class' => ['me-2']],
+   ],
+ ];
+}
+
+/**
+* Implements hook_preprocess_links__language_block().
+*/
+function oe_whitelabel_multilingual_preprocess_links__language_block(&$variables) {
--- a/tests/src/Kernel/ContentLanguageSwitcherTest.php
+++ b/tests/src/Kernel/ContentLanguageSwitcherTest.php
+   // @see CurrentUserContext::getRuntimeContexts().
+   // @see EntityConverter::convert().
+   module_load_include('install', 'user');
+   user_install();
+
+   \Drupal::service('kernel')->rebuildContainer();
+ }
+
+ /**
+  * Tests the rendering of the language switcher block.
+  */
+ public function testMultilingualLanguageSwitcherBlockRendering(): void {
+   $node = Node::create([
+     'title' => 'Hello, world!',
+     'type' => 'oe_demo_translatable_page',
+   ]);
--- a/tests/src/Kernel/ContentLanguageSwitcherTest.php
+++ b/tests/src/Kernel/ContentLanguageSwitcherTest.php
+   ]);
+   /** @var \Drupal\Core\Entity\EntityInterface $translation */
+   $node->addTranslation('es', ['title' => '¡Hola mundo!'])->save();
+
+   // Simulate a request to the canonical route of the node with Bulgarian
+   // language prefix.
+   $this->setCurrentRequest('/bg/node/' . $node->id());
+
+   // Setup and render language switcher block.
+   $block_manager = \Drupal::service('plugin.manager.block');
+   $config = [
+     'id' => 'oe_multilingual_content_language_switcher',
+     'label' => 'Content language switcher',
+     'provider' => 'oe_multilingual',
+     'label_display' => '0',
+   ];
--- a/tests/src/Kernel/ContentLanguageSwitcherTest.php
+++ b/tests/src/Kernel/ContentLanguageSwitcherTest.php
   $crawler = new Crawler($html);

   // Make sure that content language switcher block is present.
-   $actual = $crawler->filter('#dropdown-languages');
+   $actual = $crawler->filter('div.collapse.mt-3');
--- a/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.module
+++ b/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.module
     ],
   ];
 }
+
+ // Generate required ids.
+ $variables['expandable_id'] = Html::getUniqueId('bcl-expandable');
--- a/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.module
+++ b/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.module
+ if ($translation->language()->getId() !== 'und') {
+   $variables['languages'][] = [
+     'path' => $translation->toUrl()->setAbsolute(TRUE)->toString(),
+     'hreflang' => $translation->language()->getId(),
+     'label' => $languages[$translation->language()->getId()]->getName(),
+     'current' => TRUE,
+     'icon_position' => 'before',
+     'remove_icon_spacers' => FALSE,
+     'icon' => [
+       'name' => 'check-lg',
+       'path' => $variables['bcl_icon_path'],
+       'size' => 'xs',
+       '#attributes' => ['class' => ['me-2']],
+     ],
+   ];
+ }
--- a/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.module
+++ b/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.module
-   'icon_position' => 'before',
-   'remove_icon_spacers' => FALSE,
-   'icon' => [
-     'name' => 'check-lg',
-     'path' => $variables['bcl_icon_path'],
-     'size' => 'xs',
-     '#attributes' => ['class' => ['me-2']],
-   ],
- ];
+ // If we don't have a language id defined yet, the current translation wasn't
+ // saved, so we don't add it to the list.
+ if ($translation->language()->getId() !== 'und') {
+   $variables['languages'][] = [
+     'path' => $translation->toUrl()->setAbsolute(TRUE)->toString(),
+     'hreflang' => $translation->language()->getId(),
+     'label' => $languages[$translation->language()->getId()]->getName(),
--- a/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.module
+++ b/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.module
-   'path' => $translation->toUrl()->setAbsolute(TRUE)->toString(),
-   'hreflang' => $translation->language()->getId(),
-   'label' => $languages[$translation->language()->getId()]->getName(),
-   'current' => TRUE,
-   'icon_position' => 'before',
-   'remove_icon_spacers' => FALSE,
-   'icon' => [
-     'name' => 'check-lg',
-     'path' => $variables['bcl_icon_path'],
-     'size' => 'xs',
-     '#attributes' => ['class' => ['me-2']],
-   ],
- ];
+ // If we don't have a language id defined yet, the current translation wasn't
+ // saved, so we don't add it to the list.
+ if ($translation->language()->getId() !== 'und') {