From e7766d6a30491ef0e5ede0dc9ed96e89ff9bbd25 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 17 Dec 2024 07:26:29 +0000 Subject: [PATCH 1/3] Update configuration --- compose.yaml | 2 + composer.lock | 108 +++++++++--------- conf/cmi/language/ar/views.view.archive.yml | 6 +- conf/cmi/language/ar/views.view.content.yml | 2 +- conf/cmi/language/ar/views.view.files.yml | 8 +- conf/cmi/language/ar/views.view.glossary.yml | 6 +- .../language/ar/views.view.helfi_redirect.yml | 3 + .../language/ar/views.view.locked_content.yml | 6 +- conf/cmi/language/ar/views.view.media.yml | 4 +- .../language/ar/views.view.media_library.yml | 6 +- .../ar/views.view.paragraphs_library.yml | 6 +- conf/cmi/language/ar/views.view.redirect.yml | 14 +-- .../language/ar/views.view.taxonomy_term.yml | 6 +- .../ar/views.view.user_admin_people.yml | 6 +- .../language/de/views.view.helfi_redirect.yml | 3 + conf/cmi/language/de/views.view.redirect.yml | 38 +++--- .../language/es/views.view.helfi_redirect.yml | 3 + .../language/et/views.view.helfi_redirect.yml | 3 + conf/cmi/language/et/views.view.redirect.yml | 14 +-- .../language/fa/views.view.helfi_redirect.yml | 2 + conf/cmi/language/fa/views.view.redirect.yml | 10 +- .../language/fr/views.view.helfi_redirect.yml | 3 + conf/cmi/language/fr/views.view.redirect.yml | 38 +++--- .../language/ru/views.view.helfi_redirect.yml | 3 + conf/cmi/language/ru/views.view.redirect.yml | 36 +++--- .../language/se/views.view.helfi_redirect.yml | 2 + .../language/uk/views.view.helfi_redirect.yml | 3 + conf/cmi/language/uk/views.view.redirect.yml | 34 +++--- .../zh-hans/views.view.helfi_redirect.yml | 3 + .../language/zh-hans/views.view.redirect.yml | 30 ++--- tools/make/project/git.mk | 2 +- 31 files changed, 222 insertions(+), 188 deletions(-) diff --git a/compose.yaml b/compose.yaml index 0e64d1db1..cdf6ca7db 100644 --- a/compose.yaml +++ b/compose.yaml @@ -87,6 +87,8 @@ services: - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-varnish.tls=true" - "traefik.http.services.${COMPOSE_PROJECT_NAME}-varnish.loadbalancer.server.port=6081" - "traefik.docker.network=stonehenge-network" + profiles: + - varnish elastic-proxy: container_name: "${COMPOSE_PROJECT_NAME}-elastic-proxy" image: nginxinc/nginx-unprivileged:alpine-perl diff --git a/composer.lock b/composer.lock index 13a641df2..17e4241df 100644 --- a/composer.lock +++ b/composer.lock @@ -686,16 +686,16 @@ }, { "name": "consolidation/annotated-command", - "version": "4.10.0", + "version": "4.10.1", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "1e830ba908c9ffb1ba7ca056203531b27188812c" + "reference": "362310b13ececa9f6f0a4a880811fa08fecc348b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/1e830ba908c9ffb1ba7ca056203531b27188812c", - "reference": "1e830ba908c9ffb1ba7ca056203531b27188812c", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/362310b13ececa9f6f0a4a880811fa08fecc348b", + "reference": "362310b13ececa9f6f0a4a880811fa08fecc348b", "shasum": "" }, "require": { @@ -736,9 +736,9 @@ "description": "Initialize Symfony Console commands from annotated command class methods.", "support": { "issues": "https://github.com/consolidation/annotated-command/issues", - "source": "https://github.com/consolidation/annotated-command/tree/4.10.0" + "source": "https://github.com/consolidation/annotated-command/tree/4.10.1" }, - "time": "2024-04-05T21:05:39+00:00" + "time": "2024-12-13T19:55:40+00:00" }, { "name": "consolidation/config", @@ -1086,16 +1086,16 @@ }, { "name": "consolidation/site-alias", - "version": "4.1.0", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/consolidation/site-alias.git", - "reference": "1056ceb93f6aafe6f7600d7bbe1b62b8488abccf" + "reference": "aff6189aae17da813d23249cb2fc0fff33f26d40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-alias/zipball/1056ceb93f6aafe6f7600d7bbe1b62b8488abccf", - "reference": "1056ceb93f6aafe6f7600d7bbe1b62b8488abccf", + "url": "https://api.github.com/repos/consolidation/site-alias/zipball/aff6189aae17da813d23249cb2fc0fff33f26d40", + "reference": "aff6189aae17da813d23249cb2fc0fff33f26d40", "shasum": "" }, "require": { @@ -1139,22 +1139,22 @@ "description": "Manage alias records for local and remote sites.", "support": { "issues": "https://github.com/consolidation/site-alias/issues", - "source": "https://github.com/consolidation/site-alias/tree/4.1.0" + "source": "https://github.com/consolidation/site-alias/tree/4.1.1" }, - "time": "2024-04-05T15:58:04+00:00" + "time": "2024-12-13T19:05:11+00:00" }, { "name": "consolidation/site-process", - "version": "5.4.0", + "version": "5.4.2", "source": { "type": "git", "url": "https://github.com/consolidation/site-process.git", - "reference": "7ab3ffe4195a89b8dc334ea22e7881abe79ffd9a" + "reference": "e7fafc40ebfddc1a5ee99ee66e5d186fc1bed4da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-process/zipball/7ab3ffe4195a89b8dc334ea22e7881abe79ffd9a", - "reference": "7ab3ffe4195a89b8dc334ea22e7881abe79ffd9a", + "url": "https://api.github.com/repos/consolidation/site-process/zipball/e7fafc40ebfddc1a5ee99ee66e5d186fc1bed4da", + "reference": "e7fafc40ebfddc1a5ee99ee66e5d186fc1bed4da", "shasum": "" }, "require": { @@ -1196,9 +1196,9 @@ "description": "A thin wrapper around the Symfony Process Component that allows applications to use the Site Alias library to specify the target for a remote call.", "support": { "issues": "https://github.com/consolidation/site-process/issues", - "source": "https://github.com/consolidation/site-process/tree/5.4.0" + "source": "https://github.com/consolidation/site-process/tree/5.4.2" }, - "time": "2024-04-06T00:00:28+00:00" + "time": "2024-12-13T19:25:56+00:00" }, { "name": "cweagans/composer-patches", @@ -4253,16 +4253,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.21", + "version": "6.8.23", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "cd8b74a7afc7ec488979a426809e5386383a3bef" + "reference": "b14bd481f81a0be27eaf3ab2a1db0c2a86c66511" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/cd8b74a7afc7ec488979a426809e5386383a3bef", - "reference": "cd8b74a7afc7ec488979a426809e5386383a3bef", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/b14bd481f81a0be27eaf3ab2a1db0c2a86c66511", + "reference": "b14bd481f81a0be27eaf3ab2a1db0c2a86c66511", "shasum": "" }, "require": { @@ -4281,10 +4281,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.21", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.23", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-12-13T08:38:26+00:00" + "time": "2024-12-17T07:20:53+00:00" }, { "name": "drupal/hdbt_admin", @@ -4480,12 +4480,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "845a8c470a6f593b08e100f3c3d688fb07600f76" + "reference": "c8f0aa0b247712eca0292073f6710746a511dd81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/845a8c470a6f593b08e100f3c3d688fb07600f76", - "reference": "845a8c470a6f593b08e100f3c3d688fb07600f76", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/c8f0aa0b247712eca0292073f6710746a511dd81", + "reference": "c8f0aa0b247712eca0292073f6710746a511dd81", "shasum": "" }, "require": { @@ -4560,7 +4560,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-12-12T12:14:31+00:00" + "time": "2024-12-13T11:44:35+00:00" }, { "name": "drupal/helfi_navigation", @@ -6557,7 +6557,11 @@ "homepage": "https://www.drupal.org/user/99012" }, { - "name": "Sheldon Rampton", + "name": "mably", + "homepage": "https://www.drupal.org/user/3375160" + }, + { + "name": "sheldon rampton", "homepage": "https://www.drupal.org/user/13085" }, { @@ -6700,17 +6704,17 @@ }, { "name": "drupal/raven", - "version": "6.0.12", + "version": "6.0.13", "source": { "type": "git", "url": "https://git.drupalcode.org/project/raven.git", - "reference": "6.0.12" + "reference": "6.0.13" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/raven-6.0.12.zip", - "reference": "6.0.12", - "shasum": "5ba241ff4109be407cb9660a8743aad5a24b9fba" + "url": "https://ftp.drupal.org/files/projects/raven-6.0.13.zip", + "reference": "6.0.13", + "shasum": "7b92e693dae63859457ba734c57382511b91af86" }, "require": { "drupal/core": "^10.2 || ^11", @@ -6724,8 +6728,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.12", - "datestamp": "1733335477", + "version": "6.0.13", + "datestamp": "1734389510", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7567,10 +7571,6 @@ "GPL-2.0+" ], "authors": [ - { - "name": "bartvig", - "homepage": "https://www.drupal.org/user/3107079" - }, { "name": "beltofte", "homepage": "https://www.drupal.org/user/151799" @@ -7587,6 +7587,10 @@ "name": "kreynen", "homepage": "https://www.drupal.org/user/48877" }, + { + "name": "mortenthorpe", + "homepage": "https://www.drupal.org/user/870762" + }, { "name": "rofejo", "homepage": "https://www.drupal.org/user/3284851" @@ -9126,16 +9130,16 @@ }, { "name": "fileeye/mimemap", - "version": "2.2.0", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/FileEye/MimeMap.git", - "reference": "c8c686cc6f77316b23128a83334877debf645dfb" + "reference": "f37ea54dab6f286dd37d937c069b80b601003df0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/c8c686cc6f77316b23128a83334877debf645dfb", - "reference": "c8c686cc6f77316b23128a83334877debf645dfb", + "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/f37ea54dab6f286dd37d937c069b80b601003df0", + "reference": "f37ea54dab6f286dd37d937c069b80b601003df0", "shasum": "" }, "require": { @@ -9178,9 +9182,9 @@ ], "support": { "issues": "https://github.com/FileEye/MimeMap/issues", - "source": "https://github.com/FileEye/MimeMap/tree/2.2.0" + "source": "https://github.com/FileEye/MimeMap/tree/2.2.1" }, - "time": "2024-10-20T18:59:36+00:00" + "time": "2024-12-16T19:03:35+00:00" }, { "name": "fileeye/pel", @@ -12482,16 +12486,16 @@ }, { "name": "stomp-php/stomp-php", - "version": "5.1.0", + "version": "5.1.1", "source": { "type": "git", "url": "https://github.com/stomp-php/stomp-php.git", - "reference": "cf1fbd79cf48b9701909e42205f1d968cec6ff7a" + "reference": "942d93563eefc9dee40e836e594ee16dd08653f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stomp-php/stomp-php/zipball/cf1fbd79cf48b9701909e42205f1d968cec6ff7a", - "reference": "cf1fbd79cf48b9701909e42205f1d968cec6ff7a", + "url": "https://api.github.com/repos/stomp-php/stomp-php/zipball/942d93563eefc9dee40e836e594ee16dd08653f0", + "reference": "942d93563eefc9dee40e836e594ee16dd08653f0", "shasum": "" }, "require": { @@ -12539,7 +12543,7 @@ ], "support": { "issues": "https://github.com/stomp-php/stomp-php/issues", - "source": "https://github.com/stomp-php/stomp-php/tree/5.1.0" + "source": "https://github.com/stomp-php/stomp-php/tree/5.1.1" }, "funding": [ { @@ -12551,7 +12555,7 @@ "type": "github" } ], - "time": "2023-06-19T17:34:28+00:00" + "time": "2024-12-13T08:48:49+00:00" }, { "name": "symfony/console", diff --git a/conf/cmi/language/ar/views.view.archive.yml b/conf/cmi/language/ar/views.view.archive.yml index ec36a5421..fb626ef3c 100644 --- a/conf/cmi/language/ar/views.view.archive.yml +++ b/conf/cmi/language/ar/views.view.archive.yml @@ -6,8 +6,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset exposed_form: options: submit_button: تطبيق @@ -18,4 +18,4 @@ display: block_1: display_title: الصندوق page_1: - display_title: الصفحة + display_title: Page diff --git a/conf/cmi/language/ar/views.view.content.yml b/conf/cmi/language/ar/views.view.content.yml index ff0c7b220..e4d1c10c7 100644 --- a/conf/cmi/language/ar/views.view.content.yml +++ b/conf/cmi/language/ar/views.view.content.yml @@ -58,7 +58,7 @@ display: expose: label: اللغة page_1: - display_title: الصفحة + display_title: Page display_options: menu: title: المحتوى diff --git a/conf/cmi/language/ar/views.view.files.yml b/conf/cmi/language/ar/views.view.files.yml index d68686b5f..9ca4a548f 100644 --- a/conf/cmi/language/ar/views.view.files.yml +++ b/conf/cmi/language/ar/views.view.files.yml @@ -22,8 +22,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset exposed_form: options: submit_button: انتقاء @@ -60,8 +60,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset arguments: fid: exception: diff --git a/conf/cmi/language/ar/views.view.glossary.yml b/conf/cmi/language/ar/views.view.glossary.yml index fb47d49d1..b4aba719a 100644 --- a/conf/cmi/language/ar/views.view.glossary.yml +++ b/conf/cmi/language/ar/views.view.glossary.yml @@ -13,8 +13,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset exposed_form: options: submit_button: تطبيق @@ -25,7 +25,7 @@ display: attachment_1: display_title: المرفق page_1: - display_title: الصفحة + display_title: Page display_options: menu: title: القاموس diff --git a/conf/cmi/language/ar/views.view.helfi_redirect.yml b/conf/cmi/language/ar/views.view.helfi_redirect.yml index 0702d8f50..a94fc0f64 100644 --- a/conf/cmi/language/ar/views.view.helfi_redirect.yml +++ b/conf/cmi/language/ar/views.view.helfi_redirect.yml @@ -11,6 +11,9 @@ display: separator: ', ' created: label: Created + status: + label: منشور + separator: ', ' pager: options: tags: diff --git a/conf/cmi/language/ar/views.view.locked_content.yml b/conf/cmi/language/ar/views.view.locked_content.yml index 0973d427d..3e482b4d5 100644 --- a/conf/cmi/language/ar/views.view.locked_content.yml +++ b/conf/cmi/language/ar/views.view.locked_content.yml @@ -12,8 +12,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset fields: node_bulk_form: action_title: إجراء @@ -40,4 +40,4 @@ display: expose: label: العنوان page_1: - display_title: الصفحة + display_title: Page diff --git a/conf/cmi/language/ar/views.view.media.yml b/conf/cmi/language/ar/views.view.media.yml index 45497ee56..48833b3f3 100644 --- a/conf/cmi/language/ar/views.view.media.yml +++ b/conf/cmi/language/ar/views.view.media.yml @@ -35,8 +35,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset exposed_form: options: submit_button: انتقاء diff --git a/conf/cmi/language/ar/views.view.media_library.yml b/conf/cmi/language/ar/views.view.media_library.yml index 38247755c..2d87d59e3 100644 --- a/conf/cmi/language/ar/views.view.media_library.yml +++ b/conf/cmi/language/ar/views.view.media_library.yml @@ -9,8 +9,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset exposed_form: options: submit_button: 'عمل تصفية' @@ -32,7 +32,7 @@ display: expose: label: اللغة page: - display_title: الصفحة + display_title: Page display_options: fields: media_bulk_form: diff --git a/conf/cmi/language/ar/views.view.paragraphs_library.yml b/conf/cmi/language/ar/views.view.paragraphs_library.yml index 15b1b590c..15849d676 100644 --- a/conf/cmi/language/ar/views.view.paragraphs_library.yml +++ b/conf/cmi/language/ar/views.view.paragraphs_library.yml @@ -12,8 +12,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset fields: label: label: التسمية @@ -44,4 +44,4 @@ display: expose: label: النوع page_1: - display_title: الصفحة + display_title: Page diff --git a/conf/cmi/language/ar/views.view.redirect.yml b/conf/cmi/language/ar/views.view.redirect.yml index 3748b6cb7..c82acce59 100644 --- a/conf/cmi/language/ar/views.view.redirect.yml +++ b/conf/cmi/language/ar/views.view.redirect.yml @@ -17,20 +17,20 @@ display: first: '« الأولى' last: 'الأخيرة »' expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset fields: redirect_source__path: - label: من + label: From separator: ', ' created: - label: الإنشاء + label: Created filters: redirect_source__path: expose: - label: من + label: From redirect_redirect__uri: expose: - label: إلى + label: To page_1: - display_title: الصفحة + display_title: Page diff --git a/conf/cmi/language/ar/views.view.taxonomy_term.yml b/conf/cmi/language/ar/views.view.taxonomy_term.yml index 6c4bce3e5..08c773f1d 100644 --- a/conf/cmi/language/ar/views.view.taxonomy_term.yml +++ b/conf/cmi/language/ar/views.view.taxonomy_term.yml @@ -6,8 +6,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset exposed_form: options: submit_button: تطبيق @@ -22,4 +22,4 @@ display: feed_1: display_title: التلقيمة page_1: - display_title: الصفحة + display_title: Page diff --git a/conf/cmi/language/ar/views.view.user_admin_people.yml b/conf/cmi/language/ar/views.view.user_admin_people.yml index e3e7f7daa..7d2bf5346 100644 --- a/conf/cmi/language/ar/views.view.user_admin_people.yml +++ b/conf/cmi/language/ar/views.view.user_admin_people.yml @@ -29,8 +29,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- الكل -' - offset_label: الإزاحة + items_per_page_options_all_label: '- All -' + offset_label: Offset exposed_form: options: submit_button: انتقاء @@ -58,7 +58,7 @@ display: label: الصلاحية use_more_text: المزيد page_1: - display_title: الصفحة + display_title: Page display_options: menu: title: لائحة diff --git a/conf/cmi/language/de/views.view.helfi_redirect.yml b/conf/cmi/language/de/views.view.helfi_redirect.yml index 6c858a4fc..78f7d286d 100644 --- a/conf/cmi/language/de/views.view.helfi_redirect.yml +++ b/conf/cmi/language/de/views.view.helfi_redirect.yml @@ -16,6 +16,9 @@ display: separator: ', ' created: label: Created + status: + label: Veröffentlicht + separator: ', ' pager: options: tags: diff --git a/conf/cmi/language/de/views.view.redirect.yml b/conf/cmi/language/de/views.view.redirect.yml index a0d83ab43..823bebf5f 100644 --- a/conf/cmi/language/de/views.view.redirect.yml +++ b/conf/cmi/language/de/views.view.redirect.yml @@ -1,5 +1,5 @@ -label: Umleiten -description: 'Liste der Umleitungen' +label: Redirect +description: 'List of redirects' display: default: display_title: Master @@ -24,45 +24,45 @@ display: offset_label: Versatz fields: redirect_bulk_form: - action_title: 'Mit Auswahl' + action_title: 'With selection' redirect_source__path: - label: Von + label: From separator: ', ' created: - label: Erstellt + label: Created filters: redirect_source__path: expose: - label: Von + label: From redirect_redirect__uri: expose: - label: An + label: To status_code: expose: - label: Statuscode + label: 'Status code' group_info: - label: Statuscode + label: 'Status code' group_items: 1: - title: '300 Mehrere Auswahlmöglichkeiten' + title: '300 Multiple Choices' 2: - title: '301 Dauerhaft verschoben' + title: '301 Moved Permanently' 3: - title: '302 Gefunden' + title: '302 Found' 4: - title: '303 Siehe andere' + title: '303 See Other' 5: - title: '304 Nicht modifiziert' + title: '304 Not Modified' 6: - title: '305 Proxy verwenden' + title: '305 Use Proxy' 7: - title: '307 Temporäre Weiterleitung' + title: '307 Temporary Redirect' language: expose: - label: Originalsprache - title: Umleiten + label: 'Original language' + title: Redirect empty: area_text_custom: - content: 'Es wurde noch keine Umleitung eingerichtet.' + content: 'There is no redirect yet.' page_1: display_title: Seite diff --git a/conf/cmi/language/es/views.view.helfi_redirect.yml b/conf/cmi/language/es/views.view.helfi_redirect.yml index 06fae2b6f..3703eb7b4 100644 --- a/conf/cmi/language/es/views.view.helfi_redirect.yml +++ b/conf/cmi/language/es/views.view.helfi_redirect.yml @@ -16,6 +16,9 @@ display: separator: ', ' created: label: Creado + status: + label: Publicado + separator: ', ' pager: options: tags: diff --git a/conf/cmi/language/et/views.view.helfi_redirect.yml b/conf/cmi/language/et/views.view.helfi_redirect.yml index 2817307c3..6109a9a20 100644 --- a/conf/cmi/language/et/views.view.helfi_redirect.yml +++ b/conf/cmi/language/et/views.view.helfi_redirect.yml @@ -13,6 +13,9 @@ display: separator: ', ' created: label: Created + status: + label: Avaldatud + separator: ', ' pager: options: tags: diff --git a/conf/cmi/language/et/views.view.redirect.yml b/conf/cmi/language/et/views.view.redirect.yml index c3421f764..837e319ae 100644 --- a/conf/cmi/language/et/views.view.redirect.yml +++ b/conf/cmi/language/et/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: 'Suunatakse ümber' +label: Redirect display: default: display_title: Peamine @@ -23,20 +23,20 @@ display: offset_label: Nihe fields: redirect_source__path: - label: Kellelt + label: From separator: ', ' created: - label: Loodud + label: Created filters: redirect_source__path: expose: - label: Kellelt + label: From redirect_redirect__uri: expose: - label: Kellele + label: To language: expose: - label: 'Algne keel' - title: 'Suunatakse ümber' + label: 'Original language' + title: Redirect page_1: display_title: Lehekülg diff --git a/conf/cmi/language/fa/views.view.helfi_redirect.yml b/conf/cmi/language/fa/views.view.helfi_redirect.yml index 860ef7af1..b7fbc8baf 100644 --- a/conf/cmi/language/fa/views.view.helfi_redirect.yml +++ b/conf/cmi/language/fa/views.view.helfi_redirect.yml @@ -11,6 +11,8 @@ display: label: Custom created: label: Created + status: + label: 'منتشر شده' pager: options: tags: diff --git a/conf/cmi/language/fa/views.view.redirect.yml b/conf/cmi/language/fa/views.view.redirect.yml index d00c93bd4..d1b77f0e3 100644 --- a/conf/cmi/language/fa/views.view.redirect.yml +++ b/conf/cmi/language/fa/views.view.redirect.yml @@ -22,17 +22,17 @@ display: offset_label: جابجایی fields: redirect_bulk_form: - action_title: 'با انتخاب شده‌ها' + action_title: 'With selection' redirect_source__path: - label: از + label: From created: - label: 'ایجاد گردید' + label: Created filters: redirect_source__path: expose: - label: از + label: From redirect_redirect__uri: expose: - label: به + label: To page_1: display_title: صفحه diff --git a/conf/cmi/language/fr/views.view.helfi_redirect.yml b/conf/cmi/language/fr/views.view.helfi_redirect.yml index a8f129089..5a0fe7da0 100644 --- a/conf/cmi/language/fr/views.view.helfi_redirect.yml +++ b/conf/cmi/language/fr/views.view.helfi_redirect.yml @@ -16,6 +16,9 @@ display: separator: ', ' created: label: Created + status: + label: Publié + separator: ', ' pager: options: tags: diff --git a/conf/cmi/language/fr/views.view.redirect.yml b/conf/cmi/language/fr/views.view.redirect.yml index 88bee5068..f8b9d570c 100644 --- a/conf/cmi/language/fr/views.view.redirect.yml +++ b/conf/cmi/language/fr/views.view.redirect.yml @@ -1,5 +1,5 @@ -label: Rediriger -description: 'Liste des redirections' +label: Redirect +description: 'List of redirects' display: default: display_title: Maître @@ -24,45 +24,45 @@ display: offset_label: Décalage fields: redirect_bulk_form: - action_title: 'Pour la sélection' + action_title: 'With selection' redirect_source__path: - label: 'A partir de' + label: From separator: ', ' created: - label: Créé + label: Created filters: redirect_source__path: expose: - label: 'A partir de' + label: From redirect_redirect__uri: expose: - label: À + label: To status_code: expose: - label: 'Code du statut' + label: 'Status code' group_info: - label: 'Code du statut' + label: 'Status code' group_items: 1: - title: '300 Choix Multiples' + title: '300 Multiple Choices' 2: - title: '301 Redirection Permanente' + title: '301 Moved Permanently' 3: - title: '302 Trouvé' + title: '302 Found' 4: - title: '303 Voir Ailleurs' + title: '303 See Other' 5: - title: '304 Non Modifié' + title: '304 Not Modified' 6: - title: '305 Utilise un Proxy' + title: '305 Use Proxy' 7: - title: '307 Redirection Temporaire' + title: '307 Temporary Redirect' language: expose: - label: 'Langue initiale' - title: Rediriger + label: 'Original language' + title: Redirect empty: area_text_custom: - content: "Il n'y a pas encore de redirection." + content: 'There is no redirect yet.' page_1: display_title: Page diff --git a/conf/cmi/language/ru/views.view.helfi_redirect.yml b/conf/cmi/language/ru/views.view.helfi_redirect.yml index f25e09ae5..33d694a09 100644 --- a/conf/cmi/language/ru/views.view.helfi_redirect.yml +++ b/conf/cmi/language/ru/views.view.helfi_redirect.yml @@ -15,6 +15,9 @@ display: separator: ', ' created: label: Created + status: + label: Опубликовано + separator: ', ' pager: options: tags: diff --git a/conf/cmi/language/ru/views.view.redirect.yml b/conf/cmi/language/ru/views.view.redirect.yml index c4a7feb9f..3b43012c2 100644 --- a/conf/cmi/language/ru/views.view.redirect.yml +++ b/conf/cmi/language/ru/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: Переадресация +label: Redirect display: default: display_title: Основной @@ -23,45 +23,45 @@ display: offset_label: Пропустить fields: redirect_bulk_form: - action_title: 'С выделенным' + action_title: 'With selection' redirect_source__path: - label: От + label: From separator: ', ' created: - label: Создано + label: Created filters: redirect_source__path: expose: - label: От + label: From redirect_redirect__uri: expose: - label: Кому + label: To status_code: expose: - label: 'Код состояния' + label: 'Status code' group_info: - label: 'Код состояния' + label: 'Status code' group_items: 1: - title: '300 Множество Выборов' + title: '300 Multiple Choices' 2: - title: '301 Перемещёно Окончательно' + title: '301 Moved Permanently' 3: - title: '302 Найдено' + title: '302 Found' 4: - title: '303 Смотреть Другое' + title: '303 See Other' 5: - title: '304 Не Изменялось' + title: '304 Not Modified' 6: - title: '305 Использовать Прокси' + title: '305 Use Proxy' 7: - title: '307 - Временно перемещено' + title: '307 Temporary Redirect' language: expose: - label: 'Язык оригинала' - title: Переадресация + label: 'Original language' + title: Redirect empty: area_text_custom: - content: 'Перенаправлений пока нет.' + content: 'There is no redirect yet.' page_1: display_title: Страница diff --git a/conf/cmi/language/se/views.view.helfi_redirect.yml b/conf/cmi/language/se/views.view.helfi_redirect.yml index 2af15b1c2..5acdf4855 100644 --- a/conf/cmi/language/se/views.view.helfi_redirect.yml +++ b/conf/cmi/language/se/views.view.helfi_redirect.yml @@ -5,6 +5,8 @@ display: fields: created: label: Almmuhuvvon + status: + label: Almmuhuvvon pager: options: tags: diff --git a/conf/cmi/language/uk/views.view.helfi_redirect.yml b/conf/cmi/language/uk/views.view.helfi_redirect.yml index 4c807d5fc..f10d7dc81 100644 --- a/conf/cmi/language/uk/views.view.helfi_redirect.yml +++ b/conf/cmi/language/uk/views.view.helfi_redirect.yml @@ -15,6 +15,9 @@ display: separator: ', ' created: label: Created + status: + label: Опубліковано + separator: ', ' pager: options: tags: diff --git a/conf/cmi/language/uk/views.view.redirect.yml b/conf/cmi/language/uk/views.view.redirect.yml index 3cfe80171..d4ff8153f 100644 --- a/conf/cmi/language/uk/views.view.redirect.yml +++ b/conf/cmi/language/uk/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: Переспрямувати +label: Redirect display: default: display_title: Головне @@ -23,42 +23,42 @@ display: offset_label: Зміщення fields: redirect_bulk_form: - action_title: 'З вибраним' + action_title: 'With selection' redirect_source__path: - label: Від + label: From separator: ', ' created: - label: Створено + label: Created filters: redirect_source__path: expose: - label: Від + label: From redirect_redirect__uri: expose: - label: До + label: To status_code: expose: - label: 'Код стану' + label: 'Status code' group_info: - label: 'Код стану' + label: 'Status code' group_items: 1: - title: '300 Безліч Виборів' + title: '300 Multiple Choices' 2: - title: '301 Переміщене Остаточно' + title: '301 Moved Permanently' 3: - title: '302 Знайдене' + title: '302 Found' 4: - title: '303 Дивитися Інше' + title: '303 See Other' 5: - title: '304 Не Змінювалося' + title: '304 Not Modified' 6: - title: '305 Використовувати Проксі' + title: '305 Use Proxy' 7: - title: '307 - Тимчасово переміщене' + title: '307 Temporary Redirect' language: expose: - label: 'Мова оригіналу' - title: Переспрямувати + label: 'Original language' + title: Redirect page_1: display_title: Сторінка diff --git a/conf/cmi/language/zh-hans/views.view.helfi_redirect.yml b/conf/cmi/language/zh-hans/views.view.helfi_redirect.yml index bdcf0b0ac..7eeb831b9 100644 --- a/conf/cmi/language/zh-hans/views.view.helfi_redirect.yml +++ b/conf/cmi/language/zh-hans/views.view.helfi_redirect.yml @@ -15,6 +15,9 @@ display: separator: ', ' created: label: Created + status: + label: 已发布 + separator: ', ' pager: options: tags: diff --git a/conf/cmi/language/zh-hans/views.view.redirect.yml b/conf/cmi/language/zh-hans/views.view.redirect.yml index df2e163c3..cbe5197b4 100644 --- a/conf/cmi/language/zh-hans/views.view.redirect.yml +++ b/conf/cmi/language/zh-hans/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: 重定向 +label: Redirect display: default: display_title: 主 @@ -23,39 +23,39 @@ display: offset_label: 偏移量 fields: redirect_bulk_form: - action_title: 对所选项目 + action_title: 'With selection' redirect_source__path: - label: 源自 + label: From separator: ', ' created: - label: 已建立 + label: Created filters: redirect_source__path: expose: - label: 源自 + label: From redirect_redirect__uri: expose: - label: 到 + label: To status_code: group_info: group_items: 1: - title: 300多种选择 + title: '300 Multiple Choices' 2: - title: 301永久移动 + title: '301 Moved Permanently' 3: - title: 302临时重定向 + title: '302 Found' 4: - title: 303查看其它位置 + title: '303 See Other' 5: - title: 304未修改 + title: '304 Not Modified' 6: - title: 305使用代理 + title: '305 Use Proxy' 7: - title: 307临时重定向 + title: '307 Temporary Redirect' language: expose: - label: 原始语言 - title: 重定向 + label: 'Original language' + title: Redirect page_1: display_title: 页面 diff --git a/tools/make/project/git.mk b/tools/make/project/git.mk index 50b03e875..c598f4d7b 100644 --- a/tools/make/project/git.mk +++ b/tools/make/project/git.mk @@ -1,3 +1,3 @@ PHONY += copy-commit-message-script copy-commit-message-script: - @$(foreach name,$(shell find public/modules/custom public/themes/custom public/modules/contrib public/themes/contrib -type d -name ".git" -exec dirname {} \; 2> /dev/null ) .,cp tools/commit-msg $(name)/.git/hooks || true;) + @$(foreach name,$(shell find . -type d -name ".git" -exec dirname {} \; 2> /dev/null ),cp tools/commit-msg $(name)/.git/hooks;) From f36d6b1a2d63c460acb828644f69d566c8d1eb0b Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Tue, 17 Dec 2024 09:36:26 +0200 Subject: [PATCH 2/3] Revert translations --- conf/cmi/language/ar/views.view.archive.yml | 6 +-- conf/cmi/language/ar/views.view.content.yml | 2 +- conf/cmi/language/ar/views.view.files.yml | 8 ++-- conf/cmi/language/ar/views.view.glossary.yml | 6 +-- .../language/ar/views.view.locked_content.yml | 6 +-- conf/cmi/language/ar/views.view.media.yml | 4 +- .../language/ar/views.view.media_library.yml | 6 +-- .../ar/views.view.paragraphs_library.yml | 6 +-- conf/cmi/language/ar/views.view.redirect.yml | 14 +++---- .../language/ar/views.view.taxonomy_term.yml | 6 +-- .../ar/views.view.user_admin_people.yml | 6 +-- conf/cmi/language/de/views.view.redirect.yml | 38 +++++++++---------- conf/cmi/language/et/views.view.redirect.yml | 14 +++---- conf/cmi/language/fa/views.view.redirect.yml | 10 ++--- conf/cmi/language/fr/views.view.redirect.yml | 38 +++++++++---------- conf/cmi/language/ru/views.view.redirect.yml | 36 +++++++++--------- conf/cmi/language/uk/views.view.redirect.yml | 34 ++++++++--------- 17 files changed, 120 insertions(+), 120 deletions(-) diff --git a/conf/cmi/language/ar/views.view.archive.yml b/conf/cmi/language/ar/views.view.archive.yml index fb626ef3c..ec36a5421 100644 --- a/conf/cmi/language/ar/views.view.archive.yml +++ b/conf/cmi/language/ar/views.view.archive.yml @@ -6,8 +6,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة exposed_form: options: submit_button: تطبيق @@ -18,4 +18,4 @@ display: block_1: display_title: الصندوق page_1: - display_title: Page + display_title: الصفحة diff --git a/conf/cmi/language/ar/views.view.content.yml b/conf/cmi/language/ar/views.view.content.yml index e4d1c10c7..ff0c7b220 100644 --- a/conf/cmi/language/ar/views.view.content.yml +++ b/conf/cmi/language/ar/views.view.content.yml @@ -58,7 +58,7 @@ display: expose: label: اللغة page_1: - display_title: Page + display_title: الصفحة display_options: menu: title: المحتوى diff --git a/conf/cmi/language/ar/views.view.files.yml b/conf/cmi/language/ar/views.view.files.yml index 9ca4a548f..d68686b5f 100644 --- a/conf/cmi/language/ar/views.view.files.yml +++ b/conf/cmi/language/ar/views.view.files.yml @@ -22,8 +22,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة exposed_form: options: submit_button: انتقاء @@ -60,8 +60,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة arguments: fid: exception: diff --git a/conf/cmi/language/ar/views.view.glossary.yml b/conf/cmi/language/ar/views.view.glossary.yml index b4aba719a..fb47d49d1 100644 --- a/conf/cmi/language/ar/views.view.glossary.yml +++ b/conf/cmi/language/ar/views.view.glossary.yml @@ -13,8 +13,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة exposed_form: options: submit_button: تطبيق @@ -25,7 +25,7 @@ display: attachment_1: display_title: المرفق page_1: - display_title: Page + display_title: الصفحة display_options: menu: title: القاموس diff --git a/conf/cmi/language/ar/views.view.locked_content.yml b/conf/cmi/language/ar/views.view.locked_content.yml index 3e482b4d5..0973d427d 100644 --- a/conf/cmi/language/ar/views.view.locked_content.yml +++ b/conf/cmi/language/ar/views.view.locked_content.yml @@ -12,8 +12,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة fields: node_bulk_form: action_title: إجراء @@ -40,4 +40,4 @@ display: expose: label: العنوان page_1: - display_title: Page + display_title: الصفحة diff --git a/conf/cmi/language/ar/views.view.media.yml b/conf/cmi/language/ar/views.view.media.yml index 48833b3f3..45497ee56 100644 --- a/conf/cmi/language/ar/views.view.media.yml +++ b/conf/cmi/language/ar/views.view.media.yml @@ -35,8 +35,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة exposed_form: options: submit_button: انتقاء diff --git a/conf/cmi/language/ar/views.view.media_library.yml b/conf/cmi/language/ar/views.view.media_library.yml index 2d87d59e3..38247755c 100644 --- a/conf/cmi/language/ar/views.view.media_library.yml +++ b/conf/cmi/language/ar/views.view.media_library.yml @@ -9,8 +9,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة exposed_form: options: submit_button: 'عمل تصفية' @@ -32,7 +32,7 @@ display: expose: label: اللغة page: - display_title: Page + display_title: الصفحة display_options: fields: media_bulk_form: diff --git a/conf/cmi/language/ar/views.view.paragraphs_library.yml b/conf/cmi/language/ar/views.view.paragraphs_library.yml index 15849d676..15b1b590c 100644 --- a/conf/cmi/language/ar/views.view.paragraphs_library.yml +++ b/conf/cmi/language/ar/views.view.paragraphs_library.yml @@ -12,8 +12,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة fields: label: label: التسمية @@ -44,4 +44,4 @@ display: expose: label: النوع page_1: - display_title: Page + display_title: الصفحة diff --git a/conf/cmi/language/ar/views.view.redirect.yml b/conf/cmi/language/ar/views.view.redirect.yml index c82acce59..3748b6cb7 100644 --- a/conf/cmi/language/ar/views.view.redirect.yml +++ b/conf/cmi/language/ar/views.view.redirect.yml @@ -17,20 +17,20 @@ display: first: '« الأولى' last: 'الأخيرة »' expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة fields: redirect_source__path: - label: From + label: من separator: ', ' created: - label: Created + label: الإنشاء filters: redirect_source__path: expose: - label: From + label: من redirect_redirect__uri: expose: - label: To + label: إلى page_1: - display_title: Page + display_title: الصفحة diff --git a/conf/cmi/language/ar/views.view.taxonomy_term.yml b/conf/cmi/language/ar/views.view.taxonomy_term.yml index 08c773f1d..6c4bce3e5 100644 --- a/conf/cmi/language/ar/views.view.taxonomy_term.yml +++ b/conf/cmi/language/ar/views.view.taxonomy_term.yml @@ -6,8 +6,8 @@ display: pager: options: expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة exposed_form: options: submit_button: تطبيق @@ -22,4 +22,4 @@ display: feed_1: display_title: التلقيمة page_1: - display_title: Page + display_title: الصفحة diff --git a/conf/cmi/language/ar/views.view.user_admin_people.yml b/conf/cmi/language/ar/views.view.user_admin_people.yml index 7d2bf5346..e3e7f7daa 100644 --- a/conf/cmi/language/ar/views.view.user_admin_people.yml +++ b/conf/cmi/language/ar/views.view.user_admin_people.yml @@ -29,8 +29,8 @@ display: next: 'التالي ›' previous: '‹ السابق' expose: - items_per_page_options_all_label: '- All -' - offset_label: Offset + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة exposed_form: options: submit_button: انتقاء @@ -58,7 +58,7 @@ display: label: الصلاحية use_more_text: المزيد page_1: - display_title: Page + display_title: الصفحة display_options: menu: title: لائحة diff --git a/conf/cmi/language/de/views.view.redirect.yml b/conf/cmi/language/de/views.view.redirect.yml index 823bebf5f..a0d83ab43 100644 --- a/conf/cmi/language/de/views.view.redirect.yml +++ b/conf/cmi/language/de/views.view.redirect.yml @@ -1,5 +1,5 @@ -label: Redirect -description: 'List of redirects' +label: Umleiten +description: 'Liste der Umleitungen' display: default: display_title: Master @@ -24,45 +24,45 @@ display: offset_label: Versatz fields: redirect_bulk_form: - action_title: 'With selection' + action_title: 'Mit Auswahl' redirect_source__path: - label: From + label: Von separator: ', ' created: - label: Created + label: Erstellt filters: redirect_source__path: expose: - label: From + label: Von redirect_redirect__uri: expose: - label: To + label: An status_code: expose: - label: 'Status code' + label: Statuscode group_info: - label: 'Status code' + label: Statuscode group_items: 1: - title: '300 Multiple Choices' + title: '300 Mehrere Auswahlmöglichkeiten' 2: - title: '301 Moved Permanently' + title: '301 Dauerhaft verschoben' 3: - title: '302 Found' + title: '302 Gefunden' 4: - title: '303 See Other' + title: '303 Siehe andere' 5: - title: '304 Not Modified' + title: '304 Nicht modifiziert' 6: - title: '305 Use Proxy' + title: '305 Proxy verwenden' 7: - title: '307 Temporary Redirect' + title: '307 Temporäre Weiterleitung' language: expose: - label: 'Original language' - title: Redirect + label: Originalsprache + title: Umleiten empty: area_text_custom: - content: 'There is no redirect yet.' + content: 'Es wurde noch keine Umleitung eingerichtet.' page_1: display_title: Seite diff --git a/conf/cmi/language/et/views.view.redirect.yml b/conf/cmi/language/et/views.view.redirect.yml index 837e319ae..c3421f764 100644 --- a/conf/cmi/language/et/views.view.redirect.yml +++ b/conf/cmi/language/et/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: Redirect +label: 'Suunatakse ümber' display: default: display_title: Peamine @@ -23,20 +23,20 @@ display: offset_label: Nihe fields: redirect_source__path: - label: From + label: Kellelt separator: ', ' created: - label: Created + label: Loodud filters: redirect_source__path: expose: - label: From + label: Kellelt redirect_redirect__uri: expose: - label: To + label: Kellele language: expose: - label: 'Original language' - title: Redirect + label: 'Algne keel' + title: 'Suunatakse ümber' page_1: display_title: Lehekülg diff --git a/conf/cmi/language/fa/views.view.redirect.yml b/conf/cmi/language/fa/views.view.redirect.yml index d1b77f0e3..d00c93bd4 100644 --- a/conf/cmi/language/fa/views.view.redirect.yml +++ b/conf/cmi/language/fa/views.view.redirect.yml @@ -22,17 +22,17 @@ display: offset_label: جابجایی fields: redirect_bulk_form: - action_title: 'With selection' + action_title: 'با انتخاب شده‌ها' redirect_source__path: - label: From + label: از created: - label: Created + label: 'ایجاد گردید' filters: redirect_source__path: expose: - label: From + label: از redirect_redirect__uri: expose: - label: To + label: به page_1: display_title: صفحه diff --git a/conf/cmi/language/fr/views.view.redirect.yml b/conf/cmi/language/fr/views.view.redirect.yml index f8b9d570c..88bee5068 100644 --- a/conf/cmi/language/fr/views.view.redirect.yml +++ b/conf/cmi/language/fr/views.view.redirect.yml @@ -1,5 +1,5 @@ -label: Redirect -description: 'List of redirects' +label: Rediriger +description: 'Liste des redirections' display: default: display_title: Maître @@ -24,45 +24,45 @@ display: offset_label: Décalage fields: redirect_bulk_form: - action_title: 'With selection' + action_title: 'Pour la sélection' redirect_source__path: - label: From + label: 'A partir de' separator: ', ' created: - label: Created + label: Créé filters: redirect_source__path: expose: - label: From + label: 'A partir de' redirect_redirect__uri: expose: - label: To + label: À status_code: expose: - label: 'Status code' + label: 'Code du statut' group_info: - label: 'Status code' + label: 'Code du statut' group_items: 1: - title: '300 Multiple Choices' + title: '300 Choix Multiples' 2: - title: '301 Moved Permanently' + title: '301 Redirection Permanente' 3: - title: '302 Found' + title: '302 Trouvé' 4: - title: '303 See Other' + title: '303 Voir Ailleurs' 5: - title: '304 Not Modified' + title: '304 Non Modifié' 6: - title: '305 Use Proxy' + title: '305 Utilise un Proxy' 7: - title: '307 Temporary Redirect' + title: '307 Redirection Temporaire' language: expose: - label: 'Original language' - title: Redirect + label: 'Langue initiale' + title: Rediriger empty: area_text_custom: - content: 'There is no redirect yet.' + content: "Il n'y a pas encore de redirection." page_1: display_title: Page diff --git a/conf/cmi/language/ru/views.view.redirect.yml b/conf/cmi/language/ru/views.view.redirect.yml index 3b43012c2..c4a7feb9f 100644 --- a/conf/cmi/language/ru/views.view.redirect.yml +++ b/conf/cmi/language/ru/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: Redirect +label: Переадресация display: default: display_title: Основной @@ -23,45 +23,45 @@ display: offset_label: Пропустить fields: redirect_bulk_form: - action_title: 'With selection' + action_title: 'С выделенным' redirect_source__path: - label: From + label: От separator: ', ' created: - label: Created + label: Создано filters: redirect_source__path: expose: - label: From + label: От redirect_redirect__uri: expose: - label: To + label: Кому status_code: expose: - label: 'Status code' + label: 'Код состояния' group_info: - label: 'Status code' + label: 'Код состояния' group_items: 1: - title: '300 Multiple Choices' + title: '300 Множество Выборов' 2: - title: '301 Moved Permanently' + title: '301 Перемещёно Окончательно' 3: - title: '302 Found' + title: '302 Найдено' 4: - title: '303 See Other' + title: '303 Смотреть Другое' 5: - title: '304 Not Modified' + title: '304 Не Изменялось' 6: - title: '305 Use Proxy' + title: '305 Использовать Прокси' 7: - title: '307 Temporary Redirect' + title: '307 - Временно перемещено' language: expose: - label: 'Original language' - title: Redirect + label: 'Язык оригинала' + title: Переадресация empty: area_text_custom: - content: 'There is no redirect yet.' + content: 'Перенаправлений пока нет.' page_1: display_title: Страница diff --git a/conf/cmi/language/uk/views.view.redirect.yml b/conf/cmi/language/uk/views.view.redirect.yml index d4ff8153f..3cfe80171 100644 --- a/conf/cmi/language/uk/views.view.redirect.yml +++ b/conf/cmi/language/uk/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: Redirect +label: Переспрямувати display: default: display_title: Головне @@ -23,42 +23,42 @@ display: offset_label: Зміщення fields: redirect_bulk_form: - action_title: 'With selection' + action_title: 'З вибраним' redirect_source__path: - label: From + label: Від separator: ', ' created: - label: Created + label: Створено filters: redirect_source__path: expose: - label: From + label: Від redirect_redirect__uri: expose: - label: To + label: До status_code: expose: - label: 'Status code' + label: 'Код стану' group_info: - label: 'Status code' + label: 'Код стану' group_items: 1: - title: '300 Multiple Choices' + title: '300 Безліч Виборів' 2: - title: '301 Moved Permanently' + title: '301 Переміщене Остаточно' 3: - title: '302 Found' + title: '302 Знайдене' 4: - title: '303 See Other' + title: '303 Дивитися Інше' 5: - title: '304 Not Modified' + title: '304 Не Змінювалося' 6: - title: '305 Use Proxy' + title: '305 Використовувати Проксі' 7: - title: '307 Temporary Redirect' + title: '307 - Тимчасово переміщене' language: expose: - label: 'Original language' - title: Redirect + label: 'Мова оригіналу' + title: Переспрямувати page_1: display_title: Сторінка From cbf4c101be5c8ec4355ab1c32ba9c5346fddc496 Mon Sep 17 00:00:00 2001 From: Jere Ljungberg Date: Tue, 17 Dec 2024 09:40:46 +0200 Subject: [PATCH 3/3] Revert zh translation --- .../language/zh-hans/views.view.redirect.yml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/conf/cmi/language/zh-hans/views.view.redirect.yml b/conf/cmi/language/zh-hans/views.view.redirect.yml index cbe5197b4..df2e163c3 100644 --- a/conf/cmi/language/zh-hans/views.view.redirect.yml +++ b/conf/cmi/language/zh-hans/views.view.redirect.yml @@ -1,4 +1,4 @@ -label: Redirect +label: 重定向 display: default: display_title: 主 @@ -23,39 +23,39 @@ display: offset_label: 偏移量 fields: redirect_bulk_form: - action_title: 'With selection' + action_title: 对所选项目 redirect_source__path: - label: From + label: 源自 separator: ', ' created: - label: Created + label: 已建立 filters: redirect_source__path: expose: - label: From + label: 源自 redirect_redirect__uri: expose: - label: To + label: 到 status_code: group_info: group_items: 1: - title: '300 Multiple Choices' + title: 300多种选择 2: - title: '301 Moved Permanently' + title: 301永久移动 3: - title: '302 Found' + title: 302临时重定向 4: - title: '303 See Other' + title: 303查看其它位置 5: - title: '304 Not Modified' + title: 304未修改 6: - title: '305 Use Proxy' + title: 305使用代理 7: - title: '307 Temporary Redirect' + title: 307临时重定向 language: expose: - label: 'Original language' - title: Redirect + label: 原始语言 + title: 重定向 page_1: display_title: 页面