From 194990cb9d0ac2164cc66b17f00d9c592ab12e53 Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Fri, 8 Dec 2023 13:47:18 -0600
Subject: [PATCH] Issue #3259581 by ressa, xjm, benjifisher, joachim, quietone:
Update migration warning 'There is translated content of these types'
---
core/modules/migrate_drupal_ui/src/Form/IdConflictForm.php | 4 ++--
.../tests/src/Functional/MigrateUpgradeTestBase.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/modules/migrate_drupal_ui/src/Form/IdConflictForm.php b/core/modules/migrate_drupal_ui/src/Form/IdConflictForm.php
index 1ac25a629a3f..373fe184a640 100644
--- a/core/modules/migrate_drupal_ui/src/Form/IdConflictForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/IdConflictForm.php
@@ -142,14 +142,14 @@ protected function formatConflicts(array $conflicts) {
*/
protected function i18nWarningForm(array &$form, array $conflicts) {
$form['i18n'] = [
- '#title' => $this->t('There is translated content of these types:'),
+ '#title' => $this->t('Check whether there is translated content of these types:'),
'#theme' => 'item_list',
'#items' => $this->formatConflicts($conflicts),
];
$form['i18n_warning'] = [
'#type' => 'markup',
- '#markup' => '<p>' . $this->t('It looks like you are migrating translated content from your old site. Possible ID conflicts for translations are not automatically detected in the current version of Drupal. Refer to the <a target="_blank" href=":id-conflicts-handbook">upgrade handbook</a> for instructions on how to avoid ID conflicts with translated content.', [':id-conflicts-handbook' => 'https://www.drupal.org/docs/8/upgrade/known-issues-when-upgrading-from-drupal-6-or-7-to-drupal-8#id_conflicts']) . '</p>',
+ '#markup' => '<p>' . $this->t('Possible ID conflicts for translations are not automatically detected in the current version of Drupal. Refer to the <a target="_blank" href=":id-conflicts-handbook">Upgrading Drupal handbook</a> for instructions on how to avoid ID conflicts with translated content.', [':id-conflicts-handbook' => 'https://www.drupal.org/docs/upgrading-drupal/upgrading-from-drupal-6-or-drupal-7/known-issues-when-upgrading-from-drupal-6-or-7#id_conflicts']) . '</p>',
];
return $form;
diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
index 85cfbcfbe61f..e9485aa3a739 100644
--- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
@@ -188,7 +188,7 @@ protected function assertIdConflictForm(array $entity_types) {
$session->pageTextContains($label);
}
$session->pageTextContainsOnce('content items');
- $session->pageTextContains('There is translated content of these types:');
+ $session->pageTextContains('Check whether there is translated content of these types:');
}
/**
--
GitLab