Changeset 1585

Timestamp:

04/05/08 20:24:35 (5 months ago)

Author:

Neal

Message:

Moved more hardcoded strings out of install.php and into the language files.

Files:

• branches/punbb-1.3-dev/upload/install.php (modified) (9 diffs)
• branches/punbb-1.3-dev/upload/lang/English/install.php (modified) (1 diff)

branches/punbb-1.3-dev/upload/install.php

@@ -92 +92 @@
-
-        if (empty($db_extensions))
-'This PHP environment does not have support for any of the databases that PunBB supports. PHP needs to have support for either MySQL, PostgreSQL or SQLite in order for PunBB to be installed.'
+$lang_install['No database support']
-
-        // Make an educated guess regarding base_url
@@ -339 +339 @@
-        // Validate form
-        if (pun_strlen($db_name) == 0)
-'You must enter a database name. Please go back and correct.'
+$lang_install['Missing database name']
-        if (pun_strlen($username) < 2)
-
+
+
+
-        if (pun_strlen($password1) < 4)
-'Passwords must be at least 4 characters long. Please go back and correct.'
+$lang_install['Pass too short']
-        if ($password1 != $password2)
-'Passwords do not match. Please go back and correct.'
+$lang_install['Pass not match']
-        if (strtolower($username) == 'guest')
-'The username guest is reserved. Please go back and correct.'
+$lang_install['Username guest']
-        if (preg_match('/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/', $username))
-
+
+
+
-        if (preg_match('#\[b\]|\[/b\]|\[u\]|\[/u\]|\[i\]|\[/i\]|\[color|\[/color\]|\[quote\]|\[/quote\]|\[code\]|\[/code\]|\[img\]|\[/img\]|\[url|\[/url\]|\[email|\[/email\]#i', $username))
-'Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please go back and correct.'
+$lang_install['Username BBCode']
-
-        // Validate email
-        if (strlen($email) > 80 || !preg_match('/^(([^<>()[\]\\.,;:\s@"\']+(\.[^<>()[\]\\.,;:\s@"\']+)*)|("[^"\']+"))@((\[\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\])|(([a-zA-Z\d\-]+\.)+[a-zA-Z]{2,}))$/', $email))
-'The administrator e-mail address you entered is invalid. Please go back and correct.'
+$lang_install['Invalid email']
-
-        // Make sure board title and description aren't left blank
@@ -364 +368 @@
-
-        if (pun_strlen($base_url) == 0)
-'You must enter a base URL. Please go back and correct.'
+$lang_install['Missing base url']
-
-
@@ -387 +391 @@
-
-                default:
-'\''.$db_type.'\' is not a valid database type.'
+sprintf($lang_install['No such database type'], $db_type)
-        }
-
@@ -400 +404 @@
-                $mysql_version = $db->result($result);
-                if (version_compare($mysql_version, MIN_MYSQL_VERSION, '<'))
-'You are running MySQL version '.$mysql_version.'. PunBB requires at least MySQL '.MIN_MYSQL_VERSION.' to run properly. You must upgrade your MySQL installation before you can continue.'
+sprintf($lang_install['Invalid MySQL version'], $mysql_version, MIN_MYSQL_VERSION)
-        }
-
-        // Validate prefix
-        if (strlen($db_prefix) > 0 && (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $db_prefix) || strlen($db_prefix) > 40))
-'The table prefix \''.$db_prefix.'\' contains illegal characters or is too long. The prefix may contain the letters a to z, any numbers and the underscore character. They must however not start with a number. The maximum length is 40 characters. Please choose a different prefix.'
+sprintf($lang_install['Invalid table prefix'], $db_prefix)
-
-        // Check SQLite prefix collision
-        if ($db_type == 'sqlite' && strtolower($db_prefix) == 'sqlite_')
-'The table prefix \'sqlite_\' is reserved for use by the SQLite engine. Please choose a different prefix.'
+$lang_install['SQLite prefix collision']
-
-
@@ -415 +419 @@
-        $result = $db->query('SELECT 1 FROM '.$db_prefix.'users WHERE id=1');
-        if ($db->num_rows($result))
-'A table called "'.$db_prefix.'users" is already present in the database "'.$db_name.'". This could mean that PunBB is already installed or that another piece of software is installed and is occupying one or more of the table names PunBB requires. If you want to install multiple copies of PunBB in the same database, you must choose a different table prefix.'
+sprintf($lang_install['PunBB already installed'], $db_prefix, $db_name)
-
-
@@ -1503 +1507 @@
-                'o_regs_verify'                         => "'0'",
-                'o_announcement'                        => "'0'",
-Sample announcement
-<p>Enter your announcement here.</p>
+".$lang_install['Default announce heading']."
+".$lang_install['Default announce message']."
-                'o_rules'                                       => "'0'",
-Enter your rules here.
+".$lang_install['Default rules']."
-                'o_maintenance'                         => "'0'",
-The forums are temporarily down for maintenance. Please try again in a few minutes.<br />\\n<br />\\n/Administrator
+".$lang_install['Default maint message']."
-                'p_message_bbcode'                      => "'1'",
-                'p_message_img_tag'                     => "'1'",
@@ -1527 +1531 @@
-
-        // Insert some other default data
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-        // Add new post to search table
@@ -1544 +1546 @@
-        }
-
-New member
-Member
+".$lang_install['Default rank 1']."
+".$lang_install['Default rank 2']."
-
-

branches/punbb-1.3-dev/upload/lang/English/install.php

@@ -61 +61 @@
-'Start install'                         =>      'Start install', // Label for submit button
-
+// Install errors
+'No database support'           =>      'This PHP environment does not have support for any of the databases that PunBB supports. PHP needs to have support for either MySQL, PostgreSQL or SQLite in order for PunBB to be installed.',
+'Missing database name'         =>      'You must enter a database name. Please go back and correct.',
+'Username too long'                     =>      'Usernames must be no more than 25 characters long. Please go back and correct.',
+'Username too short'            =>      'Usernames must be at least 2 characters long. Please go back and correct.',
+'Pass too short'                        =>      'Passwords must be at least 4 characters long. Please go back and correct.',
+'Pass not match'                        =>      'Passwords do not match. Please go back and correct.',
+'Username guest'                        =>      'The username guest is reserved. Please go back and correct.',
+'Username BBCode'                       =>      'Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please go back and correct.',
+'Username reserved chars'       =>      'Usernames may not contain all the characters \', " and [ or ] at once. Please go back and correct.',
+'Username IP'                           =>      'Usernames may not be in the form of an IP address. Please go back and correct.',
+'Invalid email'                         =>      'The administrator e-mail address you entered is invalid. Please go back and correct.',
+'Missing base url'                      =>      'You must enter a base URL. Please go back and correct.',
+'No such database type'         =>      '\'%s\' is not a valid database type.',
+'Invalid MySQL version'         =>      'You are running MySQL version %1$s. PunBB requires at least MySQL %2$s to run properly. You must upgrade your MySQL installation before you can continue.',
+'Invalid table prefix'          =>      'The table prefix \'%s\' contains illegal characters or is too long. The prefix may contain the letters a to z, any numbers and the underscore character. They must however not start with a number. The maximum length is 40 characters. Please choose a different prefix.',
+'SQLite prefix collision'       =>      'The table prefix \'sqlite_\' is reserved for use by the SQLite engine. Please choose a different prefix.',
+'PunBB already installed'       =>      'A table called "%1$susers" is already present in the database "%2$s". This could mean that PunBB is already installed or that another piece of software is installed and is occupying one or more of the table names PunBB requires. If you want to install multiple copies of PunBB in the same database, you must choose a different table prefix.',
+
+// Used in the install
+'Default announce heading'      =>      'Sample announcement',
+'Default announce message'      =>      '<p>Enter your announcement here.</p>',
+'Default maint message'         =>      "The forums are temporarily down for maintenance. Please try again in a few minutes.<br />\\n<br />\\n/Administrator",
+'Default rules'                         =>      'Enter your rules here.',
+'Default category name'         =>      'Test category',
+'Default forum name'            =>      'Test forum',
+'Default forum descrip'         =>      'This is just a test forum',
+'Default topic subject'         =>      'Test post',
+'Default post contents'         =>      'If you are looking at this (which I guess you are), the install of PunBB appears to have worked! Now log in and head over to the administration control panel to configure your forum.',
+'Default rank 1'                        =>      'New member',
+'Default rank 2'                        =>      'Member',
+
-// Installation completed form
-'Success description'           =>      'Congratulations! PunBB %s has been successfully installed.',