aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/email
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-10-10 17:27:34 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-10-10 17:27:34 +0000
commite5a8bda3ff47536c7ab49106ed7b8b0bbc15e4fb (patch)
tree8f939a9998c87d00d8f25c1ea501a33567f0a4d8 /phpBB/language/email
parentb40867655544c2f2cb70e1dea5d224ae8e7a20cf (diff)
downloadforums-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/email')
-rw-r--r--phpBB/language/email/admin_welcome_activated_english.tpl2
-rw-r--r--phpBB/language/email/user_activate_passwd_english.tpl15
2 files changed, 16 insertions, 1 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