From 03bfa78c6c89b61d8ee773b13a9556b69c7490ae Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Wed, 18 Dec 2024 06:36:59 +0000 Subject: [PATCH 1/5] Update configuration --- composer.lock | 57 +++++++++---------- .../ar/core.entity_view_mode.media.card.yml | 2 +- conf/cmi/language/ar/language.entity.es.yml | 2 +- .../ar/responsive_image.styles.card.yml | 2 +- conf/cmi/language/ar/views.view.archive.yml | 6 +- conf/cmi/language/ar/views.view.content.yml | 2 +- conf/cmi/language/ar/views.view.files.yml | 8 +-- conf/cmi/language/ar/views.view.glossary.yml | 6 +- .../language/ar/views.view.locked_content.yml | 6 +- conf/cmi/language/ar/views.view.media.yml | 4 +- .../language/ar/views.view.media_library.yml | 6 +- .../ar/views.view.paragraphs_library.yml | 6 +- conf/cmi/language/ar/views.view.redirect.yml | 14 ++--- .../language/ar/views.view.taxonomy_term.yml | 6 +- .../ar/views.view.user_admin_people.yml | 6 +- conf/cmi/language/de/views.view.files.yml | 2 +- conf/cmi/language/de/views.view.redirect.yml | 38 ++++++------- conf/cmi/language/et/views.view.redirect.yml | 14 ++--- conf/cmi/language/fa/views.view.redirect.yml | 10 ++-- conf/cmi/language/fr/views.view.redirect.yml | 38 ++++++------- conf/cmi/language/ru/views.view.files.yml | 2 +- conf/cmi/language/ru/views.view.redirect.yml | 36 ++++++------ conf/cmi/language/uk/views.view.redirect.yml | 34 +++++------ .../language/zh-hans/views.view.redirect.yml | 30 +++++----- 24 files changed, 168 insertions(+), 169 deletions(-) diff --git a/composer.lock b/composer.lock index e0414f51f..f465d03c5 100644 --- a/composer.lock +++ b/composer.lock @@ -2358,16 +2358,16 @@ }, { "name": "drupal/core", - "version": "10.3.10", + "version": "10.4.0", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144" + "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/3ebb71e9c4ef0c13f683353547551fca49f9a144", - "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144", + "url": "https://api.github.com/repos/drupal/core/zipball/2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d", + "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d", "shasum": "" }, "require": { @@ -2413,7 +2413,7 @@ "symfony/serializer": "^6.4", "symfony/validator": "^6.4", "symfony/yaml": "^6.4", - "twig/twig": "^3.14.2" + "twig/twig": "^3.15.0" }, "conflict": { "drush/drush": "<12.4.3" @@ -2516,22 +2516,22 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.3.10" + "source": "https://github.com/drupal/core/tree/10.4.0" }, - "time": "2024-11-22T12:51:33+00:00" + "time": "2024-12-17T22:18:01+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.3.10", + "version": "10.4.0", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", - "reference": "f58ab5c0d02d275c5aa226c4505b457e41b161cc" + "reference": "db17b59620ce1c142a34dc017d9e696ce4771e55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/f58ab5c0d02d275c5aa226c4505b457e41b161cc", - "reference": "f58ab5c0d02d275c5aa226c4505b457e41b161cc", + "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/db17b59620ce1c142a34dc017d9e696ce4771e55", + "reference": "db17b59620ce1c142a34dc017d9e696ce4771e55", "shasum": "" }, "require": { @@ -2566,9 +2566,9 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.10" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.4.0" }, - "time": "2024-08-22T14:31:34+00:00" + "time": "2024-08-22T14:31:30+00:00" }, { "name": "drupal/crop", @@ -4598,16 +4598,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.10.3", + "version": "4.10.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "f2d8dc24500044936ea6dba39134d1d2eaf710db" + "reference": "24833b53e247ee6e56a852eb497139ee8883e6ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f2d8dc24500044936ea6dba39134d1d2eaf710db", - "reference": "f2d8dc24500044936ea6dba39134d1d2eaf710db", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/24833b53e247ee6e56a852eb497139ee8883e6ac", + "reference": "24833b53e247ee6e56a852eb497139ee8883e6ac", "shasum": "" }, "require": { @@ -4703,8 +4703,7 @@ "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://www.drupal.org/files/issues/2023-12-19/2313309-179.patch", "[#UHF-9388] Process configuration translation files for custom modules (https://www.drupal.org/i/2845437)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fd68277191b8f8ec290e53b5fbbae699b2260384/patches/drupal-2845437-process-custom-module-translation-config-10.3.x.patch", "[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "https://www.drupal.org/files/issues/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.patch", - "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch", - "[#UHF-10716] Ensure consistent ordering when calculating library asset order (https://www.drupal.org/i/3467860)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/955e2fc9493c6574ab070187b8a5a8634da7daab/patches/drupal-3467860-optimized-js-assets-mismatch.patch" + "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch" }, "drupal/default_content": { "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" @@ -4733,10 +4732,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.3", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.4", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-12-13T08:38:18+00:00" + "time": "2024-12-18T06:30:07+00:00" }, { "name": "drupal/helfi_proxy", @@ -7672,27 +7671,27 @@ }, { "name": "drupal/sophron", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/sophron.git", - "reference": "2.1.0" + "reference": "2.2.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/sophron-2.1.0.zip", - "reference": "2.1.0", - "shasum": "0742562897ae9b202e472a1edef75844b6452e39" + "url": "https://ftp.drupal.org/files/projects/sophron-2.2.0.zip", + "reference": "2.2.0", + "shasum": "fa4670e775443db3f465cc25b02c7c82e5c382bf" }, "require": { "drupal/core": "^10.2 || ^11", - "fileeye/mimemap": "^2.1.1" + "fileeye/mimemap": "^2.2.1" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.0", - "datestamp": "1718011690", + "version": "2.2.0", + "datestamp": "1734432598", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/language/ar/core.entity_view_mode.media.card.yml b/conf/cmi/language/ar/core.entity_view_mode.media.card.yml index 9469fac56..8bd709ee6 100644 --- a/conf/cmi/language/ar/core.entity_view_mode.media.card.yml +++ b/conf/cmi/language/ar/core.entity_view_mode.media.card.yml @@ -1 +1 @@ -label: Card +label: بطاقة diff --git a/conf/cmi/language/ar/language.entity.es.yml b/conf/cmi/language/ar/language.entity.es.yml index 6102dae07..8889fc2cc 100644 --- a/conf/cmi/language/ar/language.entity.es.yml +++ b/conf/cmi/language/ar/language.entity.es.yml @@ -1 +1 @@ -label: Spanish +label: أسبانية diff --git a/conf/cmi/language/ar/responsive_image.styles.card.yml b/conf/cmi/language/ar/responsive_image.styles.card.yml index 9469fac56..8bd709ee6 100644 --- a/conf/cmi/language/ar/responsive_image.styles.card.yml +++ b/conf/cmi/language/ar/responsive_image.styles.card.yml @@ -1 +1 @@ -label: Card +label: بطاقة diff --git a/conf/cmi/language/ar/views.view.archive.yml b/conf/cmi/language/ar/views.view.archive.yml index ec36a5421..fb626ef3c 100644 --- a/conf/cmi/language/ar/views.view.archive.yml +++ b/conf/cmi/language/ar/views.view.archive.yml @@ -6,8 +6,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset exposed_form: options: submit_button: تطبيق @@ -18,4 +18,4 @@ display: block_1: display_title: الصندوق page_1: - display_title: الصفحة + display_title: Page diff --git a/conf/cmi/language/ar/views.view.content.yml b/conf/cmi/language/ar/views.view.content.yml index ff0c7b220..e4d1c10c7 100644 --- a/conf/cmi/language/ar/views.view.content.yml +++ b/conf/cmi/language/ar/views.view.content.yml @@ -58,7 +58,7 @@ display: expose: label: اللغة page_1: - display_title: الصفحة + display_title: Page display_options: menu: title: المحتوى diff --git a/conf/cmi/language/ar/views.view.files.yml b/conf/cmi/language/ar/views.view.files.yml index d68686b5f..9ca4a548f 100644 --- a/conf/cmi/language/ar/views.view.files.yml +++ b/conf/cmi/language/ar/views.view.files.yml @@ -22,8 +22,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset exposed_form: options: submit_button: انتقاء @@ -60,8 +60,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset arguments: fid: exception: diff --git a/conf/cmi/language/ar/views.view.glossary.yml b/conf/cmi/language/ar/views.view.glossary.yml index fb47d49d1..b4aba719a 100644 --- a/conf/cmi/language/ar/views.view.glossary.yml +++ b/conf/cmi/language/ar/views.view.glossary.yml @@ -13,8 +13,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset exposed_form: options: submit_button: تطبيق @@ -25,7 +25,7 @@ display: attachment_1: display_title: المرفق page_1: - display_title: الصفحة + display_title: Page display_options: menu: title: القاموس diff --git a/conf/cmi/language/ar/views.view.locked_content.yml b/conf/cmi/language/ar/views.view.locked_content.yml index 0973d427d..3e482b4d5 100644 --- a/conf/cmi/language/ar/views.view.locked_content.yml +++ b/conf/cmi/language/ar/views.view.locked_content.yml @@ -12,8 +12,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset fields: node_bulk_form: action_title: إجراء @@ -40,4 +40,4 @@ display: expose: label: العنوان page_1: - display_title: الصفحة + display_title: Page diff --git a/conf/cmi/language/ar/views.view.media.yml b/conf/cmi/language/ar/views.view.media.yml index 45497ee56..48833b3f3 100644 --- a/conf/cmi/language/ar/views.view.media.yml +++ b/conf/cmi/language/ar/views.view.media.yml @@ -35,8 +35,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset exposed_form: options: submit_button: انتقاء diff --git a/conf/cmi/language/ar/views.view.media_library.yml b/conf/cmi/language/ar/views.view.media_library.yml index 38247755c..2d87d59e3 100644 --- a/conf/cmi/language/ar/views.view.media_library.yml +++ b/conf/cmi/language/ar/views.view.media_library.yml @@ -9,8 +9,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset exposed_form: options: submit_button: 'عمل تصفية' @@ -32,7 +32,7 @@ display: expose: label: اللغة page: - display_title: الصفحة + display_title: Page display_options: fields: media_bulk_form: diff --git a/conf/cmi/language/ar/views.view.paragraphs_library.yml b/conf/cmi/language/ar/views.view.paragraphs_library.yml index 15b1b590c..15849d676 100644 --- a/conf/cmi/language/ar/views.view.paragraphs_library.yml +++ b/conf/cmi/language/ar/views.view.paragraphs_library.yml @@ -12,8 +12,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset fields: label: label: التسمية @@ -44,4 +44,4 @@ display: expose: label: النوع page_1: - display_title: الصفحة + display_title: Page diff --git a/conf/cmi/language/ar/views.view.redirect.yml b/conf/cmi/language/ar/views.view.redirect.yml index 3748b6cb7..c82acce59 100644 --- a/conf/cmi/language/ar/views.view.redirect.yml +++ b/conf/cmi/language/ar/views.view.redirect.yml @@ -17,20 +17,20 @@ display: first: '« الأولى' last: 'الأخيرة »' expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset fields: redirect_source__path: - label: من + label: From separator: ', ' created: - label: الإنشاء + label: Created filters: redirect_source__path: expose: - label: من + label: From redirect_redirect__uri: expose: - label: إلى + label: To page_1: - display_title: الصفحة + display_title: Page diff --git a/conf/cmi/language/ar/views.view.taxonomy_term.yml b/conf/cmi/language/ar/views.view.taxonomy_term.yml index 6c4bce3e5..08c773f1d 100644 --- a/conf/cmi/language/ar/views.view.taxonomy_term.yml +++ b/conf/cmi/language/ar/views.view.taxonomy_term.yml @@ -6,8 +6,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset exposed_form: options: submit_button: تطبيق @@ -22,4 +22,4 @@ display: feed_1: display_title: التلقيمة page_1: - display_title: الصفحة + display_title: Page diff --git a/conf/cmi/language/ar/views.view.user_admin_people.yml b/conf/cmi/language/ar/views.view.user_admin_people.yml index e3e7f7daa..7d2bf5346 100644 --- a/conf/cmi/language/ar/views.view.user_admin_people.yml +++ b/conf/cmi/language/ar/views.view.user_admin_people.yml @@ -29,8 +29,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset exposed_form: options: submit_button: انتقاء @@ -58,7 +58,7 @@ display: label: الصلاحية use_more_text: المزيد page_1: - display_title: الصفحة + display_title: Page display_options: menu: title: لائحة diff --git a/conf/cmi/language/de/views.view.files.yml b/conf/cmi/language/de/views.view.files.yml index 2e2cc1bec..57e9fb0d2 100644 --- a/conf/cmi/language/de/views.view.files.yml +++ b/conf/cmi/language/de/views.view.files.yml @@ -28,7 +28,7 @@ display: label: 'Verwendet in' alter: path: 'admin/content/files/usage/{{ fid }}' - format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz + format_plural_string: !!binary QGNvdW50IFZlcndlbmR1bmcDQGNvdW50IFZlcndlbmR1bmdlbg== pager: options: tags: diff --git a/conf/cmi/language/de/views.view.redirect.yml b/conf/cmi/language/de/views.view.redirect.yml index a0d83ab43..823bebf5f 100644 --- a/conf/cmi/language/de/views.view.redirect.yml +++ b/conf/cmi/language/de/views.view.redirect.yml @@ -1,5 +1,5 @@ -label: Umleiten -description: 'Liste der Umleitungen' +label: Redirect +description: 'List of redirects' display: default: display_title: Master @@ -24,45 +24,45 @@ display: offset_label: Versatz fields: redirect_bulk_form: - action_title: 'Mit Auswahl' + action_title: 'With selection' redirect_source__path: - label: Von + label: From separator: ', ' created: - label: Erstellt + label: Created filters: redirect_source__path: expose: - label: Von + label: From redirect_redirect__uri: expose: - label: An + label: To status_code: expose: - label: Statuscode + label: 'Status code' group_info: - label: Statuscode + label: 'Status code' group_items: 1: - title: '300 Mehrere Auswahlmöglichkeiten' + title: '300 Multiple Choices' 2: - title: '301 Dauerhaft verschoben' + title: '301 Moved Permanently' 3: - title: '302 Gefunden' + title: '302 Found' 4: - title: '303 Siehe andere' + title: '303 See Other' 5: - title: '304 Nicht modifiziert' + title: '304 Not Modified' 6: - title: '305 Proxy verwenden' + title: '305 Use Proxy' 7: - title: '307 Temporäre Weiterleitung' + title: '307 Temporary Redirect' language: expose: - label: Originalsprache - title: Umleiten + label: 'Original language' + title: Redirect empty: area_text_custom: - content: 'Es wurde noch keine Umleitung eingerichtet.' + content: 'There is no redirect yet.' page_1: display_title: Seite diff --git a/conf/cmi/language/et/views.view.redirect.yml b/conf/cmi/language/et/views.view.redirect.yml index c3421f764..837e319ae 100644 --- a/conf/cmi/language/et/views.view.redirect.yml +++ b/conf/cmi/language/et/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: 'Suunatakse ümber' +label: Redirect display: default: display_title: Peamine @@ -23,20 +23,20 @@ display: offset_label: Nihe fields: redirect_source__path: - label: Kellelt + label: From separator: ', ' created: - label: Loodud + label: Created filters: redirect_source__path: expose: - label: Kellelt + label: From redirect_redirect__uri: expose: - label: Kellele + label: To language: expose: - label: 'Algne keel' - title: 'Suunatakse ümber' + label: 'Original language' + title: Redirect page_1: display_title: Lehekülg diff --git a/conf/cmi/language/fa/views.view.redirect.yml b/conf/cmi/language/fa/views.view.redirect.yml index d00c93bd4..d1b77f0e3 100644 --- a/conf/cmi/language/fa/views.view.redirect.yml +++ b/conf/cmi/language/fa/views.view.redirect.yml @@ -22,17 +22,17 @@ display: offset_label: جابجایی fields: redirect_bulk_form: - action_title: 'با انتخاب شده‌ها' + action_title: 'With selection' redirect_source__path: - label: از + label: From created: - label: 'ایجاد گردید' + label: Created filters: redirect_source__path: expose: - label: از + label: From redirect_redirect__uri: expose: - label: به + label: To page_1: display_title: صفحه diff --git a/conf/cmi/language/fr/views.view.redirect.yml b/conf/cmi/language/fr/views.view.redirect.yml index 88bee5068..f8b9d570c 100644 --- a/conf/cmi/language/fr/views.view.redirect.yml +++ b/conf/cmi/language/fr/views.view.redirect.yml @@ -1,5 +1,5 @@ -label: Rediriger -description: 'Liste des redirections' +label: Redirect +description: 'List of redirects' display: default: display_title: Maître @@ -24,45 +24,45 @@ display: offset_label: Décalage fields: redirect_bulk_form: - action_title: 'Pour la sélection' + action_title: 'With selection' redirect_source__path: - label: 'A partir de' + label: From separator: ', ' created: - label: Créé + label: Created filters: redirect_source__path: expose: - label: 'A partir de' + label: From redirect_redirect__uri: expose: - label: À + label: To status_code: expose: - label: 'Code du statut' + label: 'Status code' group_info: - label: 'Code du statut' + label: 'Status code' group_items: 1: - title: '300 Choix Multiples' + title: '300 Multiple Choices' 2: - title: '301 Redirection Permanente' + title: '301 Moved Permanently' 3: - title: '302 Trouvé' + title: '302 Found' 4: - title: '303 Voir Ailleurs' + title: '303 See Other' 5: - title: '304 Non Modifié' + title: '304 Not Modified' 6: - title: '305 Utilise un Proxy' + title: '305 Use Proxy' 7: - title: '307 Redirection Temporaire' + title: '307 Temporary Redirect' language: expose: - label: 'Langue initiale' - title: Rediriger + label: 'Original language' + title: Redirect empty: area_text_custom: - content: "Il n'y a pas encore de redirection." + content: 'There is no redirect yet.' page_1: display_title: Page diff --git a/conf/cmi/language/ru/views.view.files.yml b/conf/cmi/language/ru/views.view.files.yml index 564788fc4..f8b09a443 100644 --- a/conf/cmi/language/ru/views.view.files.yml +++ b/conf/cmi/language/ru/views.view.files.yml @@ -28,7 +28,7 @@ display: label: 'Используется в' alter: path: 'admin/content/files/usage/{{ fid }}' - format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz + format_plural_string: !!binary QGNvdW50INC80LXRgdGC0L4DQGNvdW50INC80LXRgdGC0LADQGNvdW50INC80LXRgdGC pager: options: tags: diff --git a/conf/cmi/language/ru/views.view.redirect.yml b/conf/cmi/language/ru/views.view.redirect.yml index c4a7feb9f..3b43012c2 100644 --- a/conf/cmi/language/ru/views.view.redirect.yml +++ b/conf/cmi/language/ru/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: Переадресация +label: Redirect display: default: display_title: Основной @@ -23,45 +23,45 @@ display: offset_label: Пропустить fields: redirect_bulk_form: - action_title: 'С выделенным' + action_title: 'With selection' redirect_source__path: - label: От + label: From separator: ', ' created: - label: Создано + label: Created filters: redirect_source__path: expose: - label: От + label: From redirect_redirect__uri: expose: - label: Кому + label: To status_code: expose: - label: 'Код состояния' + label: 'Status code' group_info: - label: 'Код состояния' + label: 'Status code' group_items: 1: - title: '300 Множество Выборов' + title: '300 Multiple Choices' 2: - title: '301 Перемещёно Окончательно' + title: '301 Moved Permanently' 3: - title: '302 Найдено' + title: '302 Found' 4: - title: '303 Смотреть Другое' + title: '303 See Other' 5: - title: '304 Не Изменялось' + title: '304 Not Modified' 6: - title: '305 Использовать Прокси' + title: '305 Use Proxy' 7: - title: '307 - Временно перемещено' + title: '307 Temporary Redirect' language: expose: - label: 'Язык оригинала' - title: Переадресация + label: 'Original language' + title: Redirect empty: area_text_custom: - content: 'Перенаправлений пока нет.' + content: 'There is no redirect yet.' page_1: display_title: Страница diff --git a/conf/cmi/language/uk/views.view.redirect.yml b/conf/cmi/language/uk/views.view.redirect.yml index 3cfe80171..d4ff8153f 100644 --- a/conf/cmi/language/uk/views.view.redirect.yml +++ b/conf/cmi/language/uk/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: Переспрямувати +label: Redirect display: default: display_title: Головне @@ -23,42 +23,42 @@ display: offset_label: Зміщення fields: redirect_bulk_form: - action_title: 'З вибраним' + action_title: 'With selection' redirect_source__path: - label: Від + label: From separator: ', ' created: - label: Створено + label: Created filters: redirect_source__path: expose: - label: Від + label: From redirect_redirect__uri: expose: - label: До + label: To status_code: expose: - label: 'Код стану' + label: 'Status code' group_info: - label: 'Код стану' + label: 'Status code' group_items: 1: - title: '300 Безліч Виборів' + title: '300 Multiple Choices' 2: - title: '301 Переміщене Остаточно' + title: '301 Moved Permanently' 3: - title: '302 Знайдене' + title: '302 Found' 4: - title: '303 Дивитися Інше' + title: '303 See Other' 5: - title: '304 Не Змінювалося' + title: '304 Not Modified' 6: - title: '305 Використовувати Проксі' + title: '305 Use Proxy' 7: - title: '307 - Тимчасово переміщене' + title: '307 Temporary Redirect' language: expose: - label: 'Мова оригіналу' - title: Переспрямувати + label: 'Original language' + title: Redirect page_1: display_title: Сторінка diff --git a/conf/cmi/language/zh-hans/views.view.redirect.yml b/conf/cmi/language/zh-hans/views.view.redirect.yml index df2e163c3..cbe5197b4 100644 --- a/conf/cmi/language/zh-hans/views.view.redirect.yml +++ b/conf/cmi/language/zh-hans/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: 重定向 +label: Redirect display: default: display_title: 主 @@ -23,39 +23,39 @@ display: offset_label: 偏移量 fields: redirect_bulk_form: - action_title: 对所选项目 + action_title: 'With selection' redirect_source__path: - label: 源自 + label: From separator: ', ' created: - label: 已建立 + label: Created filters: redirect_source__path: expose: - label: 源自 + label: From redirect_redirect__uri: expose: - label: 到 + label: To status_code: group_info: group_items: 1: - title: 300多种选择 + title: '300 Multiple Choices' 2: - title: 301永久移动 + title: '301 Moved Permanently' 3: - title: 302临时重定向 + title: '302 Found' 4: - title: 303查看其它位置 + title: '303 See Other' 5: - title: 304未修改 + title: '304 Not Modified' 6: - title: 305使用代理 + title: '305 Use Proxy' 7: - title: 307临时重定向 + title: '307 Temporary Redirect' language: expose: - label: 原始语言 - title: 重定向 + label: 'Original language' + title: Redirect page_1: display_title: 页面 From 81f9a8f80f29a0b8ed09d15a43ff32d7ddfead4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Wed, 18 Dec 2024 11:19:36 +0200 Subject: [PATCH 2/5] Reverted arabic translations. --- conf/cmi/language/ar/views.view.archive.yml | 6 +++--- conf/cmi/language/ar/views.view.content.yml | 2 +- conf/cmi/language/ar/views.view.files.yml | 8 ++++---- conf/cmi/language/ar/views.view.glossary.yml | 6 +++--- conf/cmi/language/ar/views.view.locked_content.yml | 6 +++--- conf/cmi/language/ar/views.view.media.yml | 4 ++-- conf/cmi/language/ar/views.view.media_library.yml | 6 +++--- .../language/ar/views.view.paragraphs_library.yml | 6 +++--- conf/cmi/language/ar/views.view.redirect.yml | 14 +++++++------- conf/cmi/language/ar/views.view.taxonomy_term.yml | 6 +++--- .../language/ar/views.view.user_admin_people.yml | 6 +++--- 11 files changed, 35 insertions(+), 35 deletions(-) diff --git a/conf/cmi/language/ar/views.view.archive.yml b/conf/cmi/language/ar/views.view.archive.yml index fb626ef3c..ec36a5421 100644 --- a/conf/cmi/language/ar/views.view.archive.yml +++ b/conf/cmi/language/ar/views.view.archive.yml @@ -6,8 +6,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة exposed_form: options: submit_button: تطبيق @@ -18,4 +18,4 @@ display: block_1: display_title: الصندوق page_1: - display_title: Page + display_title: الصفحة diff --git a/conf/cmi/language/ar/views.view.content.yml b/conf/cmi/language/ar/views.view.content.yml index e4d1c10c7..ff0c7b220 100644 --- a/conf/cmi/language/ar/views.view.content.yml +++ b/conf/cmi/language/ar/views.view.content.yml @@ -58,7 +58,7 @@ display: expose: label: اللغة page_1: - display_title: Page + display_title: الصفحة display_options: menu: title: المحتوى diff --git a/conf/cmi/language/ar/views.view.files.yml b/conf/cmi/language/ar/views.view.files.yml index 9ca4a548f..d68686b5f 100644 --- a/conf/cmi/language/ar/views.view.files.yml +++ b/conf/cmi/language/ar/views.view.files.yml @@ -22,8 +22,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة exposed_form: options: submit_button: انتقاء @@ -60,8 +60,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة arguments: fid: exception: diff --git a/conf/cmi/language/ar/views.view.glossary.yml b/conf/cmi/language/ar/views.view.glossary.yml index b4aba719a..fb47d49d1 100644 --- a/conf/cmi/language/ar/views.view.glossary.yml +++ b/conf/cmi/language/ar/views.view.glossary.yml @@ -13,8 +13,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة exposed_form: options: submit_button: تطبيق @@ -25,7 +25,7 @@ display: attachment_1: display_title: المرفق page_1: - display_title: Page + display_title: الصفحة display_options: menu: title: القاموس diff --git a/conf/cmi/language/ar/views.view.locked_content.yml b/conf/cmi/language/ar/views.view.locked_content.yml index 3e482b4d5..0973d427d 100644 --- a/conf/cmi/language/ar/views.view.locked_content.yml +++ b/conf/cmi/language/ar/views.view.locked_content.yml @@ -12,8 +12,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة fields: node_bulk_form: action_title: إجراء @@ -40,4 +40,4 @@ display: expose: label: العنوان page_1: - display_title: Page + display_title: الصفحة diff --git a/conf/cmi/language/ar/views.view.media.yml b/conf/cmi/language/ar/views.view.media.yml index 48833b3f3..45497ee56 100644 --- a/conf/cmi/language/ar/views.view.media.yml +++ b/conf/cmi/language/ar/views.view.media.yml @@ -35,8 +35,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة exposed_form: options: submit_button: انتقاء diff --git a/conf/cmi/language/ar/views.view.media_library.yml b/conf/cmi/language/ar/views.view.media_library.yml index 2d87d59e3..38247755c 100644 --- a/conf/cmi/language/ar/views.view.media_library.yml +++ b/conf/cmi/language/ar/views.view.media_library.yml @@ -9,8 +9,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة exposed_form: options: submit_button: 'عمل تصفية' @@ -32,7 +32,7 @@ display: expose: label: اللغة page: - display_title: Page + display_title: الصفحة display_options: fields: media_bulk_form: diff --git a/conf/cmi/language/ar/views.view.paragraphs_library.yml b/conf/cmi/language/ar/views.view.paragraphs_library.yml index 15849d676..15b1b590c 100644 --- a/conf/cmi/language/ar/views.view.paragraphs_library.yml +++ b/conf/cmi/language/ar/views.view.paragraphs_library.yml @@ -12,8 +12,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة fields: label: label: التسمية @@ -44,4 +44,4 @@ display: expose: label: النوع page_1: - display_title: Page + display_title: الصفحة diff --git a/conf/cmi/language/ar/views.view.redirect.yml b/conf/cmi/language/ar/views.view.redirect.yml index c82acce59..3748b6cb7 100644 --- a/conf/cmi/language/ar/views.view.redirect.yml +++ b/conf/cmi/language/ar/views.view.redirect.yml @@ -17,20 +17,20 @@ display: first: '« الأولى' last: 'الأخيرة »' expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة fields: redirect_source__path: - label: From + label: من separator: ', ' created: - label: Created + label: الإنشاء filters: redirect_source__path: expose: - label: From + label: من redirect_redirect__uri: expose: - label: To + label: إلى page_1: - display_title: Page + display_title: الصفحة diff --git a/conf/cmi/language/ar/views.view.taxonomy_term.yml b/conf/cmi/language/ar/views.view.taxonomy_term.yml index 08c773f1d..6c4bce3e5 100644 --- a/conf/cmi/language/ar/views.view.taxonomy_term.yml +++ b/conf/cmi/language/ar/views.view.taxonomy_term.yml @@ -6,8 +6,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة exposed_form: options: submit_button: تطبيق @@ -22,4 +22,4 @@ display: feed_1: display_title: التلقيمة page_1: - display_title: Page + display_title: الصفحة diff --git a/conf/cmi/language/ar/views.view.user_admin_people.yml b/conf/cmi/language/ar/views.view.user_admin_people.yml index 7d2bf5346..e3e7f7daa 100644 --- a/conf/cmi/language/ar/views.view.user_admin_people.yml +++ b/conf/cmi/language/ar/views.view.user_admin_people.yml @@ -29,8 +29,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة exposed_form: options: submit_button: انتقاء @@ -58,7 +58,7 @@ display: label: الصلاحية use_more_text: المزيد page_1: - display_title: Page + display_title: الصفحة display_options: menu: title: لائحة From 288e4c4519196b5cfdf37131724810e2ce56f1f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Wed, 18 Dec 2024 11:21:24 +0200 Subject: [PATCH 3/5] Reverted redirect views translations. --- conf/cmi/language/de/views.view.redirect.yml | 38 +++++++++---------- conf/cmi/language/et/views.view.redirect.yml | 14 +++---- conf/cmi/language/fa/views.view.redirect.yml | 10 ++--- conf/cmi/language/fr/views.view.redirect.yml | 38 +++++++++---------- conf/cmi/language/ru/views.view.redirect.yml | 36 +++++++++--------- conf/cmi/language/uk/views.view.redirect.yml | 34 ++++++++--------- .../language/zh-hans/views.view.redirect.yml | 30 +++++++-------- 7 files changed, 100 insertions(+), 100 deletions(-) diff --git a/conf/cmi/language/de/views.view.redirect.yml b/conf/cmi/language/de/views.view.redirect.yml index 823bebf5f..a0d83ab43 100644 --- a/conf/cmi/language/de/views.view.redirect.yml +++ b/conf/cmi/language/de/views.view.redirect.yml @@ -1,5 +1,5 @@ -label: Redirect -description: 'List of redirects' +label: Umleiten +description: 'Liste der Umleitungen' display: default: display_title: Master @@ -24,45 +24,45 @@ display: offset_label: Versatz fields: redirect_bulk_form: - action_title: 'With selection' + action_title: 'Mit Auswahl' redirect_source__path: - label: From + label: Von separator: ', ' created: - label: Created + label: Erstellt filters: redirect_source__path: expose: - label: From + label: Von redirect_redirect__uri: expose: - label: To + label: An status_code: expose: - label: 'Status code' + label: Statuscode group_info: - label: 'Status code' + label: Statuscode group_items: 1: - title: '300 Multiple Choices' + title: '300 Mehrere Auswahlmöglichkeiten' 2: - title: '301 Moved Permanently' + title: '301 Dauerhaft verschoben' 3: - title: '302 Found' + title: '302 Gefunden' 4: - title: '303 See Other' + title: '303 Siehe andere' 5: - title: '304 Not Modified' + title: '304 Nicht modifiziert' 6: - title: '305 Use Proxy' + title: '305 Proxy verwenden' 7: - title: '307 Temporary Redirect' + title: '307 Temporäre Weiterleitung' language: expose: - label: 'Original language' - title: Redirect + label: Originalsprache + title: Umleiten empty: area_text_custom: - content: 'There is no redirect yet.' + content: 'Es wurde noch keine Umleitung eingerichtet.' page_1: display_title: Seite diff --git a/conf/cmi/language/et/views.view.redirect.yml b/conf/cmi/language/et/views.view.redirect.yml index 837e319ae..c3421f764 100644 --- a/conf/cmi/language/et/views.view.redirect.yml +++ b/conf/cmi/language/et/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: Redirect +label: 'Suunatakse ümber' display: default: display_title: Peamine @@ -23,20 +23,20 @@ display: offset_label: Nihe fields: redirect_source__path: - label: From + label: Kellelt separator: ', ' created: - label: Created + label: Loodud filters: redirect_source__path: expose: - label: From + label: Kellelt redirect_redirect__uri: expose: - label: To + label: Kellele language: expose: - label: 'Original language' - title: Redirect + label: 'Algne keel' + title: 'Suunatakse ümber' page_1: display_title: Lehekülg diff --git a/conf/cmi/language/fa/views.view.redirect.yml b/conf/cmi/language/fa/views.view.redirect.yml index d1b77f0e3..d00c93bd4 100644 --- a/conf/cmi/language/fa/views.view.redirect.yml +++ b/conf/cmi/language/fa/views.view.redirect.yml @@ -22,17 +22,17 @@ display: offset_label: جابجایی fields: redirect_bulk_form: - action_title: 'With selection' + action_title: 'با انتخاب شده‌ها' redirect_source__path: - label: From + label: از created: - label: Created + label: 'ایجاد گردید' filters: redirect_source__path: expose: - label: From + label: از redirect_redirect__uri: expose: - label: To + label: به page_1: display_title: صفحه diff --git a/conf/cmi/language/fr/views.view.redirect.yml b/conf/cmi/language/fr/views.view.redirect.yml index f8b9d570c..88bee5068 100644 --- a/conf/cmi/language/fr/views.view.redirect.yml +++ b/conf/cmi/language/fr/views.view.redirect.yml @@ -1,5 +1,5 @@ -label: Redirect -description: 'List of redirects' +label: Rediriger +description: 'Liste des redirections' display: default: display_title: Maître @@ -24,45 +24,45 @@ display: offset_label: Décalage fields: redirect_bulk_form: - action_title: 'With selection' + action_title: 'Pour la sélection' redirect_source__path: - label: From + label: 'A partir de' separator: ', ' created: - label: Created + label: Créé filters: redirect_source__path: expose: - label: From + label: 'A partir de' redirect_redirect__uri: expose: - label: To + label: À status_code: expose: - label: 'Status code' + label: 'Code du statut' group_info: - label: 'Status code' + label: 'Code du statut' group_items: 1: - title: '300 Multiple Choices' + title: '300 Choix Multiples' 2: - title: '301 Moved Permanently' + title: '301 Redirection Permanente' 3: - title: '302 Found' + title: '302 Trouvé' 4: - title: '303 See Other' + title: '303 Voir Ailleurs' 5: - title: '304 Not Modified' + title: '304 Non Modifié' 6: - title: '305 Use Proxy' + title: '305 Utilise un Proxy' 7: - title: '307 Temporary Redirect' + title: '307 Redirection Temporaire' language: expose: - label: 'Original language' - title: Redirect + label: 'Langue initiale' + title: Rediriger empty: area_text_custom: - content: 'There is no redirect yet.' + content: "Il n'y a pas encore de redirection." page_1: display_title: Page diff --git a/conf/cmi/language/ru/views.view.redirect.yml b/conf/cmi/language/ru/views.view.redirect.yml index 3b43012c2..c4a7feb9f 100644 --- a/conf/cmi/language/ru/views.view.redirect.yml +++ b/conf/cmi/language/ru/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: Redirect +label: Переадресация display: default: display_title: Основной @@ -23,45 +23,45 @@ display: offset_label: Пропустить fields: redirect_bulk_form: - action_title: 'With selection' + action_title: 'С выделенным' redirect_source__path: - label: From + label: От separator: ', ' created: - label: Created + label: Создано filters: redirect_source__path: expose: - label: From + label: От redirect_redirect__uri: expose: - label: To + label: Кому status_code: expose: - label: 'Status code' + label: 'Код состояния' group_info: - label: 'Status code' + label: 'Код состояния' group_items: 1: - title: '300 Multiple Choices' + title: '300 Множество Выборов' 2: - title: '301 Moved Permanently' + title: '301 Перемещёно Окончательно' 3: - title: '302 Found' + title: '302 Найдено' 4: - title: '303 See Other' + title: '303 Смотреть Другое' 5: - title: '304 Not Modified' + title: '304 Не Изменялось' 6: - title: '305 Use Proxy' + title: '305 Использовать Прокси' 7: - title: '307 Temporary Redirect' + title: '307 - Временно перемещено' language: expose: - label: 'Original language' - title: Redirect + label: 'Язык оригинала' + title: Переадресация empty: area_text_custom: - content: 'There is no redirect yet.' + content: 'Перенаправлений пока нет.' page_1: display_title: Страница diff --git a/conf/cmi/language/uk/views.view.redirect.yml b/conf/cmi/language/uk/views.view.redirect.yml index d4ff8153f..3cfe80171 100644 --- a/conf/cmi/language/uk/views.view.redirect.yml +++ b/conf/cmi/language/uk/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: Redirect +label: Переспрямувати display: default: display_title: Головне @@ -23,42 +23,42 @@ display: offset_label: Зміщення fields: redirect_bulk_form: - action_title: 'With selection' + action_title: 'З вибраним' redirect_source__path: - label: From + label: Від separator: ', ' created: - label: Created + label: Створено filters: redirect_source__path: expose: - label: From + label: Від redirect_redirect__uri: expose: - label: To + label: До status_code: expose: - label: 'Status code' + label: 'Код стану' group_info: - label: 'Status code' + label: 'Код стану' group_items: 1: - title: '300 Multiple Choices' + title: '300 Безліч Виборів' 2: - title: '301 Moved Permanently' + title: '301 Переміщене Остаточно' 3: - title: '302 Found' + title: '302 Знайдене' 4: - title: '303 See Other' + title: '303 Дивитися Інше' 5: - title: '304 Not Modified' + title: '304 Не Змінювалося' 6: - title: '305 Use Proxy' + title: '305 Використовувати Проксі' 7: - title: '307 Temporary Redirect' + title: '307 - Тимчасово переміщене' language: expose: - label: 'Original language' - title: Redirect + label: 'Мова оригіналу' + title: Переспрямувати page_1: display_title: Сторінка diff --git a/conf/cmi/language/zh-hans/views.view.redirect.yml b/conf/cmi/language/zh-hans/views.view.redirect.yml index cbe5197b4..df2e163c3 100644 --- a/conf/cmi/language/zh-hans/views.view.redirect.yml +++ b/conf/cmi/language/zh-hans/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: Redirect +label: 重定向 display: default: display_title: 主 @@ -23,39 +23,39 @@ display: offset_label: 偏移量 fields: redirect_bulk_form: - action_title: 'With selection' + action_title: 对所选项目 redirect_source__path: - label: From + label: 源自 separator: ', ' created: - label: Created + label: 已建立 filters: redirect_source__path: expose: - label: From + label: 源自 redirect_redirect__uri: expose: - label: To + label: 到 status_code: group_info: group_items: 1: - title: '300 Multiple Choices' + title: 300多种选择 2: - title: '301 Moved Permanently' + title: 301永久移动 3: - title: '302 Found' + title: 302临时重定向 4: - title: '303 See Other' + title: 303查看其它位置 5: - title: '304 Not Modified' + title: 304未修改 6: - title: '305 Use Proxy' + title: 305使用代理 7: - title: '307 Temporary Redirect' + title: 307临时重定向 language: expose: - label: 'Original language' - title: Redirect + label: 原始语言 + title: 重定向 page_1: display_title: 页面 From b18a3f9abe2ac6c04680f5b2cec9a27ac69028a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Wed, 18 Dec 2024 11:32:18 +0200 Subject: [PATCH 4/5] Updated composer.lock --- composer.lock | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index f465d03c5..ae774b9bf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "bb7e0cfcdb461c05f2f95cafa401bd58", + "content-hash": "551a83dd4dcad1fe1edc914254f2ecc2", "packages": [ { "name": "asm89/stack-cors", @@ -4598,16 +4598,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.10.4", + "version": "4.10.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "24833b53e247ee6e56a852eb497139ee8883e6ac" + "reference": "7c52e541f43948f3ad5603a07690f946c6604241" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/24833b53e247ee6e56a852eb497139ee8883e6ac", - "reference": "24833b53e247ee6e56a852eb497139ee8883e6ac", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/7c52e541f43948f3ad5603a07690f946c6604241", + "reference": "7c52e541f43948f3ad5603a07690f946c6604241", "shasum": "" }, "require": { @@ -4676,8 +4676,9 @@ "ruflin/elastica": "^8.0" }, "conflict": { - "drupal/core": "<10.3.10", - "drupal/core-composer-scaffold": "<10.3", + "drupal/core": ">=10.4.0", + "drupal/core-composer-scaffold": ">=10.4.0", + "drupal/core-dev": ">=10.4.0", "drupal/ctools": "<3.11 || ^4.0.1", "drupal/default_content": ">2.0.0-alpha2", "drupal/gin_toolbar": ">1.0.0-rc6", @@ -4732,10 +4733,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.4", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.5", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-12-18T06:30:07+00:00" + "time": "2024-12-18T08:08:55+00:00" }, { "name": "drupal/helfi_proxy", @@ -21011,6 +21012,6 @@ "platform": { "ext-libxml": "*" }, - "platform-dev": {}, + "platform-dev": [], "plugin-api-version": "2.6.0" } From 8eda1e8db0849d4a139fdf30eb16c04d2e5727a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Wed, 18 Dec 2024 11:36:10 +0200 Subject: [PATCH 5/5] Updated composer.lock --- composer.lock | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/composer.lock b/composer.lock index ae774b9bf..db48c6495 100644 --- a/composer.lock +++ b/composer.lock @@ -2358,16 +2358,16 @@ }, { "name": "drupal/core", - "version": "10.4.0", + "version": "10.3.10", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d" + "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d", - "reference": "2ac1930116a840b4fbd0ad5cdd3a6d58939a0b1d", + "url": "https://api.github.com/repos/drupal/core/zipball/3ebb71e9c4ef0c13f683353547551fca49f9a144", + "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144", "shasum": "" }, "require": { @@ -2413,7 +2413,7 @@ "symfony/serializer": "^6.4", "symfony/validator": "^6.4", "symfony/yaml": "^6.4", - "twig/twig": "^3.15.0" + "twig/twig": "^3.14.2" }, "conflict": { "drush/drush": "<12.4.3" @@ -2516,22 +2516,22 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.4.0" + "source": "https://github.com/drupal/core/tree/10.3.10" }, - "time": "2024-12-17T22:18:01+00:00" + "time": "2024-11-22T12:51:33+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.4.0", + "version": "10.3.10", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", - "reference": "db17b59620ce1c142a34dc017d9e696ce4771e55" + "reference": "f58ab5c0d02d275c5aa226c4505b457e41b161cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/db17b59620ce1c142a34dc017d9e696ce4771e55", - "reference": "db17b59620ce1c142a34dc017d9e696ce4771e55", + "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/f58ab5c0d02d275c5aa226c4505b457e41b161cc", + "reference": "f58ab5c0d02d275c5aa226c4505b457e41b161cc", "shasum": "" }, "require": { @@ -2566,9 +2566,9 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.4.0" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.10" }, - "time": "2024-08-22T14:31:30+00:00" + "time": "2024-08-22T14:31:34+00:00" }, { "name": "drupal/crop", @@ -4704,7 +4704,8 @@ "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://www.drupal.org/files/issues/2023-12-19/2313309-179.patch", "[#UHF-9388] Process configuration translation files for custom modules (https://www.drupal.org/i/2845437)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fd68277191b8f8ec290e53b5fbbae699b2260384/patches/drupal-2845437-process-custom-module-translation-config-10.3.x.patch", "[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "https://www.drupal.org/files/issues/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.patch", - "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch" + "[#UHF-9952, #UHF-9980] Duplicate
tags (https://www.drupal.org/i/3083786)": "https://www.drupal.org/files/issues/2024-08-08/3083786--mr-8066--10-3-backport.patch", + "[#UHF-10716] Ensure consistent ordering when calculating library asset order (https://www.drupal.org/i/3467860)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/955e2fc9493c6574ab070187b8a5a8634da7daab/patches/drupal-3467860-optimized-js-assets-mismatch.patch" }, "drupal/default_content": { "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch"