[TASK] Amend Installer text 83/56783/5
authorTom Warwick <tom.warwick@typo3.org>
Mon, 23 Apr 2018 08:54:01 +0000 (09:54 +0100)
committerTymoteusz Motylewski <t.motylewski@gmail.com>
Fri, 27 Apr 2018 14:05:46 +0000 (16:05 +0200)
This commit is intended to improve the language
used in the Installer.

[+] Review each paragraph and amend if required
[+] Consistent buttons names

[-] Remove unnecessary text that is not relevant
to the installation process.

Resolves: #84839
Releases: master

Change-Id: I1288f3942214cc2687b8e5ef0d51f678f2d5bc23
Reviewed-on: https://review.typo3.org/56783
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
Tested-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
typo3/sysext/core/Tests/AcceptanceInstallMysql/InstallWithMysqlBlankPageCest.php
typo3/sysext/core/Tests/AcceptanceInstallMysql/InstallWithMysqlIntroductionPackageCest.php
typo3/sysext/core/Tests/AcceptanceInstallPgsql/InstallWithPgsqlBlankPageCest.php
typo3/sysext/core/Tests/AcceptanceInstallPgsql/InstallWithPgsqlIntroductionPackageCest.php
typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseConnect.html
typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseData.html
typo3/sysext/install/Resources/Private/Templates/Installer/ShowDatabaseSelect.html
typo3/sysext/install/Resources/Private/Templates/Installer/ShowDefaultConfiguration.html
typo3/sysext/install/Resources/Private/Templates/Installer/ShowEnvironmentAndFolders.html
typo3/sysext/install/Resources/Private/Templates/Installer/ShowInstallerNotAvailable.html

index b77d832..84205aa 100644 (file)
@@ -29,29 +29,29 @@ class InstallWithMysqlBlankPageCest
 
         // EnvironmentAndFolders step
         $I->waitForText('Installing TYPO3');
-        $I->waitForText('System looks good. Continue!');
-        $I->click('System looks good. Continue!');
+        $I->waitForText('No problems detected, continue with installation');
+        $I->click('No problems detected, continue with installation');
 
         // DatabaseConnection step
-        $I->waitForText('Database connection');
+        $I->waitForText('Select database');
         $I->fillField('#t3-install-step-mysqliManualConfiguration-username', getenv('typo3DatabaseUsername'));
         $I->fillField('#t3-install-step-mysqliManualConfiguration-password', getenv('typo3DatabasePassword'));
         $I->click('Continue');
 
         // DatabaseSelect step
-        $I->waitForText('Select database');
+        $I->waitForText('Select database');
         $I->click('#t3-install-form-db-select-type-new');
         $I->fillField('#t3-install-step-database-new', getenv('typo3DatabaseName') . '_atimysql');
         $I->click('Continue');
 
         // DatabaseData step
-        $I->waitForText('Create user and import base data');
+        $I->waitForText('Create Administrative User / Specify Site Name');
         $I->fillField('#username', 'admin');
         $I->fillField('#password', 'password');
         $I->click('Continue');
 
         // DefaultConfiguration step - Create empty page
-        $I->waitForText('Installation done!');
+        $I->waitForText('Installation Complete');
         $I->click('#create-site');
         $I->click('Open the TYPO3 Backend');
 
index d6ee250..ed43d35 100644 (file)
@@ -29,29 +29,29 @@ class InstallWithMysqlIntroductionPackageCest
 
         // EnvironmentAndFolders step
         $I->waitForText('Installing TYPO3');
-        $I->waitForText('System looks good. Continue!');
-        $I->click('System looks good. Continue!');
+        $I->waitForText('No problems detected, continue with installation');
+        $I->click('No problems detected, continue with installation');
 
         // DatabaseConnection step
-        $I->waitForText('Database connection');
+        $I->waitForText('Select database');
         $I->fillField('#t3-install-step-mysqliManualConfiguration-username', getenv('typo3DatabaseUsername'));
         $I->fillField('#t3-install-step-mysqliManualConfiguration-password', getenv('typo3DatabasePassword'));
         $I->click('Continue');
 
         // DatabaseSelect step
-        $I->waitForText('Select database');
+        $I->waitForText('Select database');
         $I->click('#t3-install-form-db-select-type-new');
         $I->fillField('#t3-install-step-database-new', getenv('typo3DatabaseName') . '_atimysql');
         $I->click('Continue');
 
         // DatabaseData step
-        $I->waitForText('Create user and import base data');
+        $I->waitForText('Create Administrative User / Specify Site Name');
         $I->fillField('#username', 'admin');
         $I->fillField('#password', 'password');
         $I->click('Continue');
 
         // DefaultConfiguration step - Create empty page
-        $I->waitForText('Installation done!');
+        $I->waitForText('Installation Complete');
         $I->click('#load-distributions');
         $I->click('Open the TYPO3 Backend');
 
index 1b04ecb..31e7cf4 100644 (file)
@@ -29,11 +29,11 @@ class InstallWithPgsqlBlankPageCest
 
         // EnvironmentAndFolders step
         $I->waitForText('Installing TYPO3');
-        $I->waitForText('System looks good. Continue!');
-        $I->click('System looks good. Continue!');
+        $I->waitForText('No problems detected, continue with installation');
+        $I->click('No problems detected, continue with installation');
 
         // DatabaseConnection step
-        $I->waitForText('Database connection');
+        $I->waitForText('Select database');
         $I->selectOption('#t3js-connect-database-driver', 'Manually configured PostgreSQL connection');
         $I->fillField('#t3-install-step-postgresManualConfiguration-username', getenv('typo3DatabaseUsername'));
         // password intentionally not filled. Postgres authenticates with the shell user.
@@ -41,13 +41,13 @@ class InstallWithPgsqlBlankPageCest
         $I->click('Continue');
 
         // DatabaseData step
-        $I->waitForText('Create user and import base data');
+        $I->waitForText('Create Administrative User / Specify Site Name');
         $I->fillField('#username', 'admin');
         $I->fillField('#password', 'password');
         $I->click('Continue');
 
         // DefaultConfiguration step - load distributions
-        $I->waitForText('Installation done!');
+        $I->waitForText('Installation Complete');
         $I->click('#create-site');
         $I->click('Open the TYPO3 Backend');
 
index 7f54e30..ebd0780 100644 (file)
@@ -29,11 +29,11 @@ class InstallWithPgsqlIntroductionPackageCest
 
         // EnvironmentAndFolders step
         $I->waitForText('Installing TYPO3');
-        $I->waitForText('System looks good. Continue!');
-        $I->click('System looks good. Continue!');
+        $I->waitForText('No problems detected, continue with installation');
+        $I->click('No problems detected, continue with installation');
 
         // DatabaseConnection step
-        $I->waitForText('Database connection');
+        $I->waitForText('Select database');
         $I->selectOption('#t3js-connect-database-driver', 'Manually configured PostgreSQL connection');
         $I->fillField('#t3-install-step-postgresManualConfiguration-username', getenv('typo3DatabaseUsername'));
         // password intentionally not filled. Postgres authenticates with the shell user.
@@ -41,13 +41,13 @@ class InstallWithPgsqlIntroductionPackageCest
         $I->click('Continue');
 
         // DatabaseData step
-        $I->waitForText('Create user and import base data');
+        $I->waitForText('Create Administrative User / Specify Site Name');
         $I->fillField('#username', 'admin');
         $I->fillField('#password', 'password');
         $I->click('Continue');
 
         // DefaultConfiguration step - load distributions
-        $I->waitForText('Installation done!');
+        $I->waitForText('Installation Complete');
         $I->click('#load-distributions');
         $I->click('Open the TYPO3 Backend');
 
index 435aebb..c9fa376 100644 (file)
@@ -2,19 +2,18 @@
        <div id="t3js-installer-databaseConnect-execute-token">{executeDatabaseConnectToken}</div>
 </div>
 
-<h3>Database connection</h3>
+<h3>Select database</h3>
 <f:if condition="{hasAtLeastOneOption}">
        <f:then>
                <p>
-                       If you have not already created a username and password to access the database, please do so now.
-                       This can be done using tools provided by your host.
+                       You will need to create a database user with the appropriate privileges to access your database.
                </p>
                <div class="t3js-installer-databaseConnect-output"></div>
                <div class="row">
                        <div class="col-md-6">
                                <form method="post" class="form-horizontal">
                                        <div class="form-group">
-                                               <label for="t3js-connect-database-driver" class="control-label col-md-2">Available</label>
+                                               <label for="t3js-connect-database-driver" class="control-label col-md-2">Connection</label>
                                                <div class="col-md-10">
                                                        <select id="t3js-connect-database-driver" class="form-control" name="install[values][availableSet]">
                                                                <f:if condition="{hasMysqliManualConfiguration}">
index 8824bdb..2f703a7 100644 (file)
@@ -2,16 +2,17 @@
        <div id="t3js-installer-databaseData-execute-token">{executeDatabaseDataToken}</div>
 </div>
 
-<h3>Create user and import base data</h3>
+<h3>Create Administrative User / Specify Site Name</h3>
 
 <p>
-       Import basic database structure and create a backend administrator user.
+       Use this account to log into the backend of your site.
 </p>
 <p>
-       The password can be used to log in to the <strong>install tool</strong> and the <strong>TYPO3 CMS backend</strong>
-       (default username is "admin").
+       The password you provide for this account is also used to access the <strong>Install Tool</strong>.
+</p>
+<p>
+       On this page you can also set a name for your new website.
 </p>
-<p>&nbsp;</p>
 
 <div class="t3js-installer-databaseData-output"></div>
 
                                <div class="col-md-2"></div>
                                <div class="col-md-10">
                                        <div class="alert alert-warning">
-                                               This password gives an attacker full control over your instance if cracked. It should be strong (include lower and upper case characters, special characters and numbers) and must be at least eight characters long.
+                                               If compromised, this account will provide an attacker with complete access to your installation. A strong password is recommended. Include lower and upper case characters, special characters and numbers. Your password must be at least eight characters long.
                                        </div>
                                </div>
                        </div>
                        <div class="form-group">
+
                                <label for="sitename" class="control-label col-md-2">Site name</label>
                                <div class="col-md-10">
+
                                        <input
                                                class="t3-install-form-input-text form-control"
                                                name="install[values][sitename]"
index c73ffcd..388e728 100644 (file)
@@ -2,7 +2,7 @@
        <div id="t3js-installer-databaseSelect-execute-token">{executeDatabaseSelectToken}</div>
 </div>
 
-<h3>Select database</h3>
+<h3>Select database</h3>
 
 <div class="t3js-installer-databaseSelect-output"></div>
 
        </f:for>
 </f:if>
 
-You have two options:
-
 <form method="post" id="stepInstaller-databaseSelect">
-       <p>&nbsp;</p>
        <div class="row">
                <div class="col-md-6">
                        <div class="radio">
@@ -56,14 +53,12 @@ You have two options:
                                                value="new"
                                                class="radio"
                                        />
-                                       OR create a new database:
+                                       Create a new database:
                                </label>
                        </div>
                        <div class="form-group">
                                <p>
-                                       <em>Attention: The database user must have sufficient privileges to create the whole structure.</em>
-                                       <br />
-                                       Enter a name for your TYPO3 database.
+                                       Specify a name for your TYPO3 database.
                                </p>
                                <input
                                        id="t3-install-step-database-new"
index 4a4d939..d54e604 100644 (file)
@@ -2,15 +2,11 @@
        <div id="t3js-installer-defaultConfiguration-execute-token">{executeDefaultConfigurationToken}</div>
 </div>
 
-<h3>Installation done!</h3>
+<h3>Installation Complete</h3>
 
 <p>
-       The only thing remaining is to set some configuration values based on your
-       system environment, which happens automatically in this step.
-       Then you will be redirected to your TYPO3 CMS backend, ready for you to log in
-       with the user you just created.
+       The Installation Wizard can create an empty page at the root of your website to help get you started. If you would like to use this option select "Create empty starting page".
 </p>
-<p>&nbsp;</p>
 
 <div class="t3js-installer-defaultConfiguration-output"></div>
 
        <div class="alert alert-notice">
                <h4>Want a pre-configured site?</h4>
                <p>
-                       You now have an empty installation. If you want a pre-configured site, there are
-                       distributions on the web which can be installed via the Extension Manager.
-                       If you check the option below, the list of distributions will be fetched and you will
-                       be able to choose one directly.
-                       <strong>Please note: This may take some time after login.</strong>
+                       You currently have an empty installation of TYPO3. If you would like to view a list of pre-configured distributions select “download list of distributions” from the list below.
+                       <strong>Note: This may take some time to load.</strong>
                </p>
        </div>
 </f:if>
                        <div class="radio">
                                <label for="load-distributions">
                                        <input type="radio" id="load-distributions" name="install[values][sitesetup]" value="loaddistribution" />
-                                       Yes, download the list of distributions.
+                                       Yes, download the list of distributions
                                </label>
                        </div>
                </f:if>
                <div class="radio">
                        <label for="create-site">
                                <input type="radio" id="create-site" name="install[values][sitesetup]" value="createsite" />
-                               Yes, create a base empty page to start from.
+                               Create empty starting page
                        </label>
                </div>
                <div class="radio">
                        <label for="do-nothing">
                                <input type="radio" id="do-nothing" name="install[values][sitesetup]" value="donothing" checked="checked" />
-                               Do nothing, just get me to the Backend.
+                               Take me straight to the backend
                        </label>
                </div>
        </div>
index bc1533a..826d2cd 100644 (file)
@@ -1,36 +1,32 @@
-<h3>System environment check</h3>
+<h3>Environment Overview</h3>
 
 <p>
-       TYPO3 is an enterprise content management system that is powerful, yet easy to install.
-</p>
-<p>
-       After some simple steps you'll be ready to add content to your website.
-       This first step checks your system environment and points out issues.
+       First the Install Wizard needs to inspect your web server and identify any issues that may prevent TYPO3 from running correctly.
 </p>
 
 <form class="t3js-installer-environmentFolders-bad" style="display: none;">
        <div class="form-group">
                <button class="btn btn-default t3js-installer-environmentFolders-retry">
-                       Fixed. Check again!
+                       Scan environment again
                </button>
        </div>
 </form>
 <form class="t3js-installer-environmentFolders-bad" style="display: none;">
        <div class="form-group">
                <button class="btn btn-danger t3js-installer-environmentFolders-execute">
-                       I know what I'm doing, continue!
+                       Continue with errors
                        <span class="t3-install-form-button-icon-negative">&nbsp;</span>
                </button>
        </div>
 </form>
 <form class="t3js-installer-environmentFolders-good" style="display: none;">
        <button class="btn btn-success t3js-installer-environmentFolders-execute">
-               System looks good. Continue!
+               No problems detected, continue with installation
        </button>
 </form>
 
 <div class="t3js-installer-environment-details" style="display: none;">
        <br>
-       <h3>Detailed analysis</h3>
+       <h3>Problems Detected</h3>
 
 </div>
index 6559cdf..ca2d5bc 100644 (file)
@@ -2,18 +2,23 @@
        <div class="col-sm-12 col-md-6">
                <div class="panel panel-success">
                        <div class="panel-heading">
-                               <h2>Thank you for downloading TYPO3</h2>
+                               <h2>Thank you for choosing TYPO3</h2>
                        </div>
                        <div class="panel-body">
+
                                <p>
-                                       To proceed with the installation, create the file <strong>FIRST_INSTALL</strong>
-                                       in your web root directory.
-                                       The filename is case-sensitive but the file itself can be empty.
+                                       The Installation Wizard will guide you through the necessary steps required to install TYPO3 on your web server.
                                </p>
+
+                               <p>
+                                       To begin the installation, create an empty file called <strong>FIRST_INSTALL</strong> in the document root of your web server.
+                               </p>
+
                                <p>
                                        <strong>Note:</strong>
-                                       The file will be deleted once you proceed with the installation.
+                                       The filename is case sensitive and it will be deleted once the installation process is complete.
                                </p>
+
                        </div>
                </div>
        </div>