Fixed bug #14814: dbal: Improve install tool texts.
authorJeff Segars <jsegars@alumni.rice.edu>
Tue, 22 Jun 2010 13:43:02 +0000 (13:43 +0000)
committerJeff Segars <jsegars@alumni.rice.edu>
Tue, 22 Jun 2010 13:43:02 +0000 (13:43 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8036 709f56b5-9817-0410-a4d7-c38de5d9e867

typo3/sysext/dbal/ChangeLog
typo3/sysext/dbal/class.tx_dbal_installtool.php
typo3/sysext/dbal/res/Templates/install.html

index fdb780a..05244d6 100644 (file)
@@ -1,3 +1,7 @@
+2010-06-22  Jeff Segars  <jeff@webempoweredchurch.org>
+
+       * Fixed bug #14814: Improve install tool texts.
+
 2010-06-13  Xavier Perseguers  <typo3@perseguers.ch>
 
        * Set version to 1.1.7 (TYPO3 4.4i RC1)
index 798f444..0fda238 100644 (file)
@@ -275,7 +275,8 @@ class tx_dbal_installtool {
                        'encryptionKey' => $instObj->createEncryptionKey(),
                        'branch' => TYPO3_branch,
                        'driver_options' => $driverOptionsSubPart,
-                       'continue' => 'Continue'
+                       'continue' => 'Continue',
+                       'llDescription' => '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.'
                );
                $subPartMarkers = array_merge($subPartMarkers, $driverMarkers);
 
@@ -464,7 +465,7 @@ class tx_dbal_installtool {
                                Host: <em>' . TYPO3_db_host . '</em>,
                                Using Password: YES)
                                <br />
-                               Go to Step 1 and enter a proper username/password!
+                               Go to Step 1 and enter a valid username and password!
                        </p>
                ';
 
@@ -539,7 +540,7 @@ class tx_dbal_installtool {
                                'step' => $instObj->step + 1,
                                'action' => htmlspecialchars($instObj->action),
                                'llOption2' => 'Select an EMPTY existing database:',
-                               'llRemark2' => 'All tables used by TYPO3 will be overwritten in step 3.',
+                               'llRemark2' => 'Any tables used by TYPO3 will be overwritten.',
                                'continue' => 'Continue'
                        );
                                // Add step marker for main template
index 36f9990..19925b7 100644 (file)
@@ -14,6 +14,7 @@
 <script type="text/javascript" src="../contrib/prototype/prototype.js"></script>
 <script type="text/javascript" src="../sysext/install/Resources/Public/Javascript/install.js"></script>
 
+<p>###LLDESCRIPTION###</p>
 <form method="post" action="###ACTION###">
        <fieldset class="t3-install-form-label-width-7">
                <ol>