Merge pull request #873 from openeuropa/update-2.x-with-2.20.2

Update 2.x with 2.20.2
openeuropa · Jul 7, 2021 · 7cec91b · 7cec91b
2 parents 6e0635c + fd21ba6
commit 7cec91b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.20.2](https://github.com/openeuropa/oe_theme/tree/2.20.2) (2021-07-07)
+
+[Full Changelog](https://github.com/openeuropa/oe_theme/compare/2.20.1...2.20.2)
+
+**Merged pull requests:**
+- EWPP-1303: Rename Non-EU languages to Other languages on front-end. [\#871](https://github.com/openeuropa/oe_theme/pull/871) ([nagyad](https://github.com/nagyad))
+
 ## [2.20.1](https://github.com/openeuropa/oe_theme/tree/2.20.1) (2021-06-23)
 
 [Full Changelog](https://github.com/openeuropa/oe_theme/compare/2.20.0...2.20.1)

diff --git a/templates/compositions/ec-component-language-list/language-list-selector.html.twig b/templates/compositions/ec-component-language-list/language-list-selector.html.twig
@@ -51,7 +51,7 @@
   {# Use category titles only if both category of languages are present. #}
   {% if non_eu_languages is not empty and non_eu_languages is iterable %}
     {% set eu_category = 'EU official languages'|t %}
-    {% set non_eu_category = 'Non-EU languages'|t %}
+    {% set non_eu_category = 'Other languages'|t %}
   {% endif %}
 {% endif %}
 

diff --git a/templates/language-selection-page/language-selection-page-content.html.twig b/templates/language-selection-page/language-selection-page-content.html.twig
@@ -14,7 +14,7 @@
   {# Use category titles only if both category of languages are present. #}
   {% if non_eu_languages is not empty and non_eu_languages is iterable %}
     {% set eu_category = 'EU official languages'|t %}
-    {% set non_eu_category = 'Non-EU languages'|t %}
+    {% set non_eu_category = 'Other languages'|t %}
   {% endif %}
 {% endif %}
 

diff --git a/tests/Kernel/LanguageSwitcherTest.php b/tests/Kernel/LanguageSwitcherTest.php
@@ -68,7 +68,7 @@ public function testLanguageSwitcherLinkListRendering(): void {
 
     // Check for non-EU languages category.
     $actual = $crawler->filter('.ecl-language-list__non-eu .ecl-language-list__category')->text();
-    $this->assertEquals('Non-EU languages', trim($actual));
+    $this->assertEquals('Other languages', trim($actual));
 
     // Assert there is only one link in the non-EU category.
     $actual = $crawler->filter('.ecl-language-list--overlay .ecl-language-list__non-eu a');

diff --git a/tests/features/theme-showcase.feature b/tests/features/theme-showcase.feature
@@ -65,7 +65,7 @@ Feature: Theme showcase
     Then the overlay "language switcher links" is visible
 
     And I should not see "EU official languages" in the "language switcher"
-    And I should not see "Non-EU languages" in the "language switcher"
+    And I should not see "Other languages" in the "language switcher"
 
     And I should see the following links in the "language switcher":
       | български   |