Unverified Commit 8b047758 authored by alexpott's avatar alexpott

Issue #3151360 by quietone, benjifisher, ToneLoc: Improve description for file...

Issue #3151360 by quietone, benjifisher, ToneLoc: Improve description for file paths on the CredentialFrom

(cherry picked from commit 98057144)
parent d59fac03
...@@ -167,7 +167,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { ...@@ -167,7 +167,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
]; ];
$form['source']['d6_source_base_path'] = [ $form['source']['d6_source_base_path'] = [
'#type' => 'textfield', '#type' => 'textfield',
'#title' => $this->t('Files directory'), '#title' => $this->t('Document root for files'),
'#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).'), '#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).'),
'#states' => [ '#states' => [
'visible' => [ 'visible' => [
...@@ -179,7 +179,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { ...@@ -179,7 +179,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$form['source']['source_base_path'] = [ $form['source']['source_base_path'] = [
'#type' => 'textfield', '#type' => 'textfield',
'#title' => $this->t('Public files directory'), '#title' => $this->t('Document root for public files'),
'#description' => $this->t('To import public 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).'), '#description' => $this->t('To import public 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).'),
'#states' => [ '#states' => [
'visible' => [ 'visible' => [
...@@ -191,7 +191,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { ...@@ -191,7 +191,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$form['source']['source_private_file_path'] = [ $form['source']['source_private_file_path'] = [
'#type' => 'textfield', '#type' => 'textfield',
'#title' => $this->t('Private files directory'), '#title' => $this->t('Document root for private files'),
'#default_value' => '', '#default_value' => '',
'#description' => $this->t('To import private files from your current Drupal site, enter a local file directory containing your site (e.g. /var/www/docroot).'), '#description' => $this->t('To import private files from your current Drupal site, enter a local file directory containing your site (e.g. /var/www/docroot).'),
'#states' => [ '#states' => [
......
...@@ -100,11 +100,11 @@ public function testMigrateUpgradeExecute() { ...@@ -100,11 +100,11 @@ public function testMigrateUpgradeExecute() {
} }
$this->drupalPostForm(NULL, $paths + $edits, t('Review upgrade')); $this->drupalPostForm(NULL, $paths + $edits, t('Review upgrade'));
if ($version == 6) { if ($version == 6) {
$session->responseContains('Failed to read from Files directory.'); $session->responseContains('Failed to read from Document root for files.');
} }
else { else {
$session->responseContains('Failed to read from Public files directory.'); $session->responseContains('Failed to read from Document root for public files.');
$session->responseContains('Failed to read from Private files directory.'); $session->responseContains('Failed to read from Document root for private files.');
} }
// Restart the upgrade process. // Restart the upgrade process.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment