diff options
| author | Matt Tyson <mtyson@redhat.com> | 2014-05-02 17:03:55 +0200 |
|---|---|---|
| committer | Gervase Markham <gerv@gerv.net> | 2014-05-02 17:03:55 +0200 |
| commit | 8472ce66c391dd9f8f777eb1f13d575bd9e80d04 (patch) | |
| tree | 812a0322f6d2a4a26d9cbc336406931f2d8b4a0f /template/en/default/email | |
| parent | 1d876b8a5f2cefa7c51708b5ff1c1882f7d4bc7e (diff) | |
| download | bugzilla-8472ce66c391dd9f8f777eb1f13d575bd9e80d04.tar.gz bugzilla-8472ce66c391dd9f8f777eb1f13d575bd9e80d04.tar.xz | |
Bug 974214 - Make email notification for cleared flag identify the flag requestee. r=gerv, a=glob.
Diffstat (limited to 'template/en/default/email')
| -rw-r--r-- | template/en/default/email/flagmail.txt.tmpl | 7 |
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 %] |