Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 974214 - Make email notification for cleared flag identify the flag requestee. r=gerv, a=glob.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@265380 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2014-05-02 15:16:30 +00:00
parent 79777ec7ef
commit 2d583e215d
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
9017 9018

2
mozilla/webtools/bugzilla/.gitrev
View File

@ -1 +1 @@
1d876b8a5f2cefa7c51708b5ff1c1882f7d4bc7e 8472ce66c391dd9f8f777eb1f13d575bd9e80d04

7
mozilla/webtools/bugzilla/template/en/default/email/flagmail.txt.tmpl
View File

@ -27,6 +27,9 @@
[% ELSE %] [% ELSE %]
[% IF old_flag && old_flag.status == '?' %] [% IF old_flag && old_flag.status == '?' %]
[% to_identity = old_flag.setter.identity _ "'s request for" %] [% to_identity = old_flag.setter.identity _ "'s request for" %]
[% IF old_flag.requestee.defined %]
[% requestee_identity = old_flag.requestee.identity _ "'s" %]
[% END %]
[% END %] [% END %]
[% subject_status = statuses.$action %] [% subject_status = statuses.$action %]
[% END %] [% END %]
@ -44,10 +47,10 @@ X-Bugzilla-Type: request
[%- FILTER bullet = wrap(80) -%] [%- FILTER bullet = wrap(80) -%]
[% IF on_behalf_of %] [% IF on_behalf_of %]
[% user.identity %] has reassigned [% flag.setter.identity %]'s request for [% flagtype_name %] [% user.identity %] has reassigned [% flag.setter.identity %]'s request for [% IF requestee_identity %] [%+ requestee_identity %] [% END %] [% flagtype_name %]
[% to_identity %]: [% to_identity %]:
[% ELSE %] [% ELSE %]
[% user.identity %] has [% statuses.$action %] [%+ to_identity %] [%+ flagtype_name %]: [% user.identity %] has [% statuses.$action %] [%+ to_identity %] [% IF requestee_identity %] [%+ requestee_identity %] [% END %] [%+ flagtype_name %]:
[% END %] [% END %]
[% terms.Bug %] [%+ bugidsummary %] [% terms.Bug %] [%+ bugidsummary %]