Skip to content
Snippets Groups Projects
Verified Commit 194990cb authored by Jess's avatar Jess
Browse files

Issue #3259581 by ressa, xjm, benjifisher, joachim, quietone: Update migration...

Issue #3259581 by ressa, xjm, benjifisher, joachim, quietone: Update migration warning 'There is translated content of these types'
parent 48b171f7
No related branches found
No related tags found
No related merge requests found
...@@ -142,14 +142,14 @@ protected function formatConflicts(array $conflicts) { ...@@ -142,14 +142,14 @@ protected function formatConflicts(array $conflicts) {
*/ */
protected function i18nWarningForm(array &$form, array $conflicts) { protected function i18nWarningForm(array &$form, array $conflicts) {
$form['i18n'] = [ $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', '#theme' => 'item_list',
'#items' => $this->formatConflicts($conflicts), '#items' => $this->formatConflicts($conflicts),
]; ];
$form['i18n_warning'] = [ $form['i18n_warning'] = [
'#type' => 'markup', '#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; return $form;
......
...@@ -188,7 +188,7 @@ protected function assertIdConflictForm(array $entity_types) { ...@@ -188,7 +188,7 @@ protected function assertIdConflictForm(array $entity_types) {
$session->pageTextContains($label); $session->pageTextContains($label);
} }
$session->pageTextContainsOnce('content items'); $session->pageTextContainsOnce('content items');
$session->pageTextContains('There is translated content of these types:'); $session->pageTextContains('Check whether there is translated content of these types:');
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment