diff --git a/phpBB/install/install.php b/phpBB/install/install.php
index ca9c685df8..d62131e50d 100644
--- a/phpBB/install/install.php
+++ b/phpBB/install/install.php
@@ -90,7 +90,6 @@ $available_dbms = array(
'SCHEMA' => 'firebird',
'MODULE' => 'interbase',
'DELIM' => ';',
- 'DELIM_BASIC' => ';',
'COMMENTS' => 'remove_remarks'
),
'mysql' => array(
@@ -98,7 +97,6 @@ $available_dbms = array(
'SCHEMA' => 'mysql',
'MODULE' => 'mysql',
'DELIM' => ';',
- 'DELIM_BASIC' => ';',
'COMMENTS' => 'remove_remarks'
),
'mysql4' => array(
@@ -106,7 +104,6 @@ $available_dbms = array(
'SCHEMA' => 'mysql',
'MODULE' => 'mysql',
'DELIM' => ';',
- 'DELIM_BASIC' => ';',
'COMMENTS' => 'remove_remarks'
),
'mssql' => array(
@@ -114,7 +111,6 @@ $available_dbms = array(
'SCHEMA' => 'mssql',
'MODULE' => 'mssql',
'DELIM' => 'GO',
- 'DELIM_BASIC' => ';',
'COMMENTS' => 'remove_comments'
),
'msaccess' => array(
@@ -122,7 +118,6 @@ $available_dbms = array(
'SCHEMA' => '',
'MODULE' => 'odbc',
'DELIM' => '',
- 'DELIM_BASIC' => ';',
'COMMENTS' => ''
),
'mssql-odbc'=> array(
@@ -130,7 +125,6 @@ $available_dbms = array(
'SCHEMA' => 'mssql',
'MODULE' => 'odbc',
'DELIM' => 'GO',
- 'DELIM_BASIC' => ';',
'COMMENTS' => 'remove_comments'
),
'oracle' => array(
@@ -138,7 +132,6 @@ $available_dbms = array(
'SCHEMA' => 'oracle',
'MODULE' => 'oracle',
'DELIM' => '',
- 'DELIM_BASIC' => ';',
'COMMENTS' => 'remove_comments'
),
'postgres' => array(
@@ -146,7 +139,6 @@ $available_dbms = array(
'SCHEMA' => 'postgres',
'MODULE' => 'pgsql',
'DELIM' => ';',
- 'DELIM_BASIC' => ';',
'COMMENTS' => 'remove_comments'
),
);
@@ -233,7 +225,7 @@ else if (isset($_POST['install']))
{
if (!$$var)
{
- $error[$var_type][] = 'You must fill out all fields in this block';
+ $error[$var_type][] = $lang['INST_ERR_MISSING_DATA'];
break;
}
}
@@ -242,12 +234,12 @@ else if (isset($_POST['install']))
// Check the entered email address and password
if ($admin_pass1 != $admin_pass2 && $admin_pass1 != '')
{
- $error['admin'][] = $lang['INSTALL_PASSWORD_MISMATCH'];
+ $error['admin'][] = $lang['INST_ERR_PASSWORD_MISMATCH'];
}
if ($board_email1 != $board_email2 && $board_email1 != '')
{
- $error['admin'][] = $lang['INSTALL_EMAIL_MISMATCH'];
+ $error['admin'][] = $lang['INST_ERR_EMAIL_MISMATCH'];
}
// Test the database connectivity
@@ -255,7 +247,7 @@ else if (isset($_POST['install']))
{
if (!can_load_dll($available_dbms[$dbms]['MODULE']))
{
- $error['db'][] = 'Cannot load the PHP module for the selected database type';
+ $error['db'][] = $lang['INST_ERR_NO_DB'];
}
}
@@ -270,7 +262,7 @@ else if (isset($_POST['install']))
if (is_array($db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false)))
{
$db_error = $db->sql_error();
- $error['db'][] = 'Could not connect to the database, error message returned:' . '
' . (($db_error['message']) ? $db_error['message'] : 'No error message given');
+ $error['db'][] = $lang['INST_ERR_DB_CONNECT'] . '
' . (($db_error['message']) ? $db_error['message'] : $lang['INST_ERR_DB_NO_ERROR']);
}
// No errors so lets do the twist
@@ -326,11 +318,11 @@ if ($stage == 0)
{
if (!can_load_dll($dll))
{
- $dlls_other[$dll] = '' . 'Unavailable' . '';
+ $dlls_other[$dll] = '' . $lang['UNAVAILABLE'] . '';
continue;
}
}
- $dlls_other[$dll] = '' . 'Available' . '';
+ $dlls_other[$dll] = '' . $lang['AVAILABLE'] . '';
}
inst_page_header();
@@ -444,11 +436,11 @@ if ($stage == 0)
In order to function correctly phpBB needs to be able to access or write to certain files or directories. If you see "Does not exist" you need to create the relevant file or directory. If you see "Not writeable" you need to change the permissions on the file or directory to allow phpBB to write to it.
+These files, directories or permissions are optional. The installation routines will attempt to use various techniques to complete if they do not exist or cannot be written to. However, the presence of these files, directories or permissions will speed installation.
+