aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/email
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-09-09 23:22:29 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-09-09 23:22:29 +0000
commitc0ac873a086d0d118fde15fbf5a13fed7c64af24 (patch)
treee8538ebd5262f9602b969b8e09ea79e550b7c23b /phpBB/language/email
parent375e4d9903fe8faab63c275a250edc913eabae97 (diff)
downloadforums-c0ac873a086d0d118fde15fbf5a13fed7c64af24.tar
forums-c0ac873a086d0d118fde15fbf5a13fed7c64af24.tar.gz
forums-c0ac873a086d0d118fde15fbf5a13fed7c64af24.tar.bz2
forums-c0ac873a086d0d118fde15fbf5a13fed7c64af24.tar.xz
forums-c0ac873a086d0d118fde15fbf5a13fed7c64af24.zip
Combined theme/templates in profile as suggested, added META refresh and made a couple of other changes
git-svn-id: file:///svn/phpbb/trunk@1018 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/email')
-rwxr-xr-xphpBB/language/email/activate_english.tpl6
-rwxr-xr-xphpBB/language/email/welcome_inactive_english.tpl9
2 files changed, 6 insertions, 9 deletions
diff --git a/phpBB/language/email/activate_english.tpl b/phpBB/language/email/activate_english.tpl
index a29ee1306d..5d9457814e 100755
--- a/phpBB/language/email/activate_english.tpl
+++ b/phpBB/language/email/activate_english.tpl
@@ -1,6 +1,6 @@
-Your account on {SITENAME} has been deactivated, most likily due to changes
-made to your profile. In order to reactivate your account you must click
-on the link below:
+Hello {USERNAME},
+
+Your account on {SITENAME} has been deactivated, most likely due to changes made to your profile. In order to reactivate your account you must click on the link below:
{U_ACTIVATE}
diff --git a/phpBB/language/email/welcome_inactive_english.tpl b/phpBB/language/email/welcome_inactive_english.tpl
index 338fb8d145..81e4d41c12 100755
--- a/phpBB/language/email/welcome_inactive_english.tpl
+++ b/phpBB/language/email/welcome_inactive_english.tpl
@@ -1,8 +1,6 @@
{WELCOME_MSG}
-Please keep this email for your records.
-
-Your account information is as follows:
+Please keep this email for your records. Your account information is as follows:
----------------------------
Username: {USERNAME}
@@ -11,10 +9,9 @@ Password: {PASSWORD}
Your account is currently inactive. You cannot use it until you visit the following link:
-{ACTIVATE_URL}
+{U_ACTIVATE}
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you.
-However, should you forget your password you can request a new one which will be activated in the same way as this account.
+Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
Thank you for registering.