diff options
Diffstat (limited to 'template/en/default/email')
| -rw-r--r-- | template/en/default/email/bugmail-header.txt.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/email/bugmail.txt.tmpl | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl index 94559a942..85226b472 100644 --- a/template/en/default/email/bugmail-header.txt.tmpl +++ b/template/en/default/email/bugmail-header.txt.tmpl @@ -22,11 +22,13 @@ [% PROCESS "global/field-descs.none.tmpl" %] [% PROCESS "global/reason-descs.none.tmpl" %] +[% show_new = isnew + && (to_user.settings.bugmail_new_prefix.value == 'on') %] [% isnew = bug.lastdiffed ? 0 : 1 %] From: [% Param('mailfrom') %] To: [% to_user.email %] -Subject: [[% terms.Bug %] [%+ bug.id %]] [% 'New: ' IF isnew %][%+ bug.short_desc %] +Subject: [[% terms.Bug %] [%+ bug.id %]] [% 'New: ' IF show_new %][%+ bug.short_desc %] Date: [% date %] X-Bugzilla-Reason: [% reasonsheader %] X-Bugzilla-Type: [% isnew ? 'new' : 'changed' %] diff --git a/template/en/default/email/bugmail.txt.tmpl b/template/en/default/email/bugmail.txt.tmpl index 2d20aff7c..b663954f7 100644 --- a/template/en/default/email/bugmail.txt.tmpl +++ b/template/en/default/email/bugmail.txt.tmpl @@ -25,6 +25,10 @@ [% isnew = bug.lastdiffed ? 0 : 1 %] +[% IF !user.in_group('editbugs') %] +Do not reply to this email. You can add comments to this [% terms.bug %] at +[% END %] + [%+ PROCESS generate_diffs -%] [% FOREACH comment = new_comments %] @@ -48,7 +52,7 @@ You are receiving this mail because: [%+ reason_lines.join("\n") %] [% BLOCK generate_diffs %] - [% urlbase %]show_bug.cgi?id=[% bug.id %] + [% urlbase %]show_bug.cgi?id=[% bug.id %][% "#c" _ new_comments.first.count IF new_comments.size > 0 %] [%+ last_changer = "" %] [% FOREACH change = diffs %] |