From 16e027800e9453bb5f93d4373afc24cea5ddebaa Mon Sep 17 00:00:00 2001 From: teroelonen <2276077+teroelonen@users.noreply.github.com> Date: Thu, 15 Aug 2024 09:08:20 +0000 Subject: [PATCH 1/2] Update configuration --- composer.lock | 12 ++++++------ conf/cmi/encrypt.profile.real_aes.yml | 2 +- ...ties.external_entity_type.helfi_announcements.yml | 2 +- ...l_entities.external_entity_type.helfi_surveys.yml | 2 +- conf/cmi/language/fi/key.key.tfa.yml | 1 + conf/cmi/language/fi/tfa.settings.yml | 6 ++++++ .../core.base_field_override.node.survey.promote.yml | 4 ++++ .../core.base_field_override.node.survey.status.yml | 4 ++++ .../cmi/language/ru/field.field.node.survey.body.yml | 1 + .../ru/field.field.node.survey.field_survey_link.yml | 1 + ...raph.service_list.field_service_list_services.yml | 1 + ...raph.service_list.field_service_list_services.yml | 1 + conf/cmi/language/sv/tfa.settings.yml | 8 ++++++++ 13 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 conf/cmi/language/fi/key.key.tfa.yml create mode 100644 conf/cmi/language/fi/tfa.settings.yml create mode 100644 conf/cmi/language/ru/core.base_field_override.node.survey.promote.yml create mode 100644 conf/cmi/language/ru/core.base_field_override.node.survey.status.yml create mode 100644 conf/cmi/language/ru/field.field.node.survey.body.yml create mode 100644 conf/cmi/language/ru/field.field.node.survey.field_survey_link.yml create mode 100644 conf/cmi/language/ru/field.field.paragraph.service_list.field_service_list_services.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.service_list.field_service_list_services.yml create mode 100644 conf/cmi/language/sv/tfa.settings.yml diff --git a/composer.lock b/composer.lock index cda019259..d63a07637 100644 --- a/composer.lock +++ b/composer.lock @@ -4117,16 +4117,16 @@ }, { "name": "drupal/hdbt", - "version": "6.6.3", + "version": "6.6.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "260ed89837be3b1ae9a19248a0e21717b9597885" + "reference": "d8e011aa97b4449d3c7eaca723fff9d2111c6db4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/260ed89837be3b1ae9a19248a0e21717b9597885", - "reference": "260ed89837be3b1ae9a19248a0e21717b9597885", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d8e011aa97b4449d3c7eaca723fff9d2111c6db4", + "reference": "d8e011aa97b4449d3c7eaca723fff9d2111c6db4", "shasum": "" }, "require": { @@ -4144,10 +4144,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.3", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.4", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-08-14T08:40:02+00:00" + "time": "2024-08-15T08:46:48+00:00" }, { "name": "drupal/hdbt_admin", diff --git a/conf/cmi/encrypt.profile.real_aes.yml b/conf/cmi/encrypt.profile.real_aes.yml index 94b4ba516..c9887b015 100644 --- a/conf/cmi/encrypt.profile.real_aes.yml +++ b/conf/cmi/encrypt.profile.real_aes.yml @@ -11,5 +11,5 @@ _core: id: real_aes label: 'Real AES' encryption_method: real_aes -encryption_key: tfa encryption_method_configuration: { } +encryption_key: tfa diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml index 8bd8bfb7c..c607771d0 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml @@ -8,8 +8,8 @@ id: helfi_announcements label: 'Helfi: Announcements' label_plural: 'Helfi: Announcements' description: '' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml b/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml index 2a9fc5698..8308d9f65 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml @@ -8,8 +8,8 @@ id: helfi_surveys label: 'Helfi: Survey' label_plural: 'Helfi: Surveys' description: '' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/language/fi/key.key.tfa.yml b/conf/cmi/language/fi/key.key.tfa.yml new file mode 100644 index 000000000..8875cd6bd --- /dev/null +++ b/conf/cmi/language/fi/key.key.tfa.yml @@ -0,0 +1 @@ +label: TFA diff --git a/conf/cmi/language/fi/tfa.settings.yml b/conf/cmi/language/fi/tfa.settings.yml new file mode 100644 index 000000000..01a1f48f9 --- /dev/null +++ b/conf/cmi/language/fi/tfa.settings.yml @@ -0,0 +1,6 @@ +help_text: 'Contact support to reset your access' +mail: + tfa_enabled_configuration: + body: "[user:display-name],\r\n\r\nThanks for configuring two-factor authentication on your [site:name] account!\r\n\r\nThis additional level of security will help to ensure that only you are able to log in to your account.\r\n\r\nIf you ever lose the device you configured, you should act quickly to delete its association with this account.\r\n\r\n--\r\n[site:name] team" + tfa_disabled_configuration: + body: "[user:display-name],\r\n\r\nTwo-factor authentication has been disabled on your [site:name] account.\r\n\r\nIf you did not take this action, please contact a site administrator immediately.\r\n\r\n--\r\n[site:name] team" diff --git a/conf/cmi/language/ru/core.base_field_override.node.survey.promote.yml b/conf/cmi/language/ru/core.base_field_override.node.survey.promote.yml new file mode 100644 index 000000000..2ca6a6cc3 --- /dev/null +++ b/conf/cmi/language/ru/core.base_field_override.node.survey.promote.yml @@ -0,0 +1,4 @@ +label: 'Помещено на главную страницу' +settings: + on_label: 'On' + off_label: 'Off' diff --git a/conf/cmi/language/ru/core.base_field_override.node.survey.status.yml b/conf/cmi/language/ru/core.base_field_override.node.survey.status.yml new file mode 100644 index 000000000..b726f3de0 --- /dev/null +++ b/conf/cmi/language/ru/core.base_field_override.node.survey.status.yml @@ -0,0 +1,4 @@ +label: Опубликовано +settings: + on_label: 'On' + off_label: 'Off' diff --git a/conf/cmi/language/ru/field.field.node.survey.body.yml b/conf/cmi/language/ru/field.field.node.survey.body.yml new file mode 100644 index 000000000..7e34baf6d --- /dev/null +++ b/conf/cmi/language/ru/field.field.node.survey.body.yml @@ -0,0 +1 @@ +label: Body diff --git a/conf/cmi/language/ru/field.field.node.survey.field_survey_link.yml b/conf/cmi/language/ru/field.field.node.survey.field_survey_link.yml new file mode 100644 index 000000000..aa4eeb3f7 --- /dev/null +++ b/conf/cmi/language/ru/field.field.node.survey.field_survey_link.yml @@ -0,0 +1 @@ +label: Link diff --git a/conf/cmi/language/ru/field.field.paragraph.service_list.field_service_list_services.yml b/conf/cmi/language/ru/field.field.paragraph.service_list.field_service_list_services.yml new file mode 100644 index 000000000..436c693ff --- /dev/null +++ b/conf/cmi/language/ru/field.field.paragraph.service_list.field_service_list_services.yml @@ -0,0 +1 @@ +label: Services diff --git a/conf/cmi/language/sv/field.field.paragraph.service_list.field_service_list_services.yml b/conf/cmi/language/sv/field.field.paragraph.service_list.field_service_list_services.yml new file mode 100644 index 000000000..436c693ff --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.service_list.field_service_list_services.yml @@ -0,0 +1 @@ +label: Services diff --git a/conf/cmi/language/sv/tfa.settings.yml b/conf/cmi/language/sv/tfa.settings.yml new file mode 100644 index 000000000..67899d557 --- /dev/null +++ b/conf/cmi/language/sv/tfa.settings.yml @@ -0,0 +1,8 @@ +help_text: 'Contact support to reset your access' +mail: + tfa_enabled_configuration: + subject: 'Your [site:name] account now has two-factor authentication' + body: "[user:display-name],\r\n\r\nThanks for configuring two-factor authentication on your [site:name] account!\r\n\r\nThis additional level of security will help to ensure that only you are able to log in to your account.\r\n\r\nIf you ever lose the device you configured, you should act quickly to delete its association with this account.\r\n\r\n--\r\n[site:name] team" + tfa_disabled_configuration: + subject: 'Your [site:name] account no longer has two-factor authentication' + body: "[user:display-name],\r\n\r\nTwo-factor authentication has been disabled on your [site:name] account.\r\n\r\nIf you did not take this action, please contact a site administrator immediately.\r\n\r\n--\r\n[site:name] team" From aa7adf05a1e03fe66b70c6a4f25651492f539b6d Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 15 Aug 2024 12:27:08 +0300 Subject: [PATCH 2/2] Remove translation configuration of the tfa module that wasn't doing any translating --- conf/cmi/language/fi/tfa.settings.yml | 6 ------ conf/cmi/language/sv/tfa.settings.yml | 8 -------- 2 files changed, 14 deletions(-) delete mode 100644 conf/cmi/language/fi/tfa.settings.yml delete mode 100644 conf/cmi/language/sv/tfa.settings.yml diff --git a/conf/cmi/language/fi/tfa.settings.yml b/conf/cmi/language/fi/tfa.settings.yml deleted file mode 100644 index 01a1f48f9..000000000 --- a/conf/cmi/language/fi/tfa.settings.yml +++ /dev/null @@ -1,6 +0,0 @@ -help_text: 'Contact support to reset your access' -mail: - tfa_enabled_configuration: - body: "[user:display-name],\r\n\r\nThanks for configuring two-factor authentication on your [site:name] account!\r\n\r\nThis additional level of security will help to ensure that only you are able to log in to your account.\r\n\r\nIf you ever lose the device you configured, you should act quickly to delete its association with this account.\r\n\r\n--\r\n[site:name] team" - tfa_disabled_configuration: - body: "[user:display-name],\r\n\r\nTwo-factor authentication has been disabled on your [site:name] account.\r\n\r\nIf you did not take this action, please contact a site administrator immediately.\r\n\r\n--\r\n[site:name] team" diff --git a/conf/cmi/language/sv/tfa.settings.yml b/conf/cmi/language/sv/tfa.settings.yml deleted file mode 100644 index 67899d557..000000000 --- a/conf/cmi/language/sv/tfa.settings.yml +++ /dev/null @@ -1,8 +0,0 @@ -help_text: 'Contact support to reset your access' -mail: - tfa_enabled_configuration: - subject: 'Your [site:name] account now has two-factor authentication' - body: "[user:display-name],\r\n\r\nThanks for configuring two-factor authentication on your [site:name] account!\r\n\r\nThis additional level of security will help to ensure that only you are able to log in to your account.\r\n\r\nIf you ever lose the device you configured, you should act quickly to delete its association with this account.\r\n\r\n--\r\n[site:name] team" - tfa_disabled_configuration: - subject: 'Your [site:name] account no longer has two-factor authentication' - body: "[user:display-name],\r\n\r\nTwo-factor authentication has been disabled on your [site:name] account.\r\n\r\nIf you did not take this action, please contact a site administrator immediately.\r\n\r\n--\r\n[site:name] team"