diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php index 26ddd1a..98d472d 100644 --- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php @@ -744,7 +744,7 @@ public function buildOverviewForm(array $form, FormStateInterface $form_state) { $form['upgrade_option_item'] = [ '#type' => 'item', '#prefix' => $this->t('An upgrade has already been performed on this site. To perform a new migration, create a clean and empty new install of Drupal 8. Rollbacks and incremental migrations are not yet supported through the user interface. For more information, see the upgrading handbook.', [':url' => 'https://www.drupal.org/upgrade/migrate']), - '#description' => '

' . $this->t('Last upgrade: @date', ['@date' => $this->dateFormatter->format($date_performed)]) . '

', + '#description' => $this->t('Last upgrade: @date', ['@date' => $this->dateFormatter->format($date_performed)]), ]; return $form; } @@ -1077,10 +1077,11 @@ public function buildConfirmForm(array $form, FormStateInterface $form_state) { ]; } $form['counts'] = [ + '#title' => 'Upgrade analysis report', '#theme' => 'item_list', '#items' => [ - $this->t('@count available upgrade paths', ['@count' => $available_count]), - $this->t('@count missing upgrade paths', ['@count' => $missing_count]), + $this->formatPlural($available_count, '@count available upgrade path', '@count available upgrade paths'), + $this->formatPlural($missing_count, '@count missing upgrade path', '@count missing upgrade paths'), ], '#weight' => -15, ]; @@ -1150,7 +1151,9 @@ public function getCancelUrl() { * {@inheritdoc} */ public function getDescription() { - return '

' . $this->t('Upgrade analysis report') . '

'; + // The description is added by the buildConfirmForm() method. + // @see \Drupal\migrate_drupal_ui\Form\MigrateUpgradeForm::buildConfirmForm() + return; } /**