To create a [% terms.Bugzilla %] account, all you need to do is to enter - a legitimate e-mail address. You will receive an email at this address - to confirm the creation of your account. You will not be able to log - in until you receive the email. If it doesn't arrive within a - reasonable amount of time, you can contact the maintainer of - this [% terms.Bugzilla %] installation +[% IF Param('emailsuffix') == '' %] + a legitimate email address. +[% ELSE %] + an accountname which when combined with [% Param('emailsuffix') %] + corresponds to an address where you receive email. +[% END %] + You will receive an email at this address to confirm the creation of your + account. You will not be able to log in until you receive the email. + If it doesn't arrive within a reasonable amount of time, you may contact + the maintainer of this [% terms.Bugzilla %] installation at [% Param("maintainer") %].
+[% 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 %] + ++ This account will not be created if this form is not completed by + [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]. +
+ ++ If you do not wish to create an account with this email click the + cancel account button below and your details will be forgotten. +
+ + + [% PROCESS global/footer.html.tmpl %] 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') %]. diff --git a/template/en/default/account/prefs/account.html.tmpl b/template/en/default/account/prefs/account.html.tmpl index e914ecf6c..5106618ee 100644 --- a/template/en/default/account/prefs/account.html.tmpl +++ b/template/en/default/account/prefs/account.html.tmpl @@ -51,7 +51,7 @@