зеркало из https://github.com/mozilla/pjs.git
Bug 275637: Templatise 'voteremovedmail' email - Patch by Emmanuel Seyman <eseyman@linagora.com> r=LpSolit a=justdave
This commit is contained in:
Родитель
563a9ba512
Коммит
c9a2554c9d
|
@ -1048,23 +1048,26 @@ sub RemoveVotes {
|
|||
|
||||
# Now lets send the e-mail to alert the user to the fact that their votes have
|
||||
# been reduced or removed.
|
||||
my %substs;
|
||||
my $vars = {
|
||||
|
||||
$substs{"to"} = $name . Param('emailsuffix');
|
||||
$substs{"bugid"} = $id;
|
||||
$substs{"reason"} = $reason;
|
||||
'to' => $name . Param('emailsuffix'),
|
||||
'bugid' => $id,
|
||||
'reason' => $reason,
|
||||
|
||||
$substs{"votesremoved"} = $removedvotes;
|
||||
$substs{"votesold"} = $oldvotes;
|
||||
$substs{"votesnew"} = $newvotes;
|
||||
'votesremoved' => $removedvotes,
|
||||
'votesold' => $oldvotes,
|
||||
'votesnew' => $newvotes,
|
||||
|
||||
$substs{"votesremovedtext"} = $removedvotestext;
|
||||
$substs{"votesoldtext"} = $oldvotestext;
|
||||
$substs{"votesnewtext"} = $newvotestext;
|
||||
'votesremovedtext' => $removedvotestext,
|
||||
'votesoldtext' => $oldvotestext,
|
||||
'votesnewtext' => $newvotestext,
|
||||
|
||||
$substs{"count"} = $removedvotes . "\n " . $newvotestext;
|
||||
'count' => $removedvotes . "\n " . $newvotestext
|
||||
};
|
||||
|
||||
my $msg = perform_substs(Param("voteremovedmail"), \%substs);
|
||||
my $msg;
|
||||
my $template = Bugzilla->template;
|
||||
$template->process("email/votes-removed.txt.tmpl", $vars, \$msg);
|
||||
push(@messages, $msg);
|
||||
}
|
||||
my $votes = $dbh->selectrow_array("SELECT SUM(vote_count) " .
|
||||
|
|
|
@ -139,25 +139,6 @@ haven\'t been touched for a week or more.
|
|||
|
||||
You will get this message once a day until you\'ve dealt with these bugs!
|
||||
|
||||
'
|
||||
},
|
||||
|
||||
{
|
||||
name => 'voteremovedmail',
|
||||
type => 'l',
|
||||
default => 'From: bugzilla-daemon
|
||||
To: %to%
|
||||
Subject: [Bug %bugid%] Some or all of your votes have been removed.
|
||||
|
||||
Some or all of your votes have been removed from bug %bugid%.
|
||||
|
||||
%votesoldtext%
|
||||
|
||||
%votesnewtext%
|
||||
|
||||
Reason: %reason%
|
||||
|
||||
%urlbase%show_bug.cgi?id=%bugid%
|
||||
'
|
||||
} );
|
||||
return @param_list;
|
||||
|
|
|
@ -86,17 +86,6 @@
|
|||
"definition of that parameter (as defined on this page).<p> " _
|
||||
"It is a good idea to make sure this message has a valid From: " _
|
||||
"address, so that if the mail bounces, a real person can know " _
|
||||
"that there are $terms.bugs assigned to an invalid address.",
|
||||
"that there are $terms.bugs assigned to an invalid address." }
|
||||
|
||||
voteremovedmail => "This is a mail message to send to anyone who gets a vote removed " _
|
||||
"from $terms.abug for any reason. %to% gets replaced by the person who " _
|
||||
"used to be voting for this ${terms.bug}. %bugid% gets replaced by the " _
|
||||
"$terms.bug number. %reason% gets replaced by a short reason describing " _
|
||||
"why the vote(s) were removed. %votesremoved%, %votesold% and " _
|
||||
"%votesnew% is the number of votes removed, before and after " _
|
||||
"respectively. %votesremovedtext%, %votesoldtext% and " _
|
||||
"%votesnewtext% are these as sentences, e.g. 'You had 2 votes on " _
|
||||
"this ${terms.bug}.' %count% is also supported for backwards " _
|
||||
"compatibility. %<i>anythingelse</i>% gets replaced by the " _
|
||||
"definition of that parameter (as defined on this page)." }
|
||||
%]
|
||||
|
|
|
@ -0,0 +1,38 @@
|
|||
[%# 1.0@bugzilla.org %]
|
||||
[%# The contents of this file are subject to the Mozilla Public
|
||||
# License Version 1.1 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS
|
||||
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
# implied. See the License for the specific language governing
|
||||
# rights and limitations under the License.
|
||||
#
|
||||
# The Original Code is the Bugzilla Bug Tracking System.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape Communications
|
||||
# Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s): Emmanuel Seyman <eseyman@linagora.com>
|
||||
#%]
|
||||
|
||||
[% PROCESS global/variables.none.tmpl %]
|
||||
|
||||
From: bugzilla-daemon
|
||||
To: [% to %]
|
||||
Subject: [% terms.Bug %] [%+ bugid %] Some or all of your votes have been removed.
|
||||
|
||||
Some or all of your votes have been removed from [% terms.bug %] [%+ bugid %].
|
||||
|
||||
[% votesoldtext %]
|
||||
|
||||
[% votesnewtext %]
|
||||
|
||||
Reason: [% reason %]
|
||||
|
||||
|
||||
[% Param("urlbase") %]show_bug.cgi?id=[% bugid %]
|
||||
|
Загрузка…
Ссылка в новой задаче