Merge pull request #145 from openeuropa/EWPP-4171

EWPP-4171: Update EDPS' href from EU footer.
openeuropa · Mar 12, 2024 · d94d648 · d94d648
2 parents b1852c6 + 91e4983
commit d94d648
Show file tree

Hide file tree

Showing 27 changed files with 27 additions and 72 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -19,12 +19,12 @@ services:
       - DOCUMENT_ROOT=/test/oe_corporate_blocks
       - COMPOSERVER=--2
   mysql:
-    image: registry.fpfis.eu/fpfis/sql:percona-5.7
+    image: git.fpfis.tech.ec.europa.eu/fpfis/dependency_proxy/containers/percona:5.7
     command: --innodb-log-file-size=1G --max_allowed_packet=1G --innodb-buffer-pool-size=512M --wait_timeout=3000 --net_write_timeout=3000 --log_error_verbosity=3
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
   selenium:
-    image: registry.fpfis.eu/fpfis/selenium:standalone-chrome-4.1.3-20220405
+    image: git.fpfis.tech.ec.europa.eu/fpfis/dependency_proxy/containers/selenium/standalone-chrome:4.1.3-20220405
     shm_size: 2g
     environment:
       - DISPLAY=:99

diff --git a/config/install/oe_corporate_blocks.eu_data.footer.yml b/config/install/oe_corporate_blocks.eu_data.footer.yml
@@ -58,7 +58,7 @@ institution_links:
     href: 'https://www.ombudsman.europa.eu/en/home'
   -
     label: 'European Data Protection Supervisor (EDPS)'
-    href: 'https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en'
+    href: 'https://www.edps.europa.eu/_en'
   -
     label: 'European Data Protection Board'
     href: 'https://edpb.europa.eu/edpb_en'

diff --git a/oe_corporate_blocks.post_update.php b/oe_corporate_blocks.post_update.php
@@ -283,3 +283,21 @@ function oe_corporate_blocks_post_update_40007(): void {
   $config->set('class_navigation', $class_navigation);
   $config->save();
 }
+
+/**
+ * Update EDPS' href from EU footer.
+ */
+function oe_corporate_blocks_post_update_40008(): void {
+  $config = \Drupal::configFactory()->getEditable('oe_corporate_blocks.eu_data.footer');
+  $institution_links = $config->get('institution_links');
+  foreach ($institution_links as $key => $link) {
+    if (
+      $link['label'] === 'European Data Protection Supervisor (EDPS)' &&
+      $link['href'] === 'https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en'
+    ) {
+      $institution_links[$key]['href'] = 'https://www.edps.europa.eu/_en';
+    }
+  }
+  $config->set('institution_links', $institution_links);
+  $config->save();
+}
diff --git a/tests/features/corporate-blocks.feature b/tests/features/corporate-blocks.feature
@@ -103,7 +103,7 @@ Feature: Corporate blocks feature
       | European Economic and Social Committee (EESC) | http://www.eesc.europa.eu/?i=portal.en.home                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
       | European Committee of the Regions (CoR)       | http://cor.europa.eu/en/                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
       | European Investment Bank (EIB)                | https://www.eib.org/en/index.htm                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-      | European Data Protection Supervisor (EDPS)    | https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+      | European Data Protection Supervisor (EDPS)    | https://www.edps.europa.eu/_en                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
       | European Ombudsman                            | https://www.ombudsman.europa.eu/en/home                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
       | European Data Protection Board                | https://edpb.europa.eu/edpb_en                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
       | European Personnel Selection Office           | https://epso.europa.eu/en                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
@@ -140,7 +140,7 @@ Feature: Corporate blocks feature
       | Comité économique et social européen (CESE)            | http://www.eesc.europa.eu/?i=portal.fr.home                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
       | Comité européen des régions (CdR)                      | https://cor.europa.eu/fr                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
       | Banque européenne d'investissement (BEI)               | https://www.eib.org/fr/index.htm                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-      | Contrôleur européen de la protection des données       | https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=fr                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+      | Contrôleur européen de la protection des données       | https://www.edps.europa.eu/_fr                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
       | Médiateur européen                                     | https://www.ombudsman.europa.eu/fr/home                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
       | Comité européen de la protection des données           | https://edpb.europa.eu/edpb_fr                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
       | Office européen de sélection du personnel              | https://epso.europa.eu/fr                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |

diff --git a/translations/oe_corporate_blocks-bg.po b/translations/oe_corporate_blocks-bg.po
@@ -139,9 +139,6 @@ msgstr "https://european-union.europa.eu/institutions-law-budget/institutions-an
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Европейски надзорен орган по защита на данните (ЕНОЗД)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=bg"
-
 msgid "About this site"
 msgstr "За този сайт"
 

diff --git a/translations/oe_corporate_blocks-cs.po b/translations/oe_corporate_blocks-cs.po
@@ -103,9 +103,6 @@ msgstr "Evropská investiční banka (EIB)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Evropský inspektor ochrany údajů"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=cs"
-
 msgid "European Ombudsman"
 msgstr "Evropský veřejný ochránce práv"
 

diff --git a/translations/oe_corporate_blocks-da.po b/translations/oe_corporate_blocks-da.po
@@ -106,9 +106,6 @@ msgstr "Den Europæiske Investeringsbank (EIB)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Den Europæiske Tilsynsførende for Databeskyttelse (EDPS)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=da"
-
 msgid "European Ombudsman"
 msgstr "Den europæiske ombudsmand"
 

diff --git a/translations/oe_corporate_blocks-de.po b/translations/oe_corporate_blocks-de.po
@@ -109,8 +109,8 @@ msgstr "https://www.eib.org/de/index.htm"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Europäischer Datenschutzbeauftragter (EDSB)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=de"
+msgid "https://www.edps.europa.eu/_en"
+msgstr "https://www.edps.europa.eu/_de"
 
 msgid "European Ombudsman"
 msgstr "Europäischer Bürgerbeauftragter"

diff --git a/translations/oe_corporate_blocks-el.po b/translations/oe_corporate_blocks-el.po
@@ -114,9 +114,6 @@ msgstr "Ευρωπαϊκή Τράπεζα Επενδύσεων (ΕΤΕ)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Ευρωπαίος Επόπτης Προστασίας Δεδομένων (ΕΕΠΔ)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=el"
-
 msgid "European Ombudsman"
 msgstr "Ευρωπαίος Διαμεσολαβητής"
 

diff --git a/translations/oe_corporate_blocks-es.po b/translations/oe_corporate_blocks-es.po
@@ -106,9 +106,6 @@ msgstr "Banco Europeo de Inversiones (BEI)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Supervisor Europeo de Protección de Datos (SEPD)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=el"
-
 msgid "European Ombudsman"
 msgstr "Defensor del Pueblo Europeo"
 

diff --git a/translations/oe_corporate_blocks-et.po b/translations/oe_corporate_blocks-et.po
@@ -103,9 +103,6 @@ msgstr "Euroopa Investeerimispank"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Euroopa Andmekaitseinspektor"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=et"
-
 msgid "European Ombudsman"
 msgstr "Euroopa Ombudsman"
 

diff --git a/translations/oe_corporate_blocks-fi.po b/translations/oe_corporate_blocks-fi.po
@@ -106,9 +106,6 @@ msgstr "Euroopan investointipankki (EIP)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Euroopan tietosuojavaltuutettu"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=fi"
-
 msgid "European Ombudsman"
 msgstr "Euroopan oikeusasiamies"
 

diff --git a/translations/oe_corporate_blocks-fr.po b/translations/oe_corporate_blocks-fr.po
@@ -109,8 +109,8 @@ msgstr "https://www.eib.org/fr/index.htm"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Contrôleur européen de la protection des données"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=fr"
+msgid "https://www.edps.europa.eu/_en"
+msgstr "https://www.edps.europa.eu/_fr"
 
 msgid "European Ombudsman"
 msgstr "Médiateur européen"

diff --git a/translations/oe_corporate_blocks-ga.po b/translations/oe_corporate_blocks-ga.po
@@ -103,9 +103,6 @@ msgstr "An Banc Eorpach Infheistíochta (BEI)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "An Maoirseoir Eorpach ar Chosaint Sonraí (MECS)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=ga"
-
 msgid "European Ombudsman"
 msgstr "An tOmbudsman Eorpach"
 

diff --git a/translations/oe_corporate_blocks-hr.po b/translations/oe_corporate_blocks-hr.po
@@ -106,9 +106,6 @@ msgstr "Europska investicijska banka (EIB)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Europski nadzornik za zaštitu podataka (EDPS)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=hr"
-
 msgid "European Ombudsman"
 msgstr "Europski ombudsman"
 

diff --git a/translations/oe_corporate_blocks-hu.po b/translations/oe_corporate_blocks-hu.po
@@ -105,9 +105,6 @@ msgstr "Európai Beruházási Bank (EBB)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Európai adatvédelmi biztos"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=hu"
-
 msgid "European Ombudsman"
 msgstr "Európai ombudsman"
 

diff --git a/translations/oe_corporate_blocks-it.po b/translations/oe_corporate_blocks-it.po
@@ -103,9 +103,6 @@ msgstr "Banca europea per gli investimenti (BEI)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Garante europeo della protezione dei dati (GEPD)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=it"
-
 msgid "European Ombudsman"
 msgstr "Mediatore europeo"
 

diff --git a/translations/oe_corporate_blocks-lt.po b/translations/oe_corporate_blocks-lt.po
@@ -106,9 +106,6 @@ msgstr "Europos investicijų bankas (EIB)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Europos duomenų apsaugos priežiūros pareigūnas (EDAPP)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=lt"
-
 msgid "European Ombudsman"
 msgstr "Europos ombudsmenas"
 

diff --git a/translations/oe_corporate_blocks-lv.po b/translations/oe_corporate_blocks-lv.po
@@ -106,9 +106,6 @@ msgstr "Eiropas Investīciju banka (EIB)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Eiropas Datu aizsardzības uzraudzītājs (EDAU)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=lv"
-
 msgid "European Ombudsman"
 msgstr "Eiropas Ombuds"
 

diff --git a/translations/oe_corporate_blocks-mt.po b/translations/oe_corporate_blocks-mt.po
@@ -106,9 +106,6 @@ msgstr "Il-Bank Ewropew tal-Investiment (BEI)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Kontrollur Ewropew għall-Protezzjoni tad-Data (KEPD)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=mt"
-
 msgid "European Ombudsman"
 msgstr "L-Ombudsman Ewropew"
 

diff --git a/translations/oe_corporate_blocks-nl.po b/translations/oe_corporate_blocks-nl.po
@@ -106,9 +106,6 @@ msgstr "Europese Investeringsbank (EIB)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Europese Toezichthouder voor gegevensbescherming (EDPS)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=nl"
-
 msgid "European Ombudsman"
 msgstr "Europese Ombudsman"
 

diff --git a/translations/oe_corporate_blocks-pl.po b/translations/oe_corporate_blocks-pl.po
@@ -106,9 +106,6 @@ msgstr "Europejski Bank Inwestycyjny (EBI)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Europejski Inspektor Ochrony Danych (EIOD)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=pl"
-
 msgid "European Ombudsman"
 msgstr "Europejski Rzecznik Praw Obywatelskich"
 

diff --git a/translations/oe_corporate_blocks-pt-pt.po b/translations/oe_corporate_blocks-pt-pt.po
@@ -103,9 +103,6 @@ msgstr "Banco Europeu de Investimento (BEI)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Autoridade Europeia para a Proteção de Dados (AEPD)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=pt"
-
 msgid "European Ombudsman"
 msgstr "Provedor de Justiça Europeu"
 

diff --git a/translations/oe_corporate_blocks-ro.po b/translations/oe_corporate_blocks-ro.po
@@ -106,9 +106,6 @@ msgstr "Banca Europeană de Investiții (BEI)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Autoritatea Europeană pentru Protecția Datelor (AEPD)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=ro"
-
 msgid "European Ombudsman"
 msgstr "Ombudsmanul European"
 

diff --git a/translations/oe_corporate_blocks-sk.po b/translations/oe_corporate_blocks-sk.po
@@ -103,9 +103,6 @@ msgstr "Európska investičná banka (EIB)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Európsky dozorný úradník pre ochranu údajov (EDPS)"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=sk"
-
 msgid "European Ombudsman"
 msgstr "Európsky ombudsman"
 

diff --git a/translations/oe_corporate_blocks-sl.po b/translations/oe_corporate_blocks-sl.po
@@ -100,9 +100,6 @@ msgstr "Evropska investicijska banka (EIB)"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Evropski nadzornik za varstvo podatkov"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=sl"
-
 msgid "European Ombudsman"
 msgstr "Evropski varuh človekovih pravic"
 

diff --git a/translations/oe_corporate_blocks-sv.po b/translations/oe_corporate_blocks-sv.po
@@ -103,9 +103,6 @@ msgstr "Europeiska investeringsbanken"
 msgid "European Data Protection Supervisor (EDPS)"
 msgstr "Europeiska datatillsynsmannen"
 
-msgid "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=en"
-msgstr "https://secure.edps.europa.eu/EDPSWEB/edps/EDPS?lang=sv"
-
 msgid "European Ombudsman"
 msgstr "Europeiska ombudsmannen"