From 97f83fe0675cf8fd076f1bfcc61ec641077f49af Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" Date: Tue, 8 May 2012 06:17:16 +0000 Subject: [PATCH] Bug 663747: Add an option to disable 'New: ' prefix on bugmail r=gerv, a=LpSolit git-svn-id: svn://10.0.0.236/trunk@263799 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/bugzilla/.bzrrev | 2 +- mozilla/webtools/bugzilla/Bugzilla/Install.pm | 2 ++ .../template/en/default/email/bugmail-header.txt.tmpl | 4 +++- .../template/en/default/global/setting-descs.none.tmpl | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index 480bfd76cc1..95355ef593e 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -8221 \ No newline at end of file +8222 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install.pm b/mozilla/webtools/bugzilla/Bugzilla/Install.pm index f2c3902e4ba..6c7f72fc497 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Install.pm +++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/template/en/default/email/bugmail-header.txt.tmpl b/mozilla/webtools/bugzilla/template/en/default/email/bugmail-header.txt.tmpl index 7454b3684b2..7335ad9ecbe 100644 --- a/mozilla/webtools/bugzilla/template/en/default/email/bugmail-header.txt.tmpl +++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/template/en/default/global/setting-descs.none.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/setting-descs.none.tmpl index f2dd43de543..d20068306a5 100644 --- a/mozilla/webtools/bugzilla/template/en/default/global/setting-descs.none.tmpl +++ b/mozilla/webtools/bugzilla/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", } %]