From 24669289529569840437cdb6b55b1412524797cc Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Thu, 15 Aug 2024 08:50:50 +0000 Subject: [PATCH] Update configuration --- composer.lock | 12 ++++----- conf/cmi/easy_breadcrumb.settings.yml | 2 +- conf/cmi/encrypt.profile.real_aes.yml | 2 +- ...ternal_entity_type.helfi_announcements.yml | 2 +- ...ies.external_entity_type.helfi_surveys.yml | 2 +- conf/cmi/language/fi/key.key.tfa.yml | 1 + conf/cmi/language/fi/tfa.settings.yml | 1 + ...ase_field_override.node.survey.promote.yml | 4 +++ ...base_field_override.node.survey.status.yml | 4 +++ .../ru/field.field.node.survey.body.yml | 1 + ...ld.field.node.survey.field_survey_link.yml | 1 + ...rvice_list.field_service_list_services.yml | 1 + ...rvice_list.field_service_list_services.yml | 1 + conf/cmi/language/sv/tfa.settings.yml | 26 +++++++++++++++++++ ...aragraphs.paragraphs_type.from_library.yml | 1 + 15 files changed, 51 insertions(+), 10 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/easy_breadcrumb.settings.yml b/conf/cmi/easy_breadcrumb.settings.yml index 658b5b65d..766949dd5 100644 --- a/conf/cmi/easy_breadcrumb.settings.yml +++ b/conf/cmi/easy_breadcrumb.settings.yml @@ -28,7 +28,7 @@ capitalizator_forced_words_first_letter: false follow_redirects: false limit_segment_display: false segment_display_limit: null +segment_display_minimum: 1 truncator_mode: false truncator_length: 100 truncator_dots: true -segment_display_minimum: 1 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..89839366f --- /dev/null +++ b/conf/cmi/language/fi/key.key.tfa.yml @@ -0,0 +1 @@ +label: 'Kaksivaiheinen tunnistautuminen (2FA)' diff --git a/conf/cmi/language/fi/tfa.settings.yml b/conf/cmi/language/fi/tfa.settings.yml new file mode 100644 index 000000000..f6098159b --- /dev/null +++ b/conf/cmi/language/fi/tfa.settings.yml @@ -0,0 +1 @@ +help_text: 'Ota yhteyttä tukeen palauttaaksesi tunnuksesi käyttöön' 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..f5d79f960 --- /dev/null +++ b/conf/cmi/language/ru/field.field.paragraph.service_list.field_service_list_services.yml @@ -0,0 +1 @@ +label: Службы 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..416410335 --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.service_list.field_service_list_services.yml @@ -0,0 +1 @@ +label: Tjänster diff --git a/conf/cmi/language/sv/tfa.settings.yml b/conf/cmi/language/sv/tfa.settings.yml new file mode 100644 index 000000000..9dcd25425 --- /dev/null +++ b/conf/cmi/language/sv/tfa.settings.yml @@ -0,0 +1,26 @@ +help_text: 'Kontakta supporten för att återställa din åtkomst' +mail: + tfa_enabled_configuration: + subject: 'Ditt [site:name]-konto har nu tvåfaktorsautentisering' + body: |- + [user:display-name], + + Tack för att du konfigurerade tvåfaktorsautentisering på ditt [site:name]konto! + + Denna extra nivå av säkerhet hjälper till att säkerställa att enbart du kan logga in på ditt konto. + + Om du någonsin förlorar den enhet som du konfigurerat detta med så bör du genast ta bort kopplingen till detta konto. + + -- + [site:name] teamet + tfa_disabled_configuration: + subject: 'Ditt [site:name] konto har inte längre tvåfaktorsautentisering' + body: |- + [user:display-name], + + Tvåfaktorsautentisering har stängts av på ditt [site:name] konto. + + Var vänlig och kontakta en administratör ifall det inte vara du som gjorde detta. + + -- + [site:name] teamet \ No newline at end of file diff --git a/conf/cmi/paragraphs.paragraphs_type.from_library.yml b/conf/cmi/paragraphs.paragraphs_type.from_library.yml index e07760203..6dfa53ce7 100644 --- a/conf/cmi/paragraphs.paragraphs_type.from_library.yml +++ b/conf/cmi/paragraphs.paragraphs_type.from_library.yml @@ -5,6 +5,7 @@ dependencies: enforced: module: - paragraphs_library + - paragraphs_library _core: default_config_hash: Y9Jo83gHDjuqnvJGzCmR9wVL-98BO8I1xlF0RlsbP0I id: from_library