Bug 369592 New Account Privacy policy etc. string changes for bmo

r=lpsolit a=lpsolit

1 files changed, 19 insertions, 6 deletions

diff --git a/template/en/default/account/email/request-new.txt.tmpl b/template/en/default/account/email/request-new.txt.tmpl
index 3248e4b38..9e609048d 100644
--- a/template/en/default/account/email/request-new.txt.tmpl
+++ b/template/en/default/account/email/request-new.txt.tmpl
@@ -31,15 +31,28 @@ X-Bugzilla-Type: admin
 [%+ terms.Bugzilla %] has received a request to create a user account
 using your email address ([% email %]).
 
-To confirm that you want to create an account using that email address,
-visit the following link:
+To continue creating an account using this email address, visit the 
+following link by [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]:
 
 [%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=request_new_account
 
-If you are not the person who made this request, or you wish to cancel
-this request, visit the following link:
+If you did not receive this email before [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %] or
+you wish to create an account using a different email address you can begin
+again by going to:
+
+[%+ urlbase %]createaccount.cgi
+
+[% IF Param('createemailregexp') == '.*' && Param('emailsuffix') == '' %]
+PRIVACY NOTICE: [% terms.Bugzilla %] is an open [% terms.bug %] tracking system. Activity on most
+[%+ terms.bugs %], including email addresses, will be visible to the public. We recommend
+using a secondary account or free web email service (such as Gmail, Yahoo,
+Hotmail, or similar) to avoid receiving spam at your primary email address.
+[% END %]
+
+If you do not wish to create an account, or if this request was made in
+error you can do nothing or visit the following link:
 
 [%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cancel_new_account
 
-If you do nothing, the request will lapse after [%+ constants.MAX_TOKEN_AGE %] days
-(on [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]).
+If the above links do not work, or you have any other issues regarding
+your account, please contact administration at [% Param('maintainer') %].