diff -u b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php --- b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php @@ -27,6 +27,13 @@ use MigrationConfigurationTrait; /** + * The current form step. + * + * @var string + */ + protected $step; + + /** * The state service. * * @var \Drupal\Core\State\StateInterface @@ -118,8 +125,8 @@ * {@inheritdoc} */ public function buildForm(array $form, FormStateInterface $form_state) { - $step = $form_state->get('step') ?: 'overview'; - switch ($step) { + $this->step = $form_state->get('step') ?: 'overview'; + switch ($this->step) { case 'overview': return $this->buildOverviewForm($form, $form_state); @@ -133,7 +140,7 @@ return $this->buildConfirmForm($form, $form_state); default: - drupal_set_message($this->t('Unrecognized form step @step', ['@step' => $step]), 'error'); + drupal_set_message($this->t('Unrecognized form step @step', ['@step' => $this->step]), 'error'); return []; } } @@ -692,7 +699,7 @@ '#value' => $this->t('Modules that will not be upgraded'), '#attributes' => ['id' => ['error']], ], - '#description' => $this->t('There are no modules installed on your new site to replace these modules. If you proceed with the upgrade now, configuration and/or content needed by these modules will not be available on your new site. For more information, see Review the pre-upgrade analysis in the Upgrading to Drupal 8 handbook', [':review' => 'https://www.drupal.org/docs/8/upgrade/upgrade-using-web-browser#pre-upgrade-analysis', ':migrate' => 'https://www.drupal.org/docs/8/upgrade']), + '#description' => $this->t('There are no modules installed on your new site to replace these modules. If you proceed with the upgrade now, configuration and/or content needed by these modules will not be available on your new site. For more information, see Review the pre-upgrade analysis in the Upgrading to Drupal 8 handbook.', [':review' => 'https://www.drupal.org/docs/8/upgrade/upgrade-using-web-browser#pre-upgrade-analysis', ':migrate' => 'https://www.drupal.org/docs/8/upgrade']), '#weight' => 2, ]; $missing_module_list['module_list'] = [ @@ -852,7 +859,12 @@ * {@inheritdoc} */ public function getQuestion() { - return $this->t('Pre-upgrade analysis'); + if ($this->step === 'confirm_id_conflicts') { + return $this->t('Upgrade analysis report'); + } + else { + return $this->t('What will be upgraded?'); + } } /** only in patch2: unchanged: --- a/core/modules/migrate_drupal_ui/migrate_drupal_ui.module +++ b/core/modules/migrate_drupal_ui/migrate_drupal_ui.module @@ -26,7 +26,7 @@ function migrate_drupal_ui_help($route_name, RouteMatchInterface $route_match) { $output .= '
' . t('On the Upgrade page, you are guided through performing the upgrade in several steps.', [':upgrade' => \Drupal::url('migrate_drupal_ui.upgrade')]) . '
'; $output .= '
  1. ' . t('You need to enter the database credentials of the Drupal site that you want to upgrade. You can also include its files directory in the upgrade.') . '
  2. '; - $output .= '
  3. ' . t('The next page then provides an overview of which upgrade paths are available or missing, before you proceed to perform the upgrade.') . '
  4. '; + $output .= '
  5. ' . t('The next page then provides an overview of the modules that will be upgraded and those that will not be upgraded, before you proceed to perform the upgrade.') . '
  6. '; $output .= '
  7. ' . t('Lastly, a message is displayed about the number of upgrade tasks that were successful or failed.') . '
'; $output .= '
' . t('Reviewing the upgrade log') . '
'; $output .= '
' . t('You can review a log of upgrade messages by clicking the link in the message provided after the upgrade or by filtering the messages for the type migrate_drupal_ui on the Recent log messages page.',