diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-10-10 17:27:34 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-10-10 17:27:34 +0000 |
| commit | e5a8bda3ff47536c7ab49106ed7b8b0bbc15e4fb (patch) | |
| tree | 8f939a9998c87d00d8f25c1ea501a33567f0a4d8 /phpBB/language | |
| parent | b40867655544c2f2cb70e1dea5d224ae8e7a20cf (diff) | |
| download | forums-e5a8bda3ff47536c7ab49106ed7b8b0bbc15e4fb.tar forums-e5a8bda3ff47536c7ab49106ed7b8b0bbc15e4fb.tar.gz forums-e5a8bda3ff47536c7ab49106ed7b8b0bbc15e4fb.tar.bz2 forums-e5a8bda3ff47536c7ab49106ed7b8b0bbc15e4fb.tar.xz forums-e5a8bda3ff47536c7ab49106ed7b8b0bbc15e4fb.zip | |
Added Send New Password functions + added check for current password when changing
git-svn-id: file:///svn/phpbb/trunk@1155 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/email/admin_welcome_activated_english.tpl | 2 | ||||
| -rw-r--r-- | phpBB/language/email/user_activate_passwd_english.tpl | 15 | ||||
| -rwxr-xr-x | phpBB/language/lang_english.php | 46 |
3 files changed, 27 insertions, 36 deletions
diff --git a/phpBB/language/email/admin_welcome_activated_english.tpl b/phpBB/language/email/admin_welcome_activated_english.tpl index 1fbed221ba..f467754474 100644 --- a/phpBB/language/email/admin_welcome_activated_english.tpl +++ b/phpBB/language/email/admin_welcome_activated_english.tpl @@ -1,5 +1,5 @@ Hello {USERNAME}, -Your account has now been activated, you may login using the username and password you received in a previous email. +Your account on "{SITENAME}" has now been activated, you may login using the username and password you received in a previous email. {EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/email/user_activate_passwd_english.tpl b/phpBB/language/email/user_activate_passwd_english.tpl new file mode 100644 index 0000000000..2b79f4f1dd --- /dev/null +++ b/phpBB/language/email/user_activate_passwd_english.tpl @@ -0,0 +1,15 @@ +Hello {USERNAME} + +You are receiving this email because you have (or someone pretending to be you has) requested a new password be sent for your account on {SITENAME}. If you did not request this email then please ignore it, if you keep receiving it please contact the board administrator. + +To use the new password you need to activate it. To do this click the link provided below. + +Activation: {U_ACTIVATE} + +If sucessful you will be able to login using the following password: + +Password: {PASSWORD} + +You can of course change this password yourself via the profile page. If you have any difficulties please contact the board administrator. + +{EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index 7a4a42483c..5abec9f15a 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -450,6 +450,9 @@ $lang['Signature'] = "Signature"; $lang['Signature_explain'] = "This is a block of text that can be added to posts you make. There is a 255 character limit"; $lang['Public_view_email'] = "Always show my Email Address"; +$lang['Current_password'] = "Current password"; +$lang['New_password'] = "New password"; +$lang['Confirm_password'] = "Confirm password"; $lang['password_if_changed'] = "You only need to supply a password if you want to change it"; $lang['password_confirm_if_changed'] = "You only need to confirm your password if you changed it above"; @@ -480,6 +483,7 @@ $lang['Profile_updated'] = "Your profile has been updated"; $lang['to_return_index'] = "to return to the index"; $lang['Password_mismatch'] = "The passwords you entered did not match"; +$lang['Current_password_mismatch'] = "The current password you supplied does not match that stored in the database"; $lang['Invalid_username'] = "The username you requested has been taken or disallowed"; $lang['Signature_too_long'] = "Your signature is too long"; $lang['Fields_empty'] = "You must fill in the required fields"; @@ -501,6 +505,13 @@ $lang['Reactivate'] = "Reactivate your account!"; $lang['COPPA'] = "Your account has been created but has to be approved, please check your email for details."; $lang['Welcome_COPPA'] = "Your account has been created, however in complance with the COPPA act you must print out this page and have you parent or guardian mail it to: <br />" . $lang['Mailing_address'] . "<br />Or fax it to: <br />" . $lang['Fax_info'] . "<br /> Once this information has been received your account will be activated by the administrator and you will receive an email notification."; +$lang['Wrong_activation'] = "The activation key you supplied does not match any in the database"; +$lang['Send_password'] = "Send me a new password"; +$lang['Password_updated'] = "A new password has been created, please check your email for details on how to activate it"; +$lang['No_email_match'] = "The email address you supplied does not match the one listed for that username"; +$lang['New_password_activation'] = "New password activation"; +$lang['Password_activated'] = "Your account has been re-activated. To logon please use the password supplied in the email you received"; + // // Memberslist // @@ -994,39 +1005,4 @@ $lang['Download_config'] = "Download Config"; // End // ------------------------------------------------- -// ------------------------------------------------- -// Old format ... _DON'T_add_any_ new entries here!! -// - -// Sendpasswd -$l_wrongactiv = "The activation key you provided is not correct. Please check email $l_message you recived and make sure you have copied the activation key exactly."; -$l_passchange = "Your password has been successfully changed. You may now goto your <a href=\"bb_profile.$phpEx?mode=edit\">profile</a> and change your password to a more suitable one."; -$l_wrongmail = "The email address you entered does not match the one stored in our database."; - -$l_passsubj = "$sitename Forums Password Change"; - -$l_pwdmessage = "Dear $checkinfo[username], -You are receiving this email because you (or someone pretending to be you) -has requested a passwordchange on $sitename forums. If you believe you have -received this message in error simply delete it and your password will remain -the same. - -Your new password as generated by the forums is: $newpw - -In order for this change to take effect you must visit this page: - - http://$SERVER_NAME$PHP_SELF?actkey=$key - -Once you have visited the page your password will be changed in our database, -and you may login to the profile section and change it as desired. - -Thank you for using $sitename Forums - -"; - -$l_passsent = "Your password has changed to a new, random, password. Please check your email on how to complete the password change procedure."; -$l_emailpass = "Email Lost Password"; -$l_passexplain = "Please fill out the form, a new password will be sent to your Email address"; -$l_sendpass = "Send Password"; - ?>
\ No newline at end of file |