From edd2df4b995c359a739f040f05d60a3795fe5470 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 26 Mar 2024 14:21:18 +0000 Subject: [PATCH 1/3] Update configuration --- composer.lock | 24 +++++++++---------- ...form_display.node.landing_page.default.yml | 2 +- ..._form_display.paragraph.banner.default.yml | 2 +- ...y.paragraph.list_of_links_item.default.yml | 2 +- ...view_display.tpr_unit.tpr_unit.default.yml | 7 +++--- ...ield.paragraph.chart.field_chart_chart.yml | 4 ++-- ...agraph.remote_video.field_iframe_title.yml | 4 ++-- ...agraph.remote_video.field_remote_video.yml | 4 ++-- ...ield.paragraph.chart.field_chart_chart.yml | 2 +- ...agraph.remote_video.field_remote_video.yml | 2 +- .../language/fi/media.type.helfi_chart.yml | 2 +- .../language/fi/media.type.remote_video.yml | 2 +- .../fi/metatag.metatag_defaults.global.yml | 2 +- .../cmi/language/fi/social_media.settings.yml | 2 +- .../sv/metatag.metatag_defaults.global.yml | 2 +- .../cmi/language/sv/social_media.settings.yml | 14 +++++------ conf/cmi/media.type.helfi_chart.yml | 4 ++-- 17 files changed, 40 insertions(+), 41 deletions(-) diff --git a/composer.lock b/composer.lock index 74422ba8..6d1051ff 100644 --- a/composer.lock +++ b/composer.lock @@ -3734,16 +3734,16 @@ }, { "name": "drupal/hdbt", - "version": "6.4.32", + "version": "6.4.33", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "b55513e3ec3bf9cff2b79c52202836d3ade1ed99" + "reference": "8687ecfc9afd4d92a4e102ef4e91a2a7a6aee97a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/b55513e3ec3bf9cff2b79c52202836d3ade1ed99", - "reference": "b55513e3ec3bf9cff2b79c52202836d3ade1ed99", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/8687ecfc9afd4d92a4e102ef4e91a2a7a6aee97a", + "reference": "8687ecfc9afd4d92a4e102ef4e91a2a7a6aee97a", "shasum": "" }, "require": { @@ -3761,10 +3761,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.32", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.33", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-03-25T10:14:04+00:00" + "time": "2024-03-26T11:31:45+00:00" }, { "name": "drupal/hdbt_admin", @@ -4057,16 +4057,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.30", + "version": "4.3.33", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "f46a25a94e25a99ebecbf45720e526612032d7a0" + "reference": "b59abd9e2ece05dcf3e2a7e9968a0a834ab082e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f46a25a94e25a99ebecbf45720e526612032d7a0", - "reference": "f46a25a94e25a99ebecbf45720e526612032d7a0", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/b59abd9e2ece05dcf3e2a7e9968a0a834ab082e0", + "reference": "b59abd9e2ece05dcf3e2a7e9968a0a834ab082e0", "shasum": "" }, "require": { @@ -4182,10 +4182,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.30", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.33", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-03-25T10:45:37+00:00" + "time": "2024-03-26T14:16:52+00:00" }, { "name": "drupal/helfi_proxy", diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml index 774fc2f5..a1389e95 100644 --- a/conf/cmi/core.entity_form_display.node.landing_page.default.yml +++ b/conf/cmi/core.entity_form_display.node.landing_page.default.yml @@ -128,9 +128,9 @@ content: third_party_settings: { } simple_sitemap: weight: 10 + region: content settings: { } third_party_settings: { } - region: content status: type: boolean_checkbox weight: 12 diff --git a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml b/conf/cmi/core.entity_form_display.paragraph.banner.default.yml index e292847c..1f550fd9 100644 --- a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.banner.default.yml @@ -42,8 +42,8 @@ content: weight: 4 region: content settings: - linkit_auto_link_text: false linkit_profile: helfi + linkit_auto_link_text: false third_party_settings: { } field_banner_link_design: type: design_field_widget diff --git a/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml b/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml index 13abfd4a..3df13af6 100644 --- a/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml @@ -40,8 +40,8 @@ content: weight: 1 region: content settings: - linkit_auto_link_text: false linkit_profile: helfi + linkit_auto_link_text: false third_party_settings: { } hidden: created: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml index d50dc242..09c973d7 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml @@ -18,7 +18,7 @@ dependencies: - telephone - text _core: - default_config_hash: SoKM8cPSwNeMsP8ZRG0b8B8n-e1Uy9yoMmPk018vmoY + default_config_hash: 8GmiJoVZmgbZpZ9jGuNv_AQg3EgThOq06AsznzuWOGk id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit @@ -96,10 +96,9 @@ content: weight: 2 region: content email: - type: string + type: email_mailto label: hidden - settings: - link_to_entity: false + settings: { } third_party_settings: { } weight: 8 region: content diff --git a/conf/cmi/field.field.paragraph.chart.field_chart_chart.yml b/conf/cmi/field.field.paragraph.chart.field_chart_chart.yml index 5be1b57f..26df92e5 100644 --- a/conf/cmi/field.field.paragraph.chart.field_chart_chart.yml +++ b/conf/cmi/field.field.paragraph.chart.field_chart_chart.yml @@ -7,12 +7,12 @@ dependencies: - media.type.helfi_chart - paragraphs.paragraphs_type.chart _core: - default_config_hash: Bgpy9qMeAyk_ExogswE1IH_q2_H7q__aGfrIHsquc0s + default_config_hash: zm2M_4h4jxz-_BHInwvFTMM2s_lMFyeWyijbPud7yjw id: paragraph.chart.field_chart_chart field_name: field_chart_chart entity_type: paragraph bundle: chart -label: Chart +label: 'Chart embed' description: '' required: false translatable: false diff --git a/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml b/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml index e4726ca3..b49aa44b 100644 --- a/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml +++ b/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml @@ -6,13 +6,13 @@ dependencies: - field.storage.paragraph.field_iframe_title - paragraphs.paragraphs_type.remote_video _core: - default_config_hash: 4JZoeG_XitvgE9Tg7ZfVUwjpWcjeqktlO2tOnx_WfWU + default_config_hash: KFqLYybhQZx8DQDevmx8l7O1E7nmPwIhkizJrBbxTXs id: paragraph.remote_video.field_iframe_title field_name: field_iframe_title entity_type: paragraph bundle: remote_video label: 'Assistive technology title' -description: 'Users of assistive technology need a descriptive title to know what is in the embedded content. Do not use the prefix "Video: ". It will be added automatically.' +description: 'Users of assistive technology need a descriptive title to know what is in the embedded video. Do not use the prefix "Video: ". It will be added automatically.' required: true translatable: true default_value: { } diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video.yml index 7ab70648..3d890a76 100644 --- a/conf/cmi/field.field.paragraph.remote_video.field_remote_video.yml +++ b/conf/cmi/field.field.paragraph.remote_video.field_remote_video.yml @@ -7,12 +7,12 @@ dependencies: - media.type.remote_video - paragraphs.paragraphs_type.remote_video _core: - default_config_hash: Fic2VdL-ZETniu6G6WMkjo6q6P2QhttP4fv8UUwGSR0 + default_config_hash: b_L89pXt7d85BtmH-jz-VizHh8JhDMro97VxdqxFy2Y id: paragraph.remote_video.field_remote_video field_name: field_remote_video entity_type: paragraph bundle: remote_video -label: 'Remote video' +label: 'Remote video embed' description: '' required: true translatable: false diff --git a/conf/cmi/language/fi/field.field.paragraph.chart.field_chart_chart.yml b/conf/cmi/language/fi/field.field.paragraph.chart.field_chart_chart.yml index 5a0109a5..ece43142 100644 --- a/conf/cmi/language/fi/field.field.paragraph.chart.field_chart_chart.yml +++ b/conf/cmi/language/fi/field.field.paragraph.chart.field_chart_chart.yml @@ -1 +1 @@ -label: Kaavio +label: Kaavioupotus diff --git a/conf/cmi/language/fi/field.field.paragraph.remote_video.field_remote_video.yml b/conf/cmi/language/fi/field.field.paragraph.remote_video.field_remote_video.yml index 893996f6..b6ec3be1 100644 --- a/conf/cmi/language/fi/field.field.paragraph.remote_video.field_remote_video.yml +++ b/conf/cmi/language/fi/field.field.paragraph.remote_video.field_remote_video.yml @@ -1 +1 @@ -label: 'Video ulkoisesta palvelusta' +label: Videoupotus diff --git a/conf/cmi/language/fi/media.type.helfi_chart.yml b/conf/cmi/language/fi/media.type.helfi_chart.yml index f2a79248..7188039a 100644 --- a/conf/cmi/language/fi/media.type.helfi_chart.yml +++ b/conf/cmi/language/fi/media.type.helfi_chart.yml @@ -1,2 +1,2 @@ -label: Kaavio +label: Kaavioupotus description: 'Kaavioupotus tukee Microsoft Power BI:tä.' diff --git a/conf/cmi/language/fi/media.type.remote_video.yml b/conf/cmi/language/fi/media.type.remote_video.yml index afa8b8c8..067d642f 100644 --- a/conf/cmi/language/fi/media.type.remote_video.yml +++ b/conf/cmi/language/fi/media.type.remote_video.yml @@ -1,2 +1,2 @@ -label: 'Video ulkoisesta palvelusta' +label: Videoupotus description: 'Mediatyyppi ulkoisten palveluiden, kuten YouTube tarjoamille videoille.' diff --git a/conf/cmi/language/fi/metatag.metatag_defaults.global.yml b/conf/cmi/language/fi/metatag.metatag_defaults.global.yml index f314fe6c..f621b3bb 100644 --- a/conf/cmi/language/fi/metatag.metatag_defaults.global.yml +++ b/conf/cmi/language/fi/metatag.metatag_defaults.global.yml @@ -1,3 +1,3 @@ -label: Globaali +label: Yleinen tags: title: '[current-page:title] | [site:page-title-suffix]' diff --git a/conf/cmi/language/fi/social_media.settings.yml b/conf/cmi/language/fi/social_media.settings.yml index 710c0a2d..ead72050 100644 --- a/conf/cmi/language/fi/social_media.settings.yml +++ b/conf/cmi/language/fi/social_media.settings.yml @@ -8,7 +8,7 @@ social_media: api_url: 'https://www.linkedin.com/sharing/share-offsite/?url=[current-page:url]' attributes: "target|_blank\r\nclass|linkedin" twitter: - text: 'Jaa Twitter-palvelussa' + text: 'Jaa X-palvelussa' api_url: 'https://twitter.com/intent/tweet?url=[current-page:url]&status=[current-page:title]+[current-page:url]' attributes: "target|_blank\r\nclass|twitter" email: diff --git a/conf/cmi/language/sv/metatag.metatag_defaults.global.yml b/conf/cmi/language/sv/metatag.metatag_defaults.global.yml index 68ff865b..bda29cfe 100644 --- a/conf/cmi/language/sv/metatag.metatag_defaults.global.yml +++ b/conf/cmi/language/sv/metatag.metatag_defaults.global.yml @@ -1,3 +1,3 @@ -label: Global +label: Globalt tags: title: '[current-page:title] | [site:page-title-suffix]' diff --git a/conf/cmi/language/sv/social_media.settings.yml b/conf/cmi/language/sv/social_media.settings.yml index 517f8667..f3c07820 100644 --- a/conf/cmi/language/sv/social_media.settings.yml +++ b/conf/cmi/language/sv/social_media.settings.yml @@ -1,24 +1,24 @@ social_media: facebook_share: - text: 'Share in Facebook' + text: 'Dela på Facebook' api_url: 'http://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]' attributes: "target|_blank\r\nclass|facebook-share" - facebook_msg: - attributes: "target|_blank\r\nclass|facebook-msg\r\nrel|noopener noreferrer" linkedin: + text: 'Dela på Linkedin' api_url: 'https://www.linkedin.com/sharing/share-offsite/?url=[current-page:url]' - text: 'Share in Linkedin' attributes: "target|_blank\r\nclass|linkedin" twitter: + text: 'Dela på X' api_url: 'https://twitter.com/intent/tweet?url=[current-page:url]&status=[current-page:title]+[current-page:url]' - text: 'Share in Twitter' attributes: "target|_blank\r\nclass|twitter" + email: + text: E-post + facebook_msg: + attributes: "target|_blank\r\nclass|facebook-msg\r\nrel|noopener noreferrer" pinterest: text: Pinterest attributes: "target|_blank\r\nclass|pinterest\r\nrel|noopener noreferrer" whatsapp: attributes: "class|whatsapp show-for-small-only\r\ndata-action|share/whatsapp/share" - email: - text: E-post print: text: Print diff --git a/conf/cmi/media.type.helfi_chart.yml b/conf/cmi/media.type.helfi_chart.yml index 8ebb5b1c..2d32fbad 100644 --- a/conf/cmi/media.type.helfi_chart.yml +++ b/conf/cmi/media.type.helfi_chart.yml @@ -5,9 +5,9 @@ dependencies: module: - helfi_media_chart _core: - default_config_hash: YImkDFPrmCpI5G1zYLIYxEOIL_x5X9aNG__n0peJK4Y + default_config_hash: 1503jEWhXt0uww_73X1tsvrKBnZlbrduYrVR0J4IugA id: helfi_chart -label: Chart +label: 'Chart embed' description: 'Media type Chart can be used to present interactive charts. Supports Microsoft Power BI.' source: helfi_chart queue_thumbnail_downloads: false From 37abefd8c0f71c8d3b25b611e8a04a867f8c15e1 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Tue, 26 Mar 2024 16:44:00 +0200 Subject: [PATCH 2/3] Update social_media.settings.yml --- conf/cmi/language/fi/social_media.settings.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/conf/cmi/language/fi/social_media.settings.yml b/conf/cmi/language/fi/social_media.settings.yml index ead72050..cf8fea7b 100644 --- a/conf/cmi/language/fi/social_media.settings.yml +++ b/conf/cmi/language/fi/social_media.settings.yml @@ -1,23 +1,9 @@ social_media: facebook_share: text: 'Jaa Facebook-palvelussa' - api_url: 'http://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]' - attributes: "target|_blank\r\nclass|facebook-share" linkedin: text: 'Jaa LinkedIn-palvelussa' - api_url: 'https://www.linkedin.com/sharing/share-offsite/?url=[current-page:url]' - attributes: "target|_blank\r\nclass|linkedin" twitter: text: 'Jaa X-palvelussa' - api_url: 'https://twitter.com/intent/tweet?url=[current-page:url]&status=[current-page:title]+[current-page:url]' - attributes: "target|_blank\r\nclass|twitter" email: - text: Sähköposti - facebook_msg: - attributes: "target|_blank\r\nclass|facebook-msg\r\nrel|noopener noreferrer" - pinterest: - attributes: "target|_blank\r\nclass|pinterest\r\nrel|noopener noreferrer" - whatsapp: - attributes: "class|whatsapp show-for-small-only\r\ndata-action|share/whatsapp/share" - print: - text: Print + text: 'Lähetä sivu sähköpostitse' From 7a5f95808103e4e8c0cdf9b1e4f3d186df317571 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Tue, 26 Mar 2024 16:44:15 +0200 Subject: [PATCH 3/3] Update social_media.settings.yml --- conf/cmi/language/sv/social_media.settings.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/conf/cmi/language/sv/social_media.settings.yml b/conf/cmi/language/sv/social_media.settings.yml index f3c07820..498a2fe7 100644 --- a/conf/cmi/language/sv/social_media.settings.yml +++ b/conf/cmi/language/sv/social_media.settings.yml @@ -1,24 +1,9 @@ social_media: facebook_share: text: 'Dela på Facebook' - api_url: 'http://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]' - attributes: "target|_blank\r\nclass|facebook-share" linkedin: text: 'Dela på Linkedin' - api_url: 'https://www.linkedin.com/sharing/share-offsite/?url=[current-page:url]' - attributes: "target|_blank\r\nclass|linkedin" twitter: text: 'Dela på X' - api_url: 'https://twitter.com/intent/tweet?url=[current-page:url]&status=[current-page:title]+[current-page:url]' - attributes: "target|_blank\r\nclass|twitter" email: - text: E-post - facebook_msg: - attributes: "target|_blank\r\nclass|facebook-msg\r\nrel|noopener noreferrer" - pinterest: - text: Pinterest - attributes: "target|_blank\r\nclass|pinterest\r\nrel|noopener noreferrer" - whatsapp: - attributes: "class|whatsapp show-for-small-only\r\ndata-action|share/whatsapp/share" - print: - text: Print + text: 'Skicka via e-post'