# HG changeset patch
# User Dan
# Date 1195695950 18000
# Node ID 53ba55d33abb392992e67f6c5c2a52ce79b24e19
# Parent  f088805540aea5720cbd2a0ce9919dcfcbc1fac4
Language fix in the install script; fix username regex in install script login page javascript validation

diff -r f088805540ae -r 53ba55d33abb install.php
--- a/install.php	Sun Nov 18 20:37:08 2007 -0500
+++ b/install.php	Wed Nov 21 20:45:50 2007 -0500
@@ -1207,7 +1207,7 @@
           document.getElementById('s_db_host').src='images/bad.gif';
           ret = false;
         }
-        if(frm.db_name.value.match(/^([a-z0-9_]+)$/g))
+        if(frm.db_name.value.match(/^([a-z0-9_-]+)$/g))
         {
           document.getElementById('s_db_name').src='images/unknown.gif';
         }
diff -r f088805540ae -r 53ba55d33abb language/english/install.json
--- a/language/english/install.json	Sun Nov 18 20:37:08 2007 -0500
+++ b/language/english/install.json	Wed Nov 21 20:45:50 2007 -0500
@@ -210,7 +210,7 @@
       stg_writeconfig_title: 'Write configuration files',
       stg_writeconfig_body: 'Enano was unable to write the configuration file with your site\'s database credentials. This is almost always because your configuration file does not have the correct permissions. On Windows servers, you may see this message even if the check on the System Requirements page passed. Temporarily running IIS as the Administrator user may help.',
       stg_rename_title: 'Rename configuration files',
-      stg_rename_body: 'Enano couldn\'t rename the configuration files to their correct production names. On some UNIX systems, you need to CHMOD the directory with your Enano files to 777 in order for this stage to succeed.',
+      stg_rename_body: 'Enano couldn\'t rename the configuration files to their correct production names. Please CHMOD the folder where your Enano files are to 777 and click the retry button below, <b><u>or</u></b> perform the following rename operations and then <a href="install.php?mode=finish">finish the installation</a>.<ul><li>Rename config.new.php to config.php</li><li>Rename .htaccess.new to .htaccess (only if you selected Tiny URLs)</li></ul>',
       stg_startapi_title: 'Start the Enano API',
       stg_startapi_body: 'The Enano API could not be started. This is an error that should never occur; please contact the Enano team for support.',
       stg_importlang_title: 'Import default language',