From e019cd5f42f555b0bd2fac7f0d100850542e2d40 Mon Sep 17 00:00:00 2001 From: nagyad Date: Tue, 6 Jul 2021 12:23:54 +0200 Subject: [PATCH 1/3] EWPP-1303: Rename Non-EU languages to Other languages on front-end. --- .../ec-component-language-list/language-list-selector.html.twig | 2 +- .../language-selection-page-content.html.twig | 2 +- tests/Kernel/LanguageSwitcherTest.php | 2 +- tests/features/theme-showcase.feature | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 index 3e4c8ece2..a0e251a8c 100644 --- 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 index ce8d46a06..14daa4233 100644 --- 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 index b71ac2db7..0612bc050 100644 --- 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 index 53ea5942a..3b7d08e0f 100644 --- 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": | български | From 0db0b02ce086f10aee1c8528fd69bd1e8b70aa28 Mon Sep 17 00:00:00 2001 From: nagyad Date: Tue, 6 Jul 2021 13:02:03 +0200 Subject: [PATCH 2/3] EWPP-1303: Fix test fail on paragraphs test. --- tests/Functional/ParagraphsTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Functional/ParagraphsTest.php b/tests/Functional/ParagraphsTest.php index eaeaf8a75..a796ec07a 100644 --- a/tests/Functional/ParagraphsTest.php +++ b/tests/Functional/ParagraphsTest.php @@ -47,6 +47,7 @@ public function testAccordionItemParagraph(): void { 'title[0][value]' => 'Test Accordion', 'field_oe_demo_body[0][subform][field_oe_paragraphs][0][subform][field_oe_text][0][value]' => 'Accordion item title', 'field_oe_demo_body[0][subform][field_oe_paragraphs][0][subform][field_oe_text_long][0][value]' => 'Accordion item body', + 'oe_content_content_owner[0][target_id]' => 'Directorate-General for Informatics', ]; $this->drupalPostForm(NULL, $values, 'Save'); $this->drupalGet('/node/1'); From 6fd2f8653188d96dec5da4df0005137b477afe58 Mon Sep 17 00:00:00 2001 From: Imanol Eguskiza Date: Wed, 7 Jul 2021 11:58:04 +0200 Subject: [PATCH 3/3] Prepare release 2.20.2. --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61ff5fba4..303477e96 100644 --- 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)