From 8db2e4d4a7f4908ceb402b40036db68efa9d7a9e Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Fri, 24 Jun 2016 16:55:33 +0200
Subject: [PATCH] Issue #2702531 by pguillard, ifrik, scuba_fly: Edit UI text
for Drupal Upgrade UI module
---
.../migrate_drupal_ui/src/Form/MigrateUpgradeForm.php | 6 +++---
.../migrate_drupal_ui/src/Tests/MigrateAccessTest.php | 4 ++--
.../migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
index 8ef5f4858bcb..5808c1f4b25a 100644
--- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -687,7 +687,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
* The form structure.
*/
public function buildOverviewForm(array $form, FormStateInterface $form_state) {
- $form['#title'] = $this->t('Drupal Upgrade');
+ $form['#title'] = $this->t('Upgrade');
if ($date_performed = $this->state->get('migrate_drupal_ui.performed')) {
// @todo Add back support for rollbacks and incremental migrations.
@@ -702,7 +702,7 @@ public function buildOverviewForm(array $form, FormStateInterface $form_state) {
}
else {
$form['info_header'] = [
- '#markup' => '<p>' . $this->t('Upgrade a Drupal site by importing it into a clean and empty new install of Drupal 8. You will lose any existing configuration once you import your site into it. See the <a href=":url">upgrading handbook</a> for more detailed information.', [
+ '#markup' => '<p>' . $this->t('Upgrade a site by importing it into a clean and empty new install of Drupal 8. You will lose any existing configuration once you import your site into it. See the <a href=":url">online documentation for Drupal site upgrades</a> for more detailed information.', [
':url' => 'https://www.drupal.org/upgrade/migrate',
]),
];
@@ -838,7 +838,7 @@ public function buildCredentialForm(array $form, FormStateInterface $form_state)
$form['source']['source_base_path'] = [
'#type' => 'textfield',
'#title' => $this->t('Files directory'),
- '#description' => $this->t('To import files from your current Drupal site, enter a local file directory containing your site (e.g. /var/www/docroot), or your site address (e.g. http://example.com).'),
+ '#description' => $this->t('To import files from your current Drupal site, enter a local file directory containing your site (e.g. /var/www/docroot), or your site address (for example http://example.com).'),
];
$form['actions'] = ['#type' => 'actions'];
diff --git a/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php b/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php
index 95691d4fa5cb..2401d86b3342 100644
--- a/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php
+++ b/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php
@@ -25,13 +25,13 @@ protected function testAccess() {
$this->drupalLogin($this->rootUser);
$this->drupalGet('upgrade');
$this->assertResponse(200);
- $this->assertText(t('Drupal Upgrade'));
+ $this->assertText(t('Upgrade'));
$user = $this->createUser(['administer software updates']);
$this->drupalLogin($user);
$this->drupalGet('upgrade');
$this->assertResponse(403);
- $this->assertNoText(t('Drupal Upgrade'));
+ $this->assertNoText(t('Upgrade'));
}
}
diff --git a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
index 25ae6e9fa26b..8cf8c8dbc736 100644
--- a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
+++ b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
@@ -104,7 +104,7 @@ protected function tearDown() {
protected function testMigrateUpgrade() {
$connection_options = $this->sourceDatabase->getConnectionOptions();
$this->drupalGet('/upgrade');
- $this->assertText('Upgrade a Drupal site by importing it into a clean and empty new install of Drupal 8. You will lose any existing configuration once you import your site into it. See the upgrading handbook for more detailed information.');
+ $this->assertText('Upgrade a site by importing it into a clean and empty new install of Drupal 8. You will lose any existing configuration once you import your site into it. See the online documentation for Drupal site upgrades for more detailed information.');
$this->drupalPostForm(NULL, [], t('Continue'));
$this->assertText('Provide credentials for the database of the Drupal site you want to upgrade.');
--
GitLab