From 88fbdb6e1e5a3f062aee274577fd9188508e4d04 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 29 Mar 2003 17:50:12 +0000 Subject: [PATCH] capitalized install script lang vars. git-svn-id: file:///svn/phpbb/trunk@3745 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/install.php | 114 ++++++++++++------------- phpBB/install/schemas/mysql_basic.sql | 2 +- phpBB/install/schemas/mysql_schema.sql | 2 +- phpBB/language/en/lang_admin.php | 82 +++++++++--------- phpBB/language/en/lang_main.php | 2 +- 5 files changed, 102 insertions(+), 100 deletions(-) diff --git a/phpBB/install/install.php b/phpBB/install/install.php index c02910bdca..d060f7acb7 100644 --- a/phpBB/install/install.php +++ b/phpBB/install/install.php @@ -215,27 +215,27 @@ else if (!empty($_POST['send_file']) && $_POST['send_file'] == 2 && !defined("PH $s_hidden_fields .= ''; } - page_header($lang['ftp_instructs']); + page_header($lang['FTP_INSTRUCTS']); ?> - + - + - + - + '; $s_hidden_fields .= ''; - page_header($lang['NoFTP_config'], "install.$phpEx"); + page_header($lang['NO_FTP_CONFIG'], "install.$phpEx"); if ($upgrade) { @@ -278,10 +278,10 @@ else if (!empty($_POST['ftp_file']) && !defined("PHPBB_INSTALLED")) } else { - page_common_form($s_hidden_fields, $lang['Download_config']); + page_common_form($s_hidden_fields, $lang['DOWNLOAD_CONFIG']); } - page_footer($lang['Download_config'], $s_hidden_fields); + page_footer($lang['DOWNLOAD_CONFIG'], $s_hidden_fields); exit; } else @@ -321,8 +321,8 @@ else if (!empty($_POST['ftp_file']) && !defined("PHPBB_INSTALLED")) // Log user in $auth->login($admin_name, $admin_pass1); - page_header($lang['Inst_Step_2'], "../adm/index.$phpEx$SID"); - page_footer($lang['Finish_Install'], $s_hidden_fields); + page_header($lang['INST_STEP_2'], "../adm/index.$phpEx$SID"); + page_footer($lang['FINISH_INSTALL'], $s_hidden_fields); exit; } } @@ -361,14 +361,14 @@ else if ((empty($install_step) || $admin_pass1 != $admin_pass2 || $board_email1 $script_path = preg_replace('#install\/install\.'.$phpEx.'#i', '', $_SERVER['PHP_SELF']); // Generate installation form - $instruction_text = $lang['Inst_Step_0']; + $instruction_text = $lang['INST_STEP_0']; if (!empty($install_step)) { if ((($_POST['admin_pass1'] != $_POST['admin_pass2'])) || (empty($_POST['admin_pass1']) || empty($dbhost)) && $_POST['cur_lang'] == $language) { - $error = $lang['Password_mismatch']; + $error = $lang['PASSWORD_MISMATCH']; } if ((($_POST['board_email1'] != $_POST['board_email2'])) || @@ -386,9 +386,9 @@ else if ((empty($install_step) || $admin_pass1 != $admin_pass2 || $board_email1 $dbms_options .= ''; } - $upgrade_option = ''; - $upgrade_option .= ''; - $upgrade_option .= ''; + $upgrade_option = ''; + $upgrade_option .= ''; + $upgrade_option .= ''; $s_hidden_fields = ''; @@ -396,45 +396,45 @@ else if ((empty($install_step) || $admin_pass1 != $admin_pass2 || $board_email1 ?> - + - : + : - : + : - : + : - + - : + : - : + : - : + : - : + : - : + : - + - : + : - : + : - : + : - : + : @@ -473,16 +473,16 @@ else if ((empty($install_step) || $admin_pass1 != $admin_pass2 || $board_email1 - : + : - : + : sql_query($sql)) { $error = $db->sql_error(); - page_header($lang['Install'], ''); - page_error($lang['Installer_Error'], $lang['Install_db_error'] . '
' . $error['message']); + page_header($lang['INSTALL'], ''); + page_error($lang['INSTALLER_ERROR'], $lang['INSTALL_DB_ERROR'] . '
' . $error['message']); page_footer(); exit; } @@ -634,8 +634,8 @@ else if (!$db->sql_query($sql)) { $error = $db->sql_error(); - page_header($lang['Install'], ''); - page_error($lang['Installer_Error'], $lang['Install_db_error'] . '
' . $error['message']); + page_header($lang['INSTALL'], ''); + page_error($lang['INSTALLER_ERROR'], $lang['INSTALL_DB_ERROR'] . '
' . $error['message']); page_footer(); exit; } @@ -688,8 +688,8 @@ else if (!$db->sql_query($sql)) { $error = $db->sql_error(); - page_header($lang['Install'], ''); - page_error($lang['Installer_Error'], $lang['Install_db_error'] . '
' . $error['message']); + page_header($lang['INSTALL'], ''); + page_error($lang['INSTALLER_ERROR'], $lang['INSTALL_DB_ERROR'] . '
' . $error['message']); page_footer(); exit; } @@ -724,24 +724,24 @@ else if (extension_loaded('ftp') && !defined('NO_FTP')) { - page_header($lang['Unwriteable_config'] . '

' . $lang['ftp_option'] . '

'); + page_header($lang['UNWRITEABLE_CONFIG'] . '

' . $lang['FTP_OPTION'] . '

'); ?> - + - + - + '; } @@ -766,7 +766,7 @@ else } else { - page_common_form($s_hidden_fields, $lang['Download_config']); + page_common_form($s_hidden_fields, $lang['DOWNLOAD_CONFIG']); } page_footer(); @@ -776,11 +776,11 @@ else $result = @fputs($fp, $config_data, strlen($config_data)); @fclose($fp); - $upgrade_now = $lang['upgrade_submit']; + $upgrade_now = $lang['UPGRADE_SUBMIT']; } // First off let's check and see if we are supposed to be doing an upgrade. - if ($upgrade && $upgrade_now == $lang['upgrade_submit']) + if ($upgrade && $upgrade_now == $lang['UPGRADE_SUBMIT']) { define('INSTALLING', true); require('upgrade.'.$phpEx); @@ -805,8 +805,8 @@ else // Log user in $auth->login($admin_name, $admin_pass1); - page_header($lang['Inst_Step_2'], "../adm/index.$phpEx$SID"); - page_footer($lang['Finish_Install'], $s_hidden_fields); + page_header($lang['INST_STEP_2'], "../adm/index.$phpEx$SID"); + page_footer($lang['FINISH_INSTALL'], $s_hidden_fields); exit; } } @@ -841,14 +841,14 @@ th { background-image: url('../adm/images/cellpic3.gif') } td.cat { background-image: url('../adm/images/cellpic1.gif') } //--> -<?php echo $lang['Welcome_install']; ?> +<?php echo $lang['WELCOME_INSTALL']; ?> - +
phpBB Logo            
@@ -903,10 +903,10 @@ function page_upgrade_form() ?> - + - + 'Remove topics that have not been posted to in', 'SET_NON_POSTABLE' => 'Set this forum as non-postable and', 'Forum_delete' => 'Delete Forum', - 'Update' => 'Update', + 'UPDATE' => 'Update', 'Forum_delete_explain' => 'The form below will allow you to delete a forum (or category) and decide where you want to put all topics (or forums) it contained.', 'Move_and_Delete' => 'Move and Delete', 'Move_posts_to' => 'Move posts to', @@ -813,50 +813,52 @@ $lang = array_merge($lang, array( 'EVT_CREATED' => 'The event has been successfully created.', - 'Welcome_install' => 'Welcome to phpBB 2 Installation', - 'Initial_config' => 'Basic Configuration', - 'DB_config' => 'Database Configuration', - 'Admin_config' => 'Admin Configuration', - 'continue_upgrade' => 'Once you have downloaded your config file to your local machine you may\'Continue Upgrade\' button below to move forward with the upgrade process. Please wait to upload the config file until the upgrade process is complete.', - 'upgrade_submit' => 'Continue Upgrade', - 'Installer_Error' => 'An error has occurred during installation', + 'WELCOME_INSTALL' => 'Welcome to phpBB 2 Installation', + 'INITIAL_CONFIG' => 'Basic Configuration', + 'DB_CONFIG' => 'Database Configuration', + 'ADMIN_CONFIG' => 'Admin Configuration', + 'CONTINUE_UPGRADE' => 'Once you have downloaded your config file to your local machine you may\'Continue Upgrade\' button below to move forward with the upgrade process. Please wait to upload the config file until the upgrade process is complete.', + 'UPGRADE_SUBMIT' => 'Continue Upgrade', + 'INSTALLER_ERROR' => 'An error has occurred during installation', 'Previous_Install' => 'A previous installation has been detected', - 'Install_db_error' => 'An error occurred trying to update the database', + 'INSTALL_DB_ERROR' => 'An error occurred trying to update the database', + 'INSTALL_EMAIL_MISMATCH' => 'The emails you entered did not match', 'Re_install' => 'Your previous installation is still active.

If you would like to re-install phpBB 2 you should click the Yes button below. Please be aware that doing so will destroy all existing data, no backups will be made! The administrator username and password you have used to login in to the board will be re-created after the re-installation, no other settings will be retained.

Think carefully before pressing Yes!', - 'Inst_Step_0' => 'Thank you for choosing phpBB 2. In order to complete this install please fill out the details requested below. Please note that the database you install into should already exist. If you are installing to a database that uses ODBC, e.g. MS Access you should first create a DSN for it before proceeding.', - 'Start_Install' => 'Start Install', - 'Finish_Install' => 'Finish Installation', - 'Default_lang' => 'Default board language', - 'DB_Host' => 'Database Server Hostname / DSN', - 'DB_Name' => 'Your Database Name', - 'DB_Username' => 'Database Username', - 'DB_Password' => 'Database Password', + 'INST_STEP_0' => 'Thank you for choosing phpBB 2. In order to complete this install please fill out the details requested below. Please note that the database you install into should already exist. If you are installing to a database that uses ODBC, e.g. MS Access you should first create a DSN for it before proceeding.', + 'START_INSTALL' => 'Start Install', + 'FINISH_INSTALL' => 'Finish Installation', + 'DEFAULT_LANG' => 'Default board language', + 'DB_HOST' => 'Database Server Hostname / DSN', + 'DB_NAME' => 'Your Database Name', + 'DB_USERNAME' => 'Database Username', + 'DB_PASSWORD' => 'Database Password', 'Database' => 'Your Database', 'Install_lang' => 'Choose Language for Installation', - 'dbms' => 'Database Type', - 'Table_Prefix' => 'Prefix for tables in database', - 'Admin_Username' => 'Administrator Username', - 'Admin_Password' => 'Administrator Password', - 'Admin_Password_confirm' => 'Administrator Password [ Confirm ]', - 'Inst_Step_2' => 'Your admin username has been created. At this point your basic installation is complete. You will now be taken to a screen which will allow you to administer your new installation. Please be sure to check the General Configuration details and make any required changes. Thank you for choosing phpBB 2.', - 'Unwriteable_config' => 'Your config file is un-writeable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.', - 'Download_config' => 'Download Config', - 'ftp_choose' => 'Choose Download Method', - 'ftp_option' => '
Since FTP extensions are enabled in this version of PHP you may also be given the option of first trying to automatically ftp the config file into place.', - 'ftp_instructs' => 'You have chosen to ftp the file to the account containing phpBB 2 automatically. Please enter the information below to facilitate this process. Note that the FTP path should be the exact path via ftp to your phpBB2 installation as if you were ftping to it using any normal client.', - 'ftp_info' => 'Enter Your FTP Information', - 'Attempt_ftp' => 'Attempt to ftp config file into place', - 'Send_file' => 'Just send the file to me and I will ftp it manually', - 'ftp_path' => 'FTP path to phpBB 2', - 'ftp_username' => 'Your FTP Username', - 'ftp_password' => 'Your FTP Password', - 'Transfer_config' => 'Start Transfer', - 'NoFTP_config' => 'The attempt to ftp the config file into place failed. Please download the config file and ftp it into place manually.', - 'Install' => 'Install', - 'Upgrade' => 'Upgrade', - 'Install_Method' => 'Choose your installation method', + 'DBMS' => 'Database Type', + 'TABLE_PREFIX' => 'Prefix for tables in database', + 'ADMIN_USERNAME' => 'Administrator Username', + 'ADMIN_EMAIL_CONFIRM' => 'Admin Email Address [ Confirm ]', + 'ADMIN_PASSWORD' => 'Administrator Password', + 'ADMIN_PASSWORD_CONFIRM' => 'Administrator Password [ Confirm ]', + 'INST_STEP_2' => 'Your admin username has been created. At this point your basic installation is complete. You will now be taken to a screen which will allow you to administer your new installation. Please be sure to check the General Configuration details and make any required changes. Thank you for choosing phpBB 2.', + 'UNWRITEABLE_CONFIG' => 'Your config file is un-writeable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.', + 'DOWNLOAD_CONFIG' => 'Download Config', + 'FTP_CHOOSE' => 'Choose Download Method', + 'FTP_OPTION' => '
Since FTP extensions are enabled in this version of PHP you may also be given the option of first trying to automatically ftp the config file into place.', + 'FTP_INSTRUCTS' => 'You have chosen to ftp the file to the account containing phpBB 2 automatically. Please enter the information below to facilitate this process. Note that the FTP path should be the exact path via ftp to your phpBB2 installation as if you were ftping to it using any normal client.', + 'FTP_INFO' => 'Enter Your FTP Information', + 'ATTEMPT_FTP' => 'Attempt to ftp config file into place', + 'SEND_FILE' => 'Just send the file to me and I will ftp it manually', + 'FTP_PATH' => 'FTP path to phpBB 2', + 'FTP_USERNAME' => 'Your FTP Username', + 'FTP_PASSWORD' => 'Your FTP Password', + 'TRANSFER_CONFIG' => 'Start Transfer', + 'NO_FTP_CONFIG' => 'The attempt to ftp the config file into place failed. Please download the config file and ftp it into place manually.', + 'INSTALL' => 'Install', + 'UPGRADE' => 'Upgrade', + 'INSTALL_METHOD' => 'Choose your installation method', 'Install_No_PHP4' => 'phpBB2 requires you have at least PHP 4.0.4 installed

Contact your hosting provider or see www.php.net for more information', - 'Install_No_Ext' => 'The PHP configuration on your server does not support the database type that you choose

Contact your hosting provider or see www.php.net for more information', + 'INSTALL_EXT_FAILED' => 'The PHP configuration on your server does not support the database type that you choose

Contact your hosting provider or see www.php.net for more information', 'Install_No_PCRE' => 'phpBB2 requires the Perl-Compatible Regular Expressions module for PHP to be available

Contact your hosting provider or see www.php.net for more information', )); diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php index 6f79db1279..5784977934 100644 --- a/phpBB/language/en/lang_main.php +++ b/phpBB/language/en/lang_main.php @@ -605,7 +605,7 @@ $lang = array( 'Hide_user' => 'Hide your online status', 'Profile_updated' => 'Your profile has been updated', 'Profile_updated_inactive' => 'Your profile has been updated, however you have changed vital details thus your account is now inactive. Check your email to find out how to reactivate your account, or if admin activation is require wait for the administrator to reactivate your account', - 'Password_mismatch' => 'The passwords you entered did not match', + 'PASSWORD_MISMATCH' => 'The passwords you entered did not match', 'Current_password_mismatch' => 'The current password you supplied does not match that stored in the database', 'Password_long' => 'Your password must be no more than 32 characters', 'Username_taken' => 'Sorry but this username has already been taken',