From 2c8d4408c072f1c88faaf56225b3e72a8cdc1a9a Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 20 Aug 2024 08:06:38 +0000 Subject: [PATCH 1/2] Update configuration --- .platform/schema | 2 +- composer.lock | 212 +++++++++++++----- ...eld_override.node.announcement.promote.yml | 6 +- ...ield_override.node.announcement.status.yml | 4 +- ...eld_override.node.landing_page.promote.yml | 6 +- ...ield_override.node.landing_page.status.yml | 4 +- ..._field_override.node.news_item.promote.yml | 6 +- ...e_field_override.node.news_item.status.yml | 4 +- ....base_field_override.node.page.promote.yml | 6 +- ...e.base_field_override.node.page.status.yml | 4 +- ...ase_field_override.node.survey.promote.yml | 4 + ...base_field_override.node.survey.status.yml | 4 + .../ru/field.field.node.announcement.body.yml | 2 +- ...ouncement.field_announcement_all_pages.yml | 4 +- ...e.announcement.field_announcement_link.yml | 2 +- ...e.news_item.field_news_item_links_link.yml | 2 +- .../ru/field.field.node.survey.body.yml | 1 + ...ld.field.node.survey.field_survey_link.yml | 1 + ...eld.paragraph.banner.field_banner_link.yml | 2 +- ...d.field.paragraph.hero.field_hero_link.yml | 2 +- ...of_links_item.field_list_of_links_link.yml | 2 +- ...link_item.field_target_group_item_link.yml | 2 +- public/sites/default/settings.php | 1 + 23 files changed, 198 insertions(+), 85 deletions(-) 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 diff --git a/.platform/schema b/.platform/schema index c7930257..301160a9 100644 --- a/.platform/schema +++ b/.platform/schema @@ -1 +1 @@ -7 \ No newline at end of file +8 \ No newline at end of file diff --git a/composer.lock b/composer.lock index edb5e3a9..4734578c 100644 --- a/composer.lock +++ b/composer.lock @@ -4007,16 +4007,16 @@ }, { "name": "drupal/hdbt", - "version": "6.6.3", + "version": "6.6.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "260ed89837be3b1ae9a19248a0e21717b9597885" + "reference": "2d3d31c00aef4c89402cb4af9f8a234ae1c894aa" }, "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/2d3d31c00aef4c89402cb4af9f8a234ae1c894aa", + "reference": "2d3d31c00aef4c89402cb4af9f8a234ae1c894aa", "shasum": "" }, "require": { @@ -4034,10 +4034,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.6", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-08-14T08:40:02+00:00" + "time": "2024-08-20T08:03:47+00:00" }, { "name": "drupal/hdbt_admin", @@ -4173,22 +4173,25 @@ }, { "name": "drupal/helfi_azure_fs", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git", - "reference": "bfd7671b58300db948d8cd230b4756ecca73c237" + "reference": "25c7b80d6d1dc71176a576102665704b7e8fedeb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/bfd7671b58300db948d8cd230b4756ecca73c237", - "reference": "bfd7671b58300db948d8cd230b4756ecca73c237", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/25c7b80d6d1dc71176a576102665704b7e8fedeb", + "reference": "25c7b80d6d1dc71176a576102665704b7e8fedeb", "shasum": "" }, "require": { "drupal/flysystem": "^2.1@RC", "microsoft/azure-storage-blob": "^1.1" }, + "conflict": { + "drupal/core": "<10.3" + }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "drupal/coder": "^8.3" @@ -4206,10 +4209,10 @@ ], "description": "Helfi - Azure FS", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.2", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.3", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues" }, - "time": "2023-11-21T07:23:44+00:00" + "time": "2024-08-16T08:49:23+00:00" }, { "name": "drupal/helfi_drupal_tools", @@ -4217,12 +4220,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "eadca37ff757c3de0b1a309d37ddd2c6d4910740" + "reference": "5c46212ec813932eb9f8e94bbf2d14e1e92b2a39" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/eadca37ff757c3de0b1a309d37ddd2c6d4910740", - "reference": "eadca37ff757c3de0b1a309d37ddd2c6d4910740", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/5c46212ec813932eb9f8e94bbf2d14e1e92b2a39", + "reference": "5c46212ec813932eb9f8e94bbf2d14e1e92b2a39", "shasum": "" }, "require": { @@ -4294,20 +4297,20 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-08-12T09:17:00+00:00" + "time": "2024-08-16T09:24:27+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "4.4.8", + "version": "4.4.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "10ca013c3e13c112eb9827fd1b91ed52833b2712" + "reference": "97338d748ace88329505d3a79eb3e03d98ef648f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/10ca013c3e13c112eb9827fd1b91ed52833b2712", - "reference": "10ca013c3e13c112eb9827fd1b91ed52833b2712", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/97338d748ace88329505d3a79eb3e03d98ef648f", + "reference": "97338d748ace88329505d3a79eb3e03d98ef648f", "shasum": "" }, "require": { @@ -4362,6 +4365,7 @@ "drupal/simple_sitemap": "^4.0", "drupal/siteimprove": "^2.0", "drupal/social_media": "^2.0", + "drupal/stage_file_proxy": "^2", "drupal/stomp": "^2.0", "drupal/tfa": "^1.7", "drupal/token": "^1.9", @@ -4379,6 +4383,7 @@ "drupal/ctools": "<3.11 || ^4.0.1", "drupal/gin_toolbar": ">1.0.0-rc6", "drupal/helfi_media_map": "*", + "drupal/stage_file_proxy": "<2.1.5", "drush/drush": "<12" }, "type": "drupal-module", @@ -4422,10 +4427,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.8", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.10", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-08-12T09:33:04+00:00" + "time": "2024-08-16T08:50:18+00:00" }, { "name": "drupal/helfi_tpr", @@ -5050,26 +5055,26 @@ }, { "name": "drupal/menu_link_attributes", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/menu_link_attributes.git", - "reference": "8.x-1.3" + "reference": "8.x-1.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/menu_link_attributes-8.x-1.3.zip", - "reference": "8.x-1.3", - "shasum": "431c7954cc614a1b9677173f0209f1df15592503" + "url": "https://ftp.drupal.org/files/projects/menu_link_attributes-8.x-1.4.zip", + "reference": "8.x-1.4", + "shasum": "a679a5c53c94e3c992483ce3ea782950f4f7e5b3" }, "require": { - "drupal/core": "^8 || ^9 || ^10" + "drupal/core": "^8 || ^9 || ^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.3", - "datestamp": "1671026425", + "version": "8.x-1.4", + "datestamp": "1724060900", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5086,7 +5091,7 @@ "homepage": "https://www.drupal.org/user/291091" }, { - "name": "Grevil", + "name": "grevil", "homepage": "https://www.drupal.org/user/3668491" }, { @@ -5243,26 +5248,26 @@ }, { "name": "drupal/oembed_providers", - "version": "2.1.2", + "version": "2.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/oembed_providers.git", - "reference": "2.1.2" + "reference": "2.2.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/oembed_providers-2.1.2.zip", - "reference": "2.1.2", - "shasum": "ad125c7e55555499f001755c365f96edce1d6343" + "url": "https://ftp.drupal.org/files/projects/oembed_providers-2.2.0.zip", + "reference": "2.2.0", + "shasum": "318bafadd5e9b74a593f08e252dc5ea6dec98cd2" }, "require": { - "drupal/core": "^9.0|^10.0" + "drupal/core": "^10|^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.2", - "datestamp": "1692724351", + "version": "2.2.0", + "datestamp": "1723853165", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5581,17 +5586,17 @@ }, { "name": "drupal/raven", - "version": "5.0.16", + "version": "5.0.17", "source": { "type": "git", "url": "https://git.drupalcode.org/project/raven.git", - "reference": "5.0.16" + "reference": "5.0.17" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/raven-5.0.16.zip", - "reference": "5.0.16", - "shasum": "cd4d545b74ad7d22691dd06177a164bc12074201" + "url": "https://ftp.drupal.org/files/projects/raven-5.0.17.zip", + "reference": "5.0.17", + "shasum": "3be77024ab4edac4964ed5a4590f4e9eb5031346" }, "require": { "drupal/core": "^10.1 || ^11", @@ -5606,8 +5611,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "5.0.16", - "datestamp": "1723001088", + "version": "5.0.17", + "datestamp": "1723776489", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6122,27 +6127,27 @@ }, { "name": "drupal/simple_sitemap", - "version": "4.1.9", + "version": "4.2.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/simple_sitemap.git", - "reference": "4.1.9" + "reference": "4.2.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.1.9.zip", - "reference": "4.1.9", - "shasum": "d86d90408b334cd7470ea631e3be5acca2103377" + "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.2.1.zip", + "reference": "4.2.1", + "shasum": "d96b481571ca2fecdb305e87d2557f9338116864" }, "require": { - "drupal/core": "^9.3 || ^10", + "drupal/core": "^10.2 || ^11", "ext-xmlwriter": "*" }, "type": "drupal-module", "extra": { "drupal": { - "version": "4.1.9", - "datestamp": "1712441608", + "version": "4.2.1", + "datestamp": "1723802052", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6166,7 +6171,7 @@ "role": "Maintainer" }, { - "name": "WalkingDexter", + "name": "walkingdexter", "homepage": "https://www.drupal.org/user/3251330" } ], @@ -6442,6 +6447,103 @@ "source": "https://git.drupalcode.org/project/sophron" } }, + { + "name": "drupal/stage_file_proxy", + "version": "2.1.5", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/stage_file_proxy.git", + "reference": "2.1.5" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-2.1.5.zip", + "reference": "2.1.5", + "shasum": "6f5974c106d45211e54945e4d9f5bbf8ec6699de" + }, + "require": { + "drupal/core": "^9 || ^10", + "php": ">=8" + }, + "require-dev": { + "drupal/coder": "^8.3", + "drush/drush": "^11 || ^12" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.1.5", + "datestamp": "1719499510", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + }, + "drush": { + "services": { + "stage_file_proxy.drush.services.yml": "^11" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "scripts": { + "phpcs": [ + "vendor/bin/phpcs -p ." + ], + "phpcbf": [ + "vendor/bin/phpcbf -p ." + ], + "test": [ + "@phpcs" + ] + }, + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "BarisW", + "homepage": "https://www.drupal.org/user/107229" + }, + { + "name": "geek-merlin", + "homepage": "https://www.drupal.org/user/229048" + }, + { + "name": "greggles", + "homepage": "https://www.drupal.org/user/36762" + }, + { + "name": "markdorison", + "homepage": "https://www.drupal.org/user/346106" + }, + { + "name": "moshe weitzman", + "homepage": "https://www.drupal.org/user/23" + }, + { + "name": "msonnabaum", + "homepage": "https://www.drupal.org/user/75278" + }, + { + "name": "netaustin", + "homepage": "https://www.drupal.org/user/199298" + }, + { + "name": "robwilmshurst", + "homepage": "https://www.drupal.org/user/144488" + }, + { + "name": "smustgrave", + "homepage": "https://www.drupal.org/user/3252890" + } + ], + "description": "Provides stage_file_proxy module.", + "homepage": "https://www.drupal.org/project/stage_file_proxy", + "support": { + "source": "https://git.drupalcode.org/project/stage_file_proxy" + } + }, { "name": "drupal/stomp", "version": "2.0.0-alpha4", diff --git a/conf/cmi/language/ru/core.base_field_override.node.announcement.promote.yml b/conf/cmi/language/ru/core.base_field_override.node.announcement.promote.yml index 0f5519f3..300c1b15 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.announcement.promote.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.announcement.promote.yml @@ -1,4 +1,4 @@ -label: 'Помещено на главную страницу' +label: 'Promoted to front page' settings: - on_label: Вкл - off_label: Выкл + on_label: 'On' + off_label: 'Off' diff --git a/conf/cmi/language/ru/core.base_field_override.node.announcement.status.yml b/conf/cmi/language/ru/core.base_field_override.node.announcement.status.yml index 9135a013..b726f3de 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.announcement.status.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.announcement.status.yml @@ -1,4 +1,4 @@ label: Опубликовано settings: - on_label: Вкл - off_label: Выкл + on_label: 'On' + off_label: 'Off' diff --git a/conf/cmi/language/ru/core.base_field_override.node.landing_page.promote.yml b/conf/cmi/language/ru/core.base_field_override.node.landing_page.promote.yml index 0f5519f3..300c1b15 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.landing_page.promote.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.landing_page.promote.yml @@ -1,4 +1,4 @@ -label: 'Помещено на главную страницу' +label: 'Promoted to front page' settings: - on_label: Вкл - off_label: Выкл + on_label: 'On' + off_label: 'Off' diff --git a/conf/cmi/language/ru/core.base_field_override.node.landing_page.status.yml b/conf/cmi/language/ru/core.base_field_override.node.landing_page.status.yml index 9135a013..b726f3de 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.landing_page.status.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.landing_page.status.yml @@ -1,4 +1,4 @@ label: Опубликовано settings: - on_label: Вкл - off_label: Выкл + on_label: 'On' + off_label: 'Off' diff --git a/conf/cmi/language/ru/core.base_field_override.node.news_item.promote.yml b/conf/cmi/language/ru/core.base_field_override.node.news_item.promote.yml index 0f5519f3..300c1b15 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.news_item.promote.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.news_item.promote.yml @@ -1,4 +1,4 @@ -label: 'Помещено на главную страницу' +label: 'Promoted to front page' settings: - on_label: Вкл - off_label: Выкл + on_label: 'On' + off_label: 'Off' diff --git a/conf/cmi/language/ru/core.base_field_override.node.news_item.status.yml b/conf/cmi/language/ru/core.base_field_override.node.news_item.status.yml index 9135a013..b726f3de 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.news_item.status.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.news_item.status.yml @@ -1,4 +1,4 @@ label: Опубликовано settings: - on_label: Вкл - off_label: Выкл + on_label: 'On' + off_label: 'Off' diff --git a/conf/cmi/language/ru/core.base_field_override.node.page.promote.yml b/conf/cmi/language/ru/core.base_field_override.node.page.promote.yml index 0f5519f3..300c1b15 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.page.promote.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.page.promote.yml @@ -1,4 +1,4 @@ -label: 'Помещено на главную страницу' +label: 'Promoted to front page' settings: - on_label: Вкл - off_label: Выкл + on_label: 'On' + off_label: 'Off' diff --git a/conf/cmi/language/ru/core.base_field_override.node.page.status.yml b/conf/cmi/language/ru/core.base_field_override.node.page.status.yml index 9135a013..b726f3de 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.page.status.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.page.status.yml @@ -1,4 +1,4 @@ label: Опубликовано settings: - on_label: Вкл - off_label: Выкл + on_label: 'On' + off_label: 'Off' 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 00000000..300c1b15 --- /dev/null +++ b/conf/cmi/language/ru/core.base_field_override.node.survey.promote.yml @@ -0,0 +1,4 @@ +label: 'Promoted to front page' +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 00000000..b726f3de --- /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.announcement.body.yml b/conf/cmi/language/ru/field.field.node.announcement.body.yml index 760438f2..7e34baf6 100644 --- a/conf/cmi/language/ru/field.field.node.announcement.body.yml +++ b/conf/cmi/language/ru/field.field.node.announcement.body.yml @@ -1 +1 @@ -label: Содержимое +label: Body diff --git a/conf/cmi/language/ru/field.field.node.announcement.field_announcement_all_pages.yml b/conf/cmi/language/ru/field.field.node.announcement.field_announcement_all_pages.yml index 9802ae59..ac9b1428 100644 --- a/conf/cmi/language/ru/field.field.node.announcement.field_announcement_all_pages.yml +++ b/conf/cmi/language/ru/field.field.node.announcement.field_announcement_all_pages.yml @@ -1,3 +1,3 @@ settings: - on_label: Вкл - off_label: Выкл + on_label: 'On' + off_label: 'Off' diff --git a/conf/cmi/language/ru/field.field.node.announcement.field_announcement_link.yml b/conf/cmi/language/ru/field.field.node.announcement.field_announcement_link.yml index fe4ce1d5..aa4eeb3f 100644 --- a/conf/cmi/language/ru/field.field.node.announcement.field_announcement_link.yml +++ b/conf/cmi/language/ru/field.field.node.announcement.field_announcement_link.yml @@ -1 +1 @@ -label: Ссылка +label: Link diff --git a/conf/cmi/language/ru/field.field.node.news_item.field_news_item_links_link.yml b/conf/cmi/language/ru/field.field.node.news_item.field_news_item_links_link.yml index fe4ce1d5..aa4eeb3f 100644 --- a/conf/cmi/language/ru/field.field.node.news_item.field_news_item_links_link.yml +++ b/conf/cmi/language/ru/field.field.node.news_item.field_news_item_links_link.yml @@ -1 +1 @@ -label: Ссылка +label: Link 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 00000000..7e34baf6 --- /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 00000000..aa4eeb3f --- /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.banner.field_banner_link.yml b/conf/cmi/language/ru/field.field.paragraph.banner.field_banner_link.yml index fe4ce1d5..aa4eeb3f 100644 --- a/conf/cmi/language/ru/field.field.paragraph.banner.field_banner_link.yml +++ b/conf/cmi/language/ru/field.field.paragraph.banner.field_banner_link.yml @@ -1 +1 @@ -label: Ссылка +label: Link diff --git a/conf/cmi/language/ru/field.field.paragraph.hero.field_hero_link.yml b/conf/cmi/language/ru/field.field.paragraph.hero.field_hero_link.yml index fe4ce1d5..aa4eeb3f 100644 --- a/conf/cmi/language/ru/field.field.paragraph.hero.field_hero_link.yml +++ b/conf/cmi/language/ru/field.field.paragraph.hero.field_hero_link.yml @@ -1 +1 @@ -label: Ссылка +label: Link diff --git a/conf/cmi/language/ru/field.field.paragraph.list_of_links_item.field_list_of_links_link.yml b/conf/cmi/language/ru/field.field.paragraph.list_of_links_item.field_list_of_links_link.yml index fe4ce1d5..aa4eeb3f 100644 --- a/conf/cmi/language/ru/field.field.paragraph.list_of_links_item.field_list_of_links_link.yml +++ b/conf/cmi/language/ru/field.field.paragraph.list_of_links_item.field_list_of_links_link.yml @@ -1 +1 @@ -label: Ссылка +label: Link diff --git a/conf/cmi/language/ru/field.field.paragraph.target_group_link_item.field_target_group_item_link.yml b/conf/cmi/language/ru/field.field.paragraph.target_group_link_item.field_target_group_item_link.yml index fe4ce1d5..aa4eeb3f 100644 --- a/conf/cmi/language/ru/field.field.paragraph.target_group_link_item.field_target_group_item_link.yml +++ b/conf/cmi/language/ru/field.field.paragraph.target_group_link_item.field_target_group_item_link.yml @@ -1 +1 @@ -label: Ссылка +label: Link diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 9e6f7a6b..9813b60a 100644 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -350,6 +350,7 @@ function drupal_get_env(string|array $variables) : mixed { 'DRUPAL_DB_NAME', 'DRUPAL_DB_PASS', 'DRUPAL_DB_HOST', + 'TFA_ENCRYPTION_KEY', ], 'additionalFiles' => [], ]; From bbc321a56cfd825a041f00b5968d4f1e4df17f10 Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Wed, 21 Aug 2024 09:46:09 +0300 Subject: [PATCH 2/2] Revert translations --- .../core.base_field_override.node.announcement.promote.yml | 6 +++--- .../core.base_field_override.node.announcement.status.yml | 4 ++-- .../core.base_field_override.node.landing_page.promote.yml | 6 +++--- .../core.base_field_override.node.landing_page.status.yml | 4 ++-- .../ru/core.base_field_override.node.news_item.promote.yml | 6 +++--- .../ru/core.base_field_override.node.news_item.status.yml | 4 ++-- .../ru/core.base_field_override.node.page.promote.yml | 6 +++--- .../ru/core.base_field_override.node.page.status.yml | 4 ++-- conf/cmi/language/ru/field.field.node.announcement.body.yml | 2 +- ...field.node.announcement.field_announcement_all_pages.yml | 4 ++-- ...ield.field.node.announcement.field_announcement_link.yml | 2 +- ...ield.field.node.news_item.field_news_item_links_link.yml | 2 +- .../ru/field.field.paragraph.banner.field_banner_link.yml | 2 +- .../ru/field.field.paragraph.hero.field_hero_link.yml | 2 +- ...aragraph.list_of_links_item.field_list_of_links_link.yml | 2 +- ....target_group_link_item.field_target_group_item_link.yml | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/conf/cmi/language/ru/core.base_field_override.node.announcement.promote.yml b/conf/cmi/language/ru/core.base_field_override.node.announcement.promote.yml index 300c1b15..0f5519f3 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.announcement.promote.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.announcement.promote.yml @@ -1,4 +1,4 @@ -label: 'Promoted to front page' +label: 'Помещено на главную страницу' settings: - on_label: 'On' - off_label: 'Off' + on_label: Вкл + off_label: Выкл diff --git a/conf/cmi/language/ru/core.base_field_override.node.announcement.status.yml b/conf/cmi/language/ru/core.base_field_override.node.announcement.status.yml index b726f3de..9135a013 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.announcement.status.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.announcement.status.yml @@ -1,4 +1,4 @@ label: Опубликовано settings: - on_label: 'On' - off_label: 'Off' + on_label: Вкл + off_label: Выкл diff --git a/conf/cmi/language/ru/core.base_field_override.node.landing_page.promote.yml b/conf/cmi/language/ru/core.base_field_override.node.landing_page.promote.yml index 300c1b15..0f5519f3 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.landing_page.promote.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.landing_page.promote.yml @@ -1,4 +1,4 @@ -label: 'Promoted to front page' +label: 'Помещено на главную страницу' settings: - on_label: 'On' - off_label: 'Off' + on_label: Вкл + off_label: Выкл diff --git a/conf/cmi/language/ru/core.base_field_override.node.landing_page.status.yml b/conf/cmi/language/ru/core.base_field_override.node.landing_page.status.yml index b726f3de..9135a013 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.landing_page.status.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.landing_page.status.yml @@ -1,4 +1,4 @@ label: Опубликовано settings: - on_label: 'On' - off_label: 'Off' + on_label: Вкл + off_label: Выкл diff --git a/conf/cmi/language/ru/core.base_field_override.node.news_item.promote.yml b/conf/cmi/language/ru/core.base_field_override.node.news_item.promote.yml index 300c1b15..0f5519f3 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.news_item.promote.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.news_item.promote.yml @@ -1,4 +1,4 @@ -label: 'Promoted to front page' +label: 'Помещено на главную страницу' settings: - on_label: 'On' - off_label: 'Off' + on_label: Вкл + off_label: Выкл diff --git a/conf/cmi/language/ru/core.base_field_override.node.news_item.status.yml b/conf/cmi/language/ru/core.base_field_override.node.news_item.status.yml index b726f3de..9135a013 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.news_item.status.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.news_item.status.yml @@ -1,4 +1,4 @@ label: Опубликовано settings: - on_label: 'On' - off_label: 'Off' + on_label: Вкл + off_label: Выкл diff --git a/conf/cmi/language/ru/core.base_field_override.node.page.promote.yml b/conf/cmi/language/ru/core.base_field_override.node.page.promote.yml index 300c1b15..0f5519f3 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.page.promote.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.page.promote.yml @@ -1,4 +1,4 @@ -label: 'Promoted to front page' +label: 'Помещено на главную страницу' settings: - on_label: 'On' - off_label: 'Off' + on_label: Вкл + off_label: Выкл diff --git a/conf/cmi/language/ru/core.base_field_override.node.page.status.yml b/conf/cmi/language/ru/core.base_field_override.node.page.status.yml index b726f3de..9135a013 100644 --- a/conf/cmi/language/ru/core.base_field_override.node.page.status.yml +++ b/conf/cmi/language/ru/core.base_field_override.node.page.status.yml @@ -1,4 +1,4 @@ label: Опубликовано settings: - on_label: 'On' - off_label: 'Off' + on_label: Вкл + off_label: Выкл diff --git a/conf/cmi/language/ru/field.field.node.announcement.body.yml b/conf/cmi/language/ru/field.field.node.announcement.body.yml index 7e34baf6..760438f2 100644 --- a/conf/cmi/language/ru/field.field.node.announcement.body.yml +++ b/conf/cmi/language/ru/field.field.node.announcement.body.yml @@ -1 +1 @@ -label: Body +label: Содержимое diff --git a/conf/cmi/language/ru/field.field.node.announcement.field_announcement_all_pages.yml b/conf/cmi/language/ru/field.field.node.announcement.field_announcement_all_pages.yml index ac9b1428..9802ae59 100644 --- a/conf/cmi/language/ru/field.field.node.announcement.field_announcement_all_pages.yml +++ b/conf/cmi/language/ru/field.field.node.announcement.field_announcement_all_pages.yml @@ -1,3 +1,3 @@ settings: - on_label: 'On' - off_label: 'Off' + on_label: Вкл + off_label: Выкл diff --git a/conf/cmi/language/ru/field.field.node.announcement.field_announcement_link.yml b/conf/cmi/language/ru/field.field.node.announcement.field_announcement_link.yml index aa4eeb3f..fe4ce1d5 100644 --- a/conf/cmi/language/ru/field.field.node.announcement.field_announcement_link.yml +++ b/conf/cmi/language/ru/field.field.node.announcement.field_announcement_link.yml @@ -1 +1 @@ -label: Link +label: Ссылка diff --git a/conf/cmi/language/ru/field.field.node.news_item.field_news_item_links_link.yml b/conf/cmi/language/ru/field.field.node.news_item.field_news_item_links_link.yml index aa4eeb3f..fe4ce1d5 100644 --- a/conf/cmi/language/ru/field.field.node.news_item.field_news_item_links_link.yml +++ b/conf/cmi/language/ru/field.field.node.news_item.field_news_item_links_link.yml @@ -1 +1 @@ -label: Link +label: Ссылка diff --git a/conf/cmi/language/ru/field.field.paragraph.banner.field_banner_link.yml b/conf/cmi/language/ru/field.field.paragraph.banner.field_banner_link.yml index aa4eeb3f..fe4ce1d5 100644 --- a/conf/cmi/language/ru/field.field.paragraph.banner.field_banner_link.yml +++ b/conf/cmi/language/ru/field.field.paragraph.banner.field_banner_link.yml @@ -1 +1 @@ -label: Link +label: Ссылка diff --git a/conf/cmi/language/ru/field.field.paragraph.hero.field_hero_link.yml b/conf/cmi/language/ru/field.field.paragraph.hero.field_hero_link.yml index aa4eeb3f..fe4ce1d5 100644 --- a/conf/cmi/language/ru/field.field.paragraph.hero.field_hero_link.yml +++ b/conf/cmi/language/ru/field.field.paragraph.hero.field_hero_link.yml @@ -1 +1 @@ -label: Link +label: Ссылка diff --git a/conf/cmi/language/ru/field.field.paragraph.list_of_links_item.field_list_of_links_link.yml b/conf/cmi/language/ru/field.field.paragraph.list_of_links_item.field_list_of_links_link.yml index aa4eeb3f..fe4ce1d5 100644 --- a/conf/cmi/language/ru/field.field.paragraph.list_of_links_item.field_list_of_links_link.yml +++ b/conf/cmi/language/ru/field.field.paragraph.list_of_links_item.field_list_of_links_link.yml @@ -1 +1 @@ -label: Link +label: Ссылка diff --git a/conf/cmi/language/ru/field.field.paragraph.target_group_link_item.field_target_group_item_link.yml b/conf/cmi/language/ru/field.field.paragraph.target_group_link_item.field_target_group_item_link.yml index aa4eeb3f..fe4ce1d5 100644 --- a/conf/cmi/language/ru/field.field.paragraph.target_group_link_item.field_target_group_item_link.yml +++ b/conf/cmi/language/ru/field.field.paragraph.target_group_link_item.field_target_group_item_link.yml @@ -1 +1 @@ -label: Link +label: Ссылка