diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php index 8c6ba9ab33..f264f56689 100644 --- a/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php +++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php @@ -6,6 +6,7 @@ use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Field\FieldTypePluginManagerInterface; +use Drupal\Core\StringTranslation\TranslatableMarkup;; use Drupal\migrate\MigrateException; use Drupal\migrate\Plugin\MigrationInterface; use Drupal\migrate\Row; @@ -25,7 +26,7 @@ class EntityRevision extends EntityContentBase { */ public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, EntityManagerInterface $entity_manager, FieldTypePluginManagerInterface $field_type_manager) { $plugin_definition += [ - 'label' => "{$storage->getEntityType()->getSingularLabel()} revisions", + 'label' => new TranslatableMarkup('@entity_type revisions', ['@entity_type' => $storage->getEntityType()->getSingularLabel()]), ]; parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles, $entity_manager, $field_type_manager); } diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php index 96760966ac..cd4634fa32 100644 --- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php @@ -495,18 +495,14 @@ public function buildIdConflictForm(array &$form, FormStateInterface $form_state /** @var \Drupal\migrate\Audit\AuditResult $result */ foreach ($results as $result) { - // If the migration passed the audit, we don't need to do anything. - if ($result->passed()) { - continue; - } - $destination = $result->getMigration()->getDestinationPlugin(); if ($destination instanceof EntityContentBase && $destination->isTranslationDestination()) { $translated_content_conflicts[] = $result; } - else { + elseif (!$result->passed()) { $content_conflicts[] = $result; } + } if (empty($content_conflicts) && empty($translated_content_conflicts)) { $form_state->set('step', 'confirm');