Merge pull request #134 from openeuropa/EWPP-3264

EWPP-3264: Change site footer string and translations.
openeuropa · Jun 21, 2023 · 60bde46 · 60bde46
2 parents b0254da + a7260b5
commit 60bde46
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,8 @@
         "openeuropa/oe_multilingual": "^1.13",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta6",
         "phpspec/prophecy-phpunit": "^2",
-        "symfony/phpunit-bridge": "^6.0"
+        "symfony/phpunit-bridge": "^6.0",
+        "symfony/validator": "~v4.4.48 || ~v6.2.5"
     },
     "scripts": {
         "post-install-cmd": "./vendor/bin/run drupal:site-setup",
@@ -59,7 +60,8 @@
             }
         },
         "_readme": [
-            "Explicit requirement of symfony/phpunit-bridge to replace drupal/core-dev testing classes and traits."
+            "Explicit requirement of symfony/phpunit-bridge to replace drupal/core-dev testing classes and traits.",
+            "Using symfony/validator v6.2.5 for D10 like core-recommended does because 6.3 breaks BC with the signature changes to the ExecutionContextInterface."
         ]
     },
     "config": {

diff --git a/oe_corporate_blocks.post_update.php b/oe_corporate_blocks.post_update.php
@@ -7,9 +7,9 @@
 
 declare(strict_types = 1);
 
+use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Config\FileStorage;
 use Drupal\locale\Locale;
-use Drupal\Component\Utility\Crypt;
 
 /**
  * Helper function: import corporate links.

diff --git a/src/Plugin/Block/FooterBlockBase.php b/src/Plugin/Block/FooterBlockBase.php
@@ -10,8 +10,8 @@
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\oe_corporate_blocks\FooterLinkManagerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides Base the corporate footer block.

diff --git a/templates/oe-corporate-blocks-ec-footer.html.twig b/templates/oe-corporate-blocks-ec-footer.html.twig
@@ -53,7 +53,7 @@
       <h4 class="footer__site-name">{{ link(corporate_footer.corporate_site_link.label, corporate_footer.corporate_site_link.href) }}</h4>
     {% endif %}
     {% if site_owner is not empty %}
-      <span class="footer__content-owner-details">{{ 'This site is managed by the @name'|t({'@name': site_owner}) }}</span>
+      <span class="footer__content-owner-details">{{ 'This site is managed by: @name'|t({'@name': site_owner}) }}</span>
     {% endif %}
     {% if corporate_footer.class_navigation is not empty %}
       <ul class="footer__list footer__class-navigation">

diff --git a/templates/oe-corporate-blocks-eu-footer.html.twig b/templates/oe-corporate-blocks-eu-footer.html.twig
@@ -46,7 +46,7 @@
 {% endif %}
 <div class="footer__corporate-top--eu">
   {% if site_owner is not empty %}
-    <span class="footer__content-owner-details">{{ 'This site is managed by @name and is an official website of the European Union'|t({'@name': site_owner}) }}</span>
+    <span class="footer__content-owner-details">{{ 'This site is managed by: @name'|t({'@name': site_owner}) }}</span>
   {% endif %}
   {% if corporate_footer.contact %}
     <h3>{{ corporate_footer.contact_title }}</h3>

diff --git a/tests/features/corporate-blocks.feature b/tests/features/corporate-blocks.feature
@@ -11,7 +11,7 @@ Feature: Corporate blocks feature
       | fr        |
     And I set the site owner to "Directorate-General for Informatics"
     When I am on "the <path> page"
-    Then I should see "This site is managed by the Directorate-General for Informatics" in the "ec_footer" region
+    Then I should see "This site is managed by: Directorate-General for Informatics" in the "ec_footer" region
     And the region "ec_footer" contains the links:
       | European Commission website                      | https://commission.europa.eu/index_en                                                                                   |
       | Strategy                                         | https://commission.europa.eu/strategy_en                                                                                |
@@ -80,7 +80,7 @@ Feature: Corporate blocks feature
       | fr        |
     And I set the site owner to "Directorate-General for Informatics"
     When I am on "the <path> page"
-    Then I should see "This site is managed by Directorate-General for Informatics and is an official website of the European Union" in the "eu_footer" region
+    Then I should see "This site is managed by: Directorate-General for Informatics" in the "eu_footer" region
     And I should see "Social media" in the "eu_footer" region
     And I should see "EU institutions" in the "eu_footer" region
     And I should see "Legal" in the "eu_footer_bottom_title" region