diff options
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/account/cancel-token.txt.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/email/votes-removed.txt.tmpl | 23 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 5 |
3 files changed, 21 insertions, 9 deletions
diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl index 153c92e34..155c44136 100644 --- a/template/en/default/account/cancel-token.txt.tmpl +++ b/template/en/default/account/cancel-token.txt.tmpl @@ -32,7 +32,7 @@ If you did not request this, it could be either an honest mistake or someone attempting to break into your [% terms.Bugzilla %] account. Take a look at the information below and forward this email -to [% maintainer %] if you suspect foul play. +to [% Param('maintainer') %] if you suspect foul play. Token: [% token %] Token Type: [% tokentype %] diff --git a/template/en/default/email/votes-removed.txt.tmpl b/template/en/default/email/votes-removed.txt.tmpl index 8d8f79057..bfb37c90d 100644 --- a/template/en/default/email/votes-removed.txt.tmpl +++ b/template/en/default/email/votes-removed.txt.tmpl @@ -27,11 +27,28 @@ X-Bugzilla-Type: voteremoved Some or all of your votes have been removed from [% terms.bug %] [%+ bugid %]. -[% votesoldtext %] +You had [% votesold FILTER html %] [%+ IF votesold == 1 %]vote[% ELSE %]votes[% END +%] on this [% terms.bug %], but [% votesremoved FILTER html %] have been removed. -[% votesnewtext %] +[% IF votesnew %] +You still have [% votesnew FILTER html %] [%+ IF votesnew == 1 %]vote[% ELSE %]votes[% END %] on this [% terms.bug %]. +[% ELSE %] +You have no more votes remaining on this [% terms.bug %]. +[% END %] + +Reason: +[% IF reason == "votes_bug_moved" %] + This [% terms.bug %] has been moved to a different product. + +[% ELSIF reason == "votes_too_many_per_bug" %] + The rules for voting on this product has changed; + you had too many votes for a single [% terms.bug %]. + +[% ELSIF reason == "votes_too_many_per_user" %] + The rules for voting on this product has changed; you had + too many total votes, so all votes have been removed. +[% END %] -Reason: [% reason %] [% urlbase %]show_bug.cgi?id=[% bugid %] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 58a1cfcf6..e61f3a9ee 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -76,11 +76,6 @@ that login name. [% END %] - [% ELSIF error == "account_does_not_exist" %] - [% title = "Account Does Not Exist" %] - <code>[% email FILTER html %]</code> is not a valid [% terms.Bugzilla %] - account. - [% ELSIF error == "alias_has_comma_or_space" %] [% title = "Invalid Characters In Alias" %] The alias you entered, <em>[% alias FILTER html %]</em>, |