diff options
| author | James Atkinson <thefinn@users.sourceforge.net> | 2001-08-13 01:07:14 +0000 |
|---|---|---|
| committer | James Atkinson <thefinn@users.sourceforge.net> | 2001-08-13 01:07:14 +0000 |
| commit | df3da5934dfcbb50c5aa076515c40ae487a733b3 (patch) | |
| tree | 36106b052fb0f1eb1b6b83c51c02944658456645 /phpBB/language | |
| parent | 887bef5659e15319e087bc28c96ce25df44affa2 (diff) | |
| download | forums-df3da5934dfcbb50c5aa076515c40ae487a733b3.tar forums-df3da5934dfcbb50c5aa076515c40ae487a733b3.tar.gz forums-df3da5934dfcbb50c5aa076515c40ae487a733b3.tar.bz2 forums-df3da5934dfcbb50c5aa076515c40ae487a733b3.tar.xz forums-df3da5934dfcbb50c5aa076515c40ae487a733b3.zip | |
Added emailer class, did alterations and templates for registration
Welcome message vars can be removed from lang file
git-svn-id: file:///svn/phpbb/trunk@844 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rwxr-xr-x | phpBB/language/email/welcome_english.tpl | 19 | ||||
| -rwxr-xr-x | phpBB/language/email/welcome_inactive_english.tpl | 21 | ||||
| -rwxr-xr-x | phpBB/language/lang_english.php | 1 |
3 files changed, 41 insertions, 0 deletions
diff --git a/phpBB/language/email/welcome_english.tpl b/phpBB/language/email/welcome_english.tpl new file mode 100755 index 0000000000..8542fb45c4 --- /dev/null +++ b/phpBB/language/email/welcome_english.tpl @@ -0,0 +1,19 @@ +{WELCOME_MSG} + +Please keep this email for your records. + +Your account information is as follows: + +---------------------------- +Username: {USERNAME} +Password: {PASSWORD} +---------------------------- + +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. + +{EMAIL_SIG} + + diff --git a/phpBB/language/email/welcome_inactive_english.tpl b/phpBB/language/email/welcome_inactive_english.tpl new file mode 100755 index 0000000000..338fb8d145 --- /dev/null +++ b/phpBB/language/email/welcome_inactive_english.tpl @@ -0,0 +1,21 @@ +{WELCOME_MSG} + +Please keep this email for your records. + +Your account information is as follows: + +---------------------------- +Username: {USERNAME} +Password: {PASSWORD} +---------------------------- + +Your account is currently inactive. You cannot use it until you visit the following link: + +{ACTIVATE_URL} + +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. + +{EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index e17e045eec..3cb808dfa1 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -425,6 +425,7 @@ $lang['Avatar_imagesize'] = "The avatar must be less than " . $board_config['ava $lang['Account_added'] = "Thank you for registering, your account has been created. You may now login with your username and password"; $lang['Account_inactive'] = "Your account has been created. However, this forum requires account activation, an activation key has been sent to the email address you provided. Pease check your email for further information"; +$lang['Account_active'] = "Your account has now been activated. Thank you for registering"; $lang['Welcome_subject'] = "Welcome to " . $board_config['sitename'] . " Forums"; |