summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2012-05-08 08:13:49 +0200
committerByron Jones <bjones@mozilla.com>2012-05-08 08:13:49 +0200
commit16e6b9c6ae479e28cd77204a3d7d9966b293c19a (patch)
tree6946d49ea5fffca181ddf193599a92d33d1f81f7 /template/en
parent4f608d4d3489935d55c20e15cc2ec7d700887ed4 (diff)
downloadbugzilla-16e6b9c6ae479e28cd77204a3d7d9966b293c19a.tar.gz
bugzilla-16e6b9c6ae479e28cd77204a3d7d9966b293c19a.tar.xz
Bug 663747: Add an option to disable 'New: ' prefix on bugmail
r=gerv, a=LpSolit
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/email/bugmail-header.txt.tmpl4
-rw-r--r--template/en/default/global/setting-descs.none.tmpl1
2 files changed, 4 insertions, 1 deletions
diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl
index 7454b3684..7335ad9ec 100644
--- a/template/en/default/email/bugmail-header.txt.tmpl
+++ b/template/en/default/email/bugmail-header.txt.tmpl
@@ -8,10 +8,12 @@
[% PROCESS "global/reason-descs.none.tmpl" %]
[% isnew = bug.lastdiffed ? 0 : 1 %]
+[% show_new = isnew
+ && (to_user.settings.bugmail_new_prefix.value == 'on') %]
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/global/setting-descs.none.tmpl b/template/en/default/global/setting-descs.none.tmpl
index f2dd43de5..d20068306 100644
--- a/template/en/default/global/setting-descs.none.tmpl
+++ b/template/en/default/global/setting-descs.none.tmpl
@@ -42,6 +42,7 @@
"html" => "HTML",
"text_only" => "Text Only",
"requestee_cc" => "Automatically add me to the CC list of $terms.bugs I am requested to review",
+ "bugmail_new_prefix" => "Add 'New:' to subject line of email sent when a new $terms.bug is filed",
}
%]