aboutsummaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorMatt Tyson <mtyson@redhat.com>2014-05-02 16:03:55 +0100
committerGervase Markham <gerv@gerv.net>2014-05-02 16:03:55 +0100
commit8472ce66c391dd9f8f777eb1f13d575bd9e80d04 (patch)
tree812a0322f6d2a4a26d9cbc336406931f2d8b4a0f /template
parent1d876b8a5f2cefa7c51708b5ff1c1882f7d4bc7e (diff)
downloadbugs-8472ce66c391dd9f8f777eb1f13d575bd9e80d04.tar
bugs-8472ce66c391dd9f8f777eb1f13d575bd9e80d04.tar.gz
bugs-8472ce66c391dd9f8f777eb1f13d575bd9e80d04.tar.bz2
bugs-8472ce66c391dd9f8f777eb1f13d575bd9e80d04.tar.xz
bugs-8472ce66c391dd9f8f777eb1f13d575bd9e80d04.zip
Bug 974214 - Make email notification for cleared flag identify the flag requestee. r=gerv, a=glob.
Diffstat (limited to 'template')
-rw-r--r--template/en/default/email/flagmail.txt.tmpl7
1 files changed, 5 insertions, 2 deletions
diff --git a/template/en/default/email/flagmail.txt.tmpl b/template/en/default/email/flagmail.txt.tmpl
index fe514e103..d0e1395e2 100644
--- a/template/en/default/email/flagmail.txt.tmpl
+++ b/template/en/default/email/flagmail.txt.tmpl
@@ -27,6 +27,9 @@
[% ELSE %]
[% IF old_flag && old_flag.status == '?' %]
[% to_identity = old_flag.setter.identity _ "'s request for" %]
+ [% IF old_flag.requestee.defined %]
+ [% requestee_identity = old_flag.requestee.identity _ "'s" %]
+ [% END %]
[% END %]
[% subject_status = statuses.$action %]
[% END %]
@@ -44,10 +47,10 @@ X-Bugzilla-Type: request
[%- FILTER bullet = wrap(80) -%]
[% 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 %]:
[% 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 %]
[% terms.Bug %] [%+ bugidsummary %]