Bug 663747: Add an option to disable 'New: ' prefix on bugmail

r=gerv, a=LpSolit

diff --git a/Bugzilla/Install.pm b/Bugzilla/Install.pm
index f2c3902e4ba0a18bdc0baa2461c28e2649d578d8..6c7f72fc497cc2c23ef680cf9ffb0bdc01192a32 100644 (file)
--- a/Bugzilla/Install.pm
+++ b/Bugzilla/Install.pm
@@ -84,6 +84,8 @@ sub SETTINGS {
                             default => 'html' },
     # 2011-10-11 glob@mozilla.com -- Bug 301656
     requestee_cc       => { options => ['on', 'off'], default => 'on' },
+    # 2012-04-30 glob@mozilla.com -- Bug 663747
+    bugmail_new_prefix => { options => ['on', 'off'], default => 'on' },
     }
 };
 

diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl
index 7454b3684b2d7c96d1085a7d2cfa3b3962caeaa9..7335ad9ecbe30208cfe53fcede13122ef4934e01 100644 (file)
--- 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 f2dd43de5437e82008d0c071f61c1ac65e729bd2..d20068306a5a33fae0f71ffc6dd8c85aca943b07 100644 (file)
--- 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",
                    } 
 %]