From 7a216249d9a2a228f166c80f67369dbe817f65ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 25 Mar 2024 14:51:05 +0200 Subject: [PATCH 01/10] UHF-9088: Moved social_media.settings.yml translations to rewrite folders. --- .../{optional => rewrite}/language/fi/social_media.settings.yml | 0 .../{optional => rewrite}/language/sv/social_media.settings.yml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename modules/helfi_node_news_item/config/{optional => rewrite}/language/fi/social_media.settings.yml (100%) rename modules/helfi_node_news_item/config/{optional => rewrite}/language/sv/social_media.settings.yml (100%) diff --git a/modules/helfi_node_news_item/config/optional/language/fi/social_media.settings.yml b/modules/helfi_node_news_item/config/rewrite/language/fi/social_media.settings.yml similarity index 100% rename from modules/helfi_node_news_item/config/optional/language/fi/social_media.settings.yml rename to modules/helfi_node_news_item/config/rewrite/language/fi/social_media.settings.yml diff --git a/modules/helfi_node_news_item/config/optional/language/sv/social_media.settings.yml b/modules/helfi_node_news_item/config/rewrite/language/sv/social_media.settings.yml similarity index 100% rename from modules/helfi_node_news_item/config/optional/language/sv/social_media.settings.yml rename to modules/helfi_node_news_item/config/rewrite/language/sv/social_media.settings.yml From a8ce71505f493da82f808d75ef2a4f8b7d087ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 25 Mar 2024 15:33:26 +0200 Subject: [PATCH 02/10] UHF-9088: Moved the metatags and core date format translations to rewrite/language folders. --- .../optional/language/sv/metatag.metatag_defaults.global.yml | 1 - .../{optional => rewrite}/language/fi/core.date_format.long.yml | 0 .../language/fi/core.date_format.medium.yml | 0 .../{optional => rewrite}/language/fi/core.date_format.short.yml | 0 .../language/fi/metatag.metatag_defaults.front.yml | 0 .../language/fi/metatag.metatag_defaults.global.yml | 0 .../language/fi/metatag.metatag_defaults.node.yml | 0 .../language/fi/metatag.metatag_defaults.taxonomy_term.yml | 0 .../{optional => rewrite}/language/sv/core.date_format.long.yml | 0 .../language/sv/core.date_format.medium.yml | 0 .../{optional => rewrite}/language/sv/core.date_format.short.yml | 0 .../language/sv/metatag.metatag_defaults.front.yml | 0 .../rewrite/language/sv/metatag.metatag_defaults.global.yml | 1 + .../language/sv/metatag.metatag_defaults.node.yml | 0 .../language/sv/metatag.metatag_defaults.taxonomy_term.yml | 0 15 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 modules/helfi_base_content/config/optional/language/sv/metatag.metatag_defaults.global.yml rename modules/helfi_base_content/config/{optional => rewrite}/language/fi/core.date_format.long.yml (100%) rename modules/helfi_base_content/config/{optional => rewrite}/language/fi/core.date_format.medium.yml (100%) rename modules/helfi_base_content/config/{optional => rewrite}/language/fi/core.date_format.short.yml (100%) rename modules/helfi_base_content/config/{optional => rewrite}/language/fi/metatag.metatag_defaults.front.yml (100%) rename modules/helfi_base_content/config/{optional => rewrite}/language/fi/metatag.metatag_defaults.global.yml (100%) rename modules/helfi_base_content/config/{optional => rewrite}/language/fi/metatag.metatag_defaults.node.yml (100%) rename modules/helfi_base_content/config/{optional => rewrite}/language/fi/metatag.metatag_defaults.taxonomy_term.yml (100%) rename modules/helfi_base_content/config/{optional => rewrite}/language/sv/core.date_format.long.yml (100%) rename modules/helfi_base_content/config/{optional => rewrite}/language/sv/core.date_format.medium.yml (100%) rename modules/helfi_base_content/config/{optional => rewrite}/language/sv/core.date_format.short.yml (100%) rename modules/helfi_base_content/config/{optional => rewrite}/language/sv/metatag.metatag_defaults.front.yml (100%) create mode 100644 modules/helfi_base_content/config/rewrite/language/sv/metatag.metatag_defaults.global.yml rename modules/helfi_base_content/config/{optional => rewrite}/language/sv/metatag.metatag_defaults.node.yml (100%) rename modules/helfi_base_content/config/{optional => rewrite}/language/sv/metatag.metatag_defaults.taxonomy_term.yml (100%) diff --git a/modules/helfi_base_content/config/optional/language/sv/metatag.metatag_defaults.global.yml b/modules/helfi_base_content/config/optional/language/sv/metatag.metatag_defaults.global.yml deleted file mode 100644 index 85a1911f0..000000000 --- a/modules/helfi_base_content/config/optional/language/sv/metatag.metatag_defaults.global.yml +++ /dev/null @@ -1 +0,0 @@ -label: Global diff --git a/modules/helfi_base_content/config/optional/language/fi/core.date_format.long.yml b/modules/helfi_base_content/config/rewrite/language/fi/core.date_format.long.yml similarity index 100% rename from modules/helfi_base_content/config/optional/language/fi/core.date_format.long.yml rename to modules/helfi_base_content/config/rewrite/language/fi/core.date_format.long.yml diff --git a/modules/helfi_base_content/config/optional/language/fi/core.date_format.medium.yml b/modules/helfi_base_content/config/rewrite/language/fi/core.date_format.medium.yml similarity index 100% rename from modules/helfi_base_content/config/optional/language/fi/core.date_format.medium.yml rename to modules/helfi_base_content/config/rewrite/language/fi/core.date_format.medium.yml diff --git a/modules/helfi_base_content/config/optional/language/fi/core.date_format.short.yml b/modules/helfi_base_content/config/rewrite/language/fi/core.date_format.short.yml similarity index 100% rename from modules/helfi_base_content/config/optional/language/fi/core.date_format.short.yml rename to modules/helfi_base_content/config/rewrite/language/fi/core.date_format.short.yml diff --git a/modules/helfi_base_content/config/optional/language/fi/metatag.metatag_defaults.front.yml b/modules/helfi_base_content/config/rewrite/language/fi/metatag.metatag_defaults.front.yml similarity index 100% rename from modules/helfi_base_content/config/optional/language/fi/metatag.metatag_defaults.front.yml rename to modules/helfi_base_content/config/rewrite/language/fi/metatag.metatag_defaults.front.yml diff --git a/modules/helfi_base_content/config/optional/language/fi/metatag.metatag_defaults.global.yml b/modules/helfi_base_content/config/rewrite/language/fi/metatag.metatag_defaults.global.yml similarity index 100% rename from modules/helfi_base_content/config/optional/language/fi/metatag.metatag_defaults.global.yml rename to modules/helfi_base_content/config/rewrite/language/fi/metatag.metatag_defaults.global.yml diff --git a/modules/helfi_base_content/config/optional/language/fi/metatag.metatag_defaults.node.yml b/modules/helfi_base_content/config/rewrite/language/fi/metatag.metatag_defaults.node.yml similarity index 100% rename from modules/helfi_base_content/config/optional/language/fi/metatag.metatag_defaults.node.yml rename to modules/helfi_base_content/config/rewrite/language/fi/metatag.metatag_defaults.node.yml diff --git a/modules/helfi_base_content/config/optional/language/fi/metatag.metatag_defaults.taxonomy_term.yml b/modules/helfi_base_content/config/rewrite/language/fi/metatag.metatag_defaults.taxonomy_term.yml similarity index 100% rename from modules/helfi_base_content/config/optional/language/fi/metatag.metatag_defaults.taxonomy_term.yml rename to modules/helfi_base_content/config/rewrite/language/fi/metatag.metatag_defaults.taxonomy_term.yml diff --git a/modules/helfi_base_content/config/optional/language/sv/core.date_format.long.yml b/modules/helfi_base_content/config/rewrite/language/sv/core.date_format.long.yml similarity index 100% rename from modules/helfi_base_content/config/optional/language/sv/core.date_format.long.yml rename to modules/helfi_base_content/config/rewrite/language/sv/core.date_format.long.yml diff --git a/modules/helfi_base_content/config/optional/language/sv/core.date_format.medium.yml b/modules/helfi_base_content/config/rewrite/language/sv/core.date_format.medium.yml similarity index 100% rename from modules/helfi_base_content/config/optional/language/sv/core.date_format.medium.yml rename to modules/helfi_base_content/config/rewrite/language/sv/core.date_format.medium.yml diff --git a/modules/helfi_base_content/config/optional/language/sv/core.date_format.short.yml b/modules/helfi_base_content/config/rewrite/language/sv/core.date_format.short.yml similarity index 100% rename from modules/helfi_base_content/config/optional/language/sv/core.date_format.short.yml rename to modules/helfi_base_content/config/rewrite/language/sv/core.date_format.short.yml diff --git a/modules/helfi_base_content/config/optional/language/sv/metatag.metatag_defaults.front.yml b/modules/helfi_base_content/config/rewrite/language/sv/metatag.metatag_defaults.front.yml similarity index 100% rename from modules/helfi_base_content/config/optional/language/sv/metatag.metatag_defaults.front.yml rename to modules/helfi_base_content/config/rewrite/language/sv/metatag.metatag_defaults.front.yml diff --git a/modules/helfi_base_content/config/rewrite/language/sv/metatag.metatag_defaults.global.yml b/modules/helfi_base_content/config/rewrite/language/sv/metatag.metatag_defaults.global.yml new file mode 100644 index 000000000..50a0daf5d --- /dev/null +++ b/modules/helfi_base_content/config/rewrite/language/sv/metatag.metatag_defaults.global.yml @@ -0,0 +1 @@ +label: Globalt diff --git a/modules/helfi_base_content/config/optional/language/sv/metatag.metatag_defaults.node.yml b/modules/helfi_base_content/config/rewrite/language/sv/metatag.metatag_defaults.node.yml similarity index 100% rename from modules/helfi_base_content/config/optional/language/sv/metatag.metatag_defaults.node.yml rename to modules/helfi_base_content/config/rewrite/language/sv/metatag.metatag_defaults.node.yml diff --git a/modules/helfi_base_content/config/optional/language/sv/metatag.metatag_defaults.taxonomy_term.yml b/modules/helfi_base_content/config/rewrite/language/sv/metatag.metatag_defaults.taxonomy_term.yml similarity index 100% rename from modules/helfi_base_content/config/optional/language/sv/metatag.metatag_defaults.taxonomy_term.yml rename to modules/helfi_base_content/config/rewrite/language/sv/metatag.metatag_defaults.taxonomy_term.yml From 16913efd91f68849a23d2d227371397d6051f28f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 25 Mar 2024 15:46:57 +0200 Subject: [PATCH 03/10] UHF-9088: Added translations for views_blulk_edit module. --- translations/override/fi.po | 7 +++++++ translations/override/sv.po | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/translations/override/fi.po b/translations/override/fi.po index 53cc21491..57b5fedd7 100644 --- a/translations/override/fi.po +++ b/translations/override/fi.po @@ -158,3 +158,10 @@ msgstr "Päivämäärä jolloin sivu julkaistaan." msgid "The date the node will be unpublished." msgstr "Päivämäärä jolloin sivun julkaisu peruutetaan." + +# Views bulk edit +msgid "Edit content" +msgstr "Muokkaa sisältöä" + +msgid "Edit media" +msgstr "Muokkaa mediaa" diff --git a/translations/override/sv.po b/translations/override/sv.po index 116f43f39..224879d36 100644 --- a/translations/override/sv.po +++ b/translations/override/sv.po @@ -32,3 +32,10 @@ msgstr "Användare" # Content lock msgid "Unlock" msgstr "Avbryt och lås upp" + +# Views bulk edit +msgid "Edit content" +msgstr "Redigera innehåll" + +msgid "Edit media" +msgstr "Redigera media" From b147e88bfcfdead41d6b73abde62f6d546f60508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 25 Mar 2024 15:53:33 +0200 Subject: [PATCH 04/10] UHF-9088: Fixed translations for Global. --- .../rewrite/language/fi/metatag.metatag_defaults.global.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/helfi_base_content/config/rewrite/language/fi/metatag.metatag_defaults.global.yml b/modules/helfi_base_content/config/rewrite/language/fi/metatag.metatag_defaults.global.yml index 0fff6882e..9c0239e3a 100644 --- a/modules/helfi_base_content/config/rewrite/language/fi/metatag.metatag_defaults.global.yml +++ b/modules/helfi_base_content/config/rewrite/language/fi/metatag.metatag_defaults.global.yml @@ -1 +1 @@ -label: Globaali +label: Yleinen From 31d7c4cd1b82f5e867716ef5b038983fb42dd417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 25 Mar 2024 16:28:29 +0200 Subject: [PATCH 05/10] UHF-9088: Revoked translate interface permissions from editor and admin. --- modules/helfi_base_content/helfi_base_content.install | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/helfi_base_content/helfi_base_content.install b/modules/helfi_base_content/helfi_base_content.install index 90eb715e6..d8ad77203 100644 --- a/modules/helfi_base_content/helfi_base_content.install +++ b/modules/helfi_base_content/helfi_base_content.install @@ -38,8 +38,6 @@ function helfi_base_content_grant_permissions() : void { 'translate configuration', // @content_lock. 'break content lock', - // @locale. - 'translate interface', // @menu_link_attributes. 'use menu link attributes', // @menu_link_content. @@ -138,8 +136,6 @@ function helfi_base_content_grant_permissions() : void { 'create remote entities', 'delete remote entities', 'edit remote entities', - // @locale. - 'translate interface', // @menu_link_attributes. 'use menu link attributes', // @menu_link_content. From fe9aac1f53d8921f8563b6a57c3975fadc119aa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 25 Mar 2024 16:48:20 +0200 Subject: [PATCH 06/10] UHF-9088: Moved all of the rewritten translations to rewrite folders. --- .../{optional => rewrite}/language/fi/views.view.content.yml | 0 .../language/fi/eu_cookie_compliance.settings.yml | 0 .../language/sv/eu_cookie_compliance.settings.yml | 0 .../language/fi/views.view.media_library.yml | 0 .../language/sv/views.view.media_library.yml | 0 .../language/fi/views.view.tpr_errand_service_list.yml | 0 .../language/fi/views.view.tpr_service_channel_list.yml | 0 .../language/fi/views.view.tpr_service_list.yml | 0 .../language/fi/views.view.tpr_unit_list.yml | 0 .../language/sv/views.view.tpr_errand_service_list.yml | 0 .../language/sv/views.view.tpr_service_channel_list.yml | 0 .../language/sv/views.view.tpr_service_list.yml | 0 .../language/sv/views.view.tpr_unit_list.yml | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename modules/hdbt_admin_tools/config/{optional => rewrite}/language/fi/views.view.content.yml (100%) rename modules/helfi_eu_cookie_compliance/config/{optional => rewrite}/language/fi/eu_cookie_compliance.settings.yml (100%) rename modules/helfi_eu_cookie_compliance/config/{optional => rewrite}/language/sv/eu_cookie_compliance.settings.yml (100%) rename modules/helfi_media/config/{optional => rewrite}/language/fi/views.view.media_library.yml (100%) rename modules/helfi_media/config/{optional => rewrite}/language/sv/views.view.media_library.yml (100%) rename modules/helfi_tpr_config/config/{optional => rewrite}/language/fi/views.view.tpr_errand_service_list.yml (100%) rename modules/helfi_tpr_config/config/{optional => rewrite}/language/fi/views.view.tpr_service_channel_list.yml (100%) rename modules/helfi_tpr_config/config/{optional => rewrite}/language/fi/views.view.tpr_service_list.yml (100%) rename modules/helfi_tpr_config/config/{optional => rewrite}/language/fi/views.view.tpr_unit_list.yml (100%) rename modules/helfi_tpr_config/config/{optional => rewrite}/language/sv/views.view.tpr_errand_service_list.yml (100%) rename modules/helfi_tpr_config/config/{optional => rewrite}/language/sv/views.view.tpr_service_channel_list.yml (100%) rename modules/helfi_tpr_config/config/{optional => rewrite}/language/sv/views.view.tpr_service_list.yml (100%) rename modules/helfi_tpr_config/config/{optional => rewrite}/language/sv/views.view.tpr_unit_list.yml (100%) diff --git a/modules/hdbt_admin_tools/config/optional/language/fi/views.view.content.yml b/modules/hdbt_admin_tools/config/rewrite/language/fi/views.view.content.yml similarity index 100% rename from modules/hdbt_admin_tools/config/optional/language/fi/views.view.content.yml rename to modules/hdbt_admin_tools/config/rewrite/language/fi/views.view.content.yml diff --git a/modules/helfi_eu_cookie_compliance/config/optional/language/fi/eu_cookie_compliance.settings.yml b/modules/helfi_eu_cookie_compliance/config/rewrite/language/fi/eu_cookie_compliance.settings.yml similarity index 100% rename from modules/helfi_eu_cookie_compliance/config/optional/language/fi/eu_cookie_compliance.settings.yml rename to modules/helfi_eu_cookie_compliance/config/rewrite/language/fi/eu_cookie_compliance.settings.yml diff --git a/modules/helfi_eu_cookie_compliance/config/optional/language/sv/eu_cookie_compliance.settings.yml b/modules/helfi_eu_cookie_compliance/config/rewrite/language/sv/eu_cookie_compliance.settings.yml similarity index 100% rename from modules/helfi_eu_cookie_compliance/config/optional/language/sv/eu_cookie_compliance.settings.yml rename to modules/helfi_eu_cookie_compliance/config/rewrite/language/sv/eu_cookie_compliance.settings.yml diff --git a/modules/helfi_media/config/optional/language/fi/views.view.media_library.yml b/modules/helfi_media/config/rewrite/language/fi/views.view.media_library.yml similarity index 100% rename from modules/helfi_media/config/optional/language/fi/views.view.media_library.yml rename to modules/helfi_media/config/rewrite/language/fi/views.view.media_library.yml diff --git a/modules/helfi_media/config/optional/language/sv/views.view.media_library.yml b/modules/helfi_media/config/rewrite/language/sv/views.view.media_library.yml similarity index 100% rename from modules/helfi_media/config/optional/language/sv/views.view.media_library.yml rename to modules/helfi_media/config/rewrite/language/sv/views.view.media_library.yml diff --git a/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_errand_service_list.yml b/modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_errand_service_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_errand_service_list.yml rename to modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_errand_service_list.yml diff --git a/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_channel_list.yml b/modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_service_channel_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_channel_list.yml rename to modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_service_channel_list.yml diff --git a/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_list.yml b/modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_service_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_list.yml rename to modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_service_list.yml diff --git a/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_unit_list.yml b/modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_unit_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_unit_list.yml rename to modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_unit_list.yml diff --git a/modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_errand_service_list.yml b/modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_errand_service_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_errand_service_list.yml rename to modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_errand_service_list.yml diff --git a/modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_service_channel_list.yml b/modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_service_channel_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_service_channel_list.yml rename to modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_service_channel_list.yml diff --git a/modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_service_list.yml b/modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_service_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_service_list.yml rename to modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_service_list.yml diff --git a/modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_unit_list.yml b/modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_unit_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_unit_list.yml rename to modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_unit_list.yml From dae5d45e5e1633369b6199679883e8eea8508788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 25 Mar 2024 17:20:58 +0200 Subject: [PATCH 07/10] UHF-9088: Fixed more translations. --- .../fi/field.storage.paragraph.field_banner_link_design.yml | 4 ++-- .../fi/field.field.paragraph.image.field_image_caption.yml | 2 +- .../config/optional/language/fi/views.view.service_list.yml | 2 +- translations/override/fi.po | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/helfi_paragraphs_banner/config/optional/language/fi/field.storage.paragraph.field_banner_link_design.yml b/modules/helfi_paragraphs_banner/config/optional/language/fi/field.storage.paragraph.field_banner_link_design.yml index 599ecebd8..baffdc7a1 100644 --- a/modules/helfi_paragraphs_banner/config/optional/language/fi/field.storage.paragraph.field_banner_link_design.yml +++ b/modules/helfi_paragraphs_banner/config/optional/language/fi/field.storage.paragraph.field_banner_link_design.yml @@ -1,8 +1,8 @@ settings: allowed_values: - - label: Täysvärinen + label: Taustavärillinen - label: Reunustettu - - label: 'Ei reunuksia tai taustaväriä' + label: 'Korostettu linkki' diff --git a/modules/helfi_paragraphs_image/config/optional/language/fi/field.field.paragraph.image.field_image_caption.yml b/modules/helfi_paragraphs_image/config/optional/language/fi/field.field.paragraph.image.field_image_caption.yml index d6356d8ad..85cbb7acb 100644 --- a/modules/helfi_paragraphs_image/config/optional/language/fi/field.field.paragraph.image.field_image_caption.yml +++ b/modules/helfi_paragraphs_image/config/optional/language/fi/field.field.paragraph.image.field_image_caption.yml @@ -1,2 +1,2 @@ label: Kuvateksti -description: 'Voit halutessasi kirjoittaa kuvatekstin kuvalle tähän.' +description: 'Kirjoita aina kuvateksti. Kuvaajan nimi ja kuvan alt-teksti tulevat kuvan tiedoista, joten niitä ei kirjoiteta tähän.' diff --git a/modules/helfi_tpr_config/config/optional/language/fi/views.view.service_list.yml b/modules/helfi_tpr_config/config/optional/language/fi/views.view.service_list.yml index 6419f429e..1e305f09b 100644 --- a/modules/helfi_tpr_config/config/optional/language/fi/views.view.service_list.yml +++ b/modules/helfi_tpr_config/config/optional/language/fi/views.view.service_list.yml @@ -1,4 +1,4 @@ -label: Palvelulistaus +label: Palvelut display: default: display_title: Oletus diff --git a/translations/override/fi.po b/translations/override/fi.po index 57b5fedd7..813256834 100644 --- a/translations/override/fi.po +++ b/translations/override/fi.po @@ -164,4 +164,4 @@ msgid "Edit content" msgstr "Muokkaa sisältöä" msgid "Edit media" -msgstr "Muokkaa mediaa" +msgstr "Muokkaa tiedostoa" From 136df99e677a8b2fff15cb1cf62cba6392e55327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 25 Mar 2024 17:22:32 +0200 Subject: [PATCH 08/10] UHF-9088: Added EU cookie compliance module as a dependency for the test. --- .../tests/src/Functional/EuCookieComplianceTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/helfi_eu_cookie_compliance/tests/src/Functional/EuCookieComplianceTest.php b/modules/helfi_eu_cookie_compliance/tests/src/Functional/EuCookieComplianceTest.php index 52aab37e1..464de212f 100644 --- a/modules/helfi_eu_cookie_compliance/tests/src/Functional/EuCookieComplianceTest.php +++ b/modules/helfi_eu_cookie_compliance/tests/src/Functional/EuCookieComplianceTest.php @@ -19,6 +19,7 @@ class EuCookieComplianceTest extends BrowserTestBase { */ protected static $modules = [ 'block', + 'eu_cookie_compliance', 'helfi_api_base', 'helfi_user_roles', 'helfi_eu_cookie_compliance', From 55fa9fb500e2bef4f37e5ada740b8f8e13f410f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 25 Mar 2024 18:05:20 +0200 Subject: [PATCH 09/10] UHF-9088: Reverted cookie compliance translation transfer. --- .../language/fi/eu_cookie_compliance.settings.yml | 0 .../language/sv/eu_cookie_compliance.settings.yml | 0 .../tests/src/Functional/EuCookieComplianceTest.php | 1 - 3 files changed, 1 deletion(-) rename modules/helfi_eu_cookie_compliance/config/{rewrite => optional}/language/fi/eu_cookie_compliance.settings.yml (100%) rename modules/helfi_eu_cookie_compliance/config/{rewrite => optional}/language/sv/eu_cookie_compliance.settings.yml (100%) diff --git a/modules/helfi_eu_cookie_compliance/config/rewrite/language/fi/eu_cookie_compliance.settings.yml b/modules/helfi_eu_cookie_compliance/config/optional/language/fi/eu_cookie_compliance.settings.yml similarity index 100% rename from modules/helfi_eu_cookie_compliance/config/rewrite/language/fi/eu_cookie_compliance.settings.yml rename to modules/helfi_eu_cookie_compliance/config/optional/language/fi/eu_cookie_compliance.settings.yml diff --git a/modules/helfi_eu_cookie_compliance/config/rewrite/language/sv/eu_cookie_compliance.settings.yml b/modules/helfi_eu_cookie_compliance/config/optional/language/sv/eu_cookie_compliance.settings.yml similarity index 100% rename from modules/helfi_eu_cookie_compliance/config/rewrite/language/sv/eu_cookie_compliance.settings.yml rename to modules/helfi_eu_cookie_compliance/config/optional/language/sv/eu_cookie_compliance.settings.yml diff --git a/modules/helfi_eu_cookie_compliance/tests/src/Functional/EuCookieComplianceTest.php b/modules/helfi_eu_cookie_compliance/tests/src/Functional/EuCookieComplianceTest.php index 464de212f..52aab37e1 100644 --- a/modules/helfi_eu_cookie_compliance/tests/src/Functional/EuCookieComplianceTest.php +++ b/modules/helfi_eu_cookie_compliance/tests/src/Functional/EuCookieComplianceTest.php @@ -19,7 +19,6 @@ class EuCookieComplianceTest extends BrowserTestBase { */ protected static $modules = [ 'block', - 'eu_cookie_compliance', 'helfi_api_base', 'helfi_user_roles', 'helfi_eu_cookie_compliance', From b8baf578202e36f89e2533321bad98e2a49c75db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 25 Mar 2024 22:18:37 +0200 Subject: [PATCH 10/10] Revert "UHF-9088: Moved all of the rewritten translations to rewrite folders." This reverts commit fe9aac1f53d8921f8563b6a57c3975fadc119aa9. --- .../{rewrite => optional}/language/fi/views.view.content.yml | 0 .../language/fi/views.view.media_library.yml | 0 .../language/sv/views.view.media_library.yml | 0 .../language/fi/views.view.tpr_errand_service_list.yml | 0 .../language/fi/views.view.tpr_service_channel_list.yml | 0 .../language/fi/views.view.tpr_service_list.yml | 0 .../language/fi/views.view.tpr_unit_list.yml | 0 .../language/sv/views.view.tpr_errand_service_list.yml | 0 .../language/sv/views.view.tpr_service_channel_list.yml | 0 .../language/sv/views.view.tpr_service_list.yml | 0 .../language/sv/views.view.tpr_unit_list.yml | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename modules/hdbt_admin_tools/config/{rewrite => optional}/language/fi/views.view.content.yml (100%) rename modules/helfi_media/config/{rewrite => optional}/language/fi/views.view.media_library.yml (100%) rename modules/helfi_media/config/{rewrite => optional}/language/sv/views.view.media_library.yml (100%) rename modules/helfi_tpr_config/config/{rewrite => optional}/language/fi/views.view.tpr_errand_service_list.yml (100%) rename modules/helfi_tpr_config/config/{rewrite => optional}/language/fi/views.view.tpr_service_channel_list.yml (100%) rename modules/helfi_tpr_config/config/{rewrite => optional}/language/fi/views.view.tpr_service_list.yml (100%) rename modules/helfi_tpr_config/config/{rewrite => optional}/language/fi/views.view.tpr_unit_list.yml (100%) rename modules/helfi_tpr_config/config/{rewrite => optional}/language/sv/views.view.tpr_errand_service_list.yml (100%) rename modules/helfi_tpr_config/config/{rewrite => optional}/language/sv/views.view.tpr_service_channel_list.yml (100%) rename modules/helfi_tpr_config/config/{rewrite => optional}/language/sv/views.view.tpr_service_list.yml (100%) rename modules/helfi_tpr_config/config/{rewrite => optional}/language/sv/views.view.tpr_unit_list.yml (100%) diff --git a/modules/hdbt_admin_tools/config/rewrite/language/fi/views.view.content.yml b/modules/hdbt_admin_tools/config/optional/language/fi/views.view.content.yml similarity index 100% rename from modules/hdbt_admin_tools/config/rewrite/language/fi/views.view.content.yml rename to modules/hdbt_admin_tools/config/optional/language/fi/views.view.content.yml diff --git a/modules/helfi_media/config/rewrite/language/fi/views.view.media_library.yml b/modules/helfi_media/config/optional/language/fi/views.view.media_library.yml similarity index 100% rename from modules/helfi_media/config/rewrite/language/fi/views.view.media_library.yml rename to modules/helfi_media/config/optional/language/fi/views.view.media_library.yml diff --git a/modules/helfi_media/config/rewrite/language/sv/views.view.media_library.yml b/modules/helfi_media/config/optional/language/sv/views.view.media_library.yml similarity index 100% rename from modules/helfi_media/config/rewrite/language/sv/views.view.media_library.yml rename to modules/helfi_media/config/optional/language/sv/views.view.media_library.yml diff --git a/modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_errand_service_list.yml b/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_errand_service_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_errand_service_list.yml rename to modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_errand_service_list.yml diff --git a/modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_service_channel_list.yml b/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_channel_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_service_channel_list.yml rename to modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_channel_list.yml diff --git a/modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_service_list.yml b/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_service_list.yml rename to modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_list.yml diff --git a/modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_unit_list.yml b/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_unit_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/rewrite/language/fi/views.view.tpr_unit_list.yml rename to modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_unit_list.yml diff --git a/modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_errand_service_list.yml b/modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_errand_service_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_errand_service_list.yml rename to modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_errand_service_list.yml diff --git a/modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_service_channel_list.yml b/modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_service_channel_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_service_channel_list.yml rename to modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_service_channel_list.yml diff --git a/modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_service_list.yml b/modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_service_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_service_list.yml rename to modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_service_list.yml diff --git a/modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_unit_list.yml b/modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_unit_list.yml similarity index 100% rename from modules/helfi_tpr_config/config/rewrite/language/sv/views.view.tpr_unit_list.yml rename to modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_unit_list.yml