MDL-23322 Fixed incorrect definition of installer strings

ds125v · Jul 23, 2010 · 85ed076 · 85ed076
1 parent 25d3cf4
commit 85ed076
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/install.php b/install.php
@@ -494,7 +494,7 @@
     if ($version_fail or $curl_fail or $zip_fail) {
         $config->stage = INSTALL_ENVIRONMENT;
 
-        install_print_header($config, get_string('environment', 'install'),
+        install_print_header($config, get_string('environmenthead', 'install'),
                                       get_string('errorsinenvironment', 'install'),
                                       get_string('environmentsub2', 'install'));
 

diff --git a/install/stringnames.txt b/install/stringnames.txt
@@ -29,9 +29,9 @@ dataroot,install
 dbprefix,install
 dirroot,install
 downloadedfilecheckfailed,error
-environment,install
-environmentrequireinstall,install
-environmentrequireversion,install
+environmenthead,install
+environmentrequireinstall,admin
+environmentrequireversion,admin
 environmentsub2,install
 errorsinenvironment,install
 installation,install
@@ -57,7 +57,7 @@ phpextension,install
 phpversionhelp,install
 phpversion,install
 previous,moodle
-reload,admin
+reload,moodle
 remotedownloaderror,error
 thisdirection,langconfig
 thislanguage,langconfig

diff --git a/lang/en/install.php b/lang/en/install.php
@@ -24,7 +24,7 @@
  */
 
 $string['admindirerror'] = 'The admin directory specified is incorrect';
-$string['admindirname'] = 'Admin Directory';
+$string['admindirname'] = 'Admin directory';
 $string['admindirsetting'] = 'A very few webhosts use /admin as a special URL for you to access a 
     control panel or something.  Unfortunately this conflicts with the 
     standard location for the Moodle admin pages.  You can fix this by 

diff --git a/lib/installlib.php b/lib/installlib.php
@@ -300,7 +300,7 @@ function install_print_footer($config, $reload=false) {
     if ($config->stage > INSTALL_WELCOME) {
         $first = '<input type="submit" id="previousbutton" name="previous" value="&laquo; '.s(get_string('previous')).'" />';
     } else {
-        $first = '<input type="submit" id="previousbutton" name="next" value="'.s(get_string('reload', 'admin')).'" />';
+        $first = '<input type="submit" id="previousbutton" name="next" value="'.s(get_string('reload')).'" />';
         $first .= '<script type="text/javascript">
 //<![CDATA[
     var first = document.getElementById("previousbutton");
@@ -311,7 +311,7 @@ function install_print_footer($config, $reload=false) {
     }
 
     if ($reload) {
-        $next = '<input type="submit" id="nextbutton" name="next" value="'.s(get_string('reload', 'admin')).'" />';
+        $next = '<input type="submit" id="nextbutton" name="next" value="'.s(get_string('reload')).'" />';
     } else {
         $next = '<input type="submit" id="nextbutton" name="next" value="'.s(get_string('next')).' &raquo;" />';
     }