From ba4585ae8a1c63a49e40461d2e2efc12bc75c58a Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Mon, 5 Jul 2010 17:42:57 -0700
Subject: Bug 486292: Change the default workflow to UNCONFIRMED, CONFIRMED,
 IN_PROGRESS, RESOLVED, VERIFIED. r=LpSolit, a=mkanat

---
 template/en/default/admin/params/bugchange.html.tmpl | 10 ++++++++--
 template/en/default/admin/params/mta.html.tmpl       |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'template/en/default/admin/params')

diff --git a/template/en/default/admin/params/bugchange.html.tmpl b/template/en/default/admin/params/bugchange.html.tmpl
index 9f456ee6f..15d4f1e29 100644
--- a/template/en/default/admin/params/bugchange.html.tmpl
+++ b/template/en/default/admin/params/bugchange.html.tmpl
@@ -23,6 +23,10 @@
    desc = "Set up $terms.bug change policies"
 %]
 
+[% PROCESS "global/field-descs.none.tmpl" %]
+
+[% accept_status = display_value('bug_status', 'IN_PROGRESS') FILTER html %]
+
 [% param_descs = {
   duplicate_or_move_bug_status => "When $terms.abug is marked as a duplicate of another one " _
                                   "or is moved to another installation, use this $terms.bug status."
@@ -37,8 +41,10 @@
                                  "If off, then all $terms.bugs initially have the default " _
                                  "milestone for the product being filed in.",
 
-  musthavemilestoneonaccept => "If you are using Target Milestone, do you want to require that " _
-                               "the milestone be set in order for a user to ACCEPT a ${terms.bug}?",
+  musthavemilestoneonaccept => 
+    "If you are using ${field_descs.target_milestone}, do you want to require"
+    _ " that the milestone be set in order for a user to set"
+    _ "  ${terms.abug}'s status to ${accept_status}?",
 
   commentonchange_resolution => "If this option is on, the user needs to enter a short " _
                                 "comment if the resolution of the $terms.bug changes.",
diff --git a/template/en/default/admin/params/mta.html.tmpl b/template/en/default/admin/params/mta.html.tmpl
index 872db801a..5391a4fc9 100644
--- a/template/en/default/admin/params/mta.html.tmpl
+++ b/template/en/default/admin/params/mta.html.tmpl
@@ -68,7 +68,7 @@
                 " $terms.Bugzilla and your SMTP server. You can use this to" _
                 " troubleshoot email problems.",
 
-  whinedays => "The number of days that we'll let a $terms.bug sit untouched in a NEW " _
+  whinedays => "The number of days that we'll let a $terms.bug sit untouched in a CONFIRMED " _
                "state before our cronjob will whine at the owner.<br> " _
                "Set to 0 to disable whining.",
 
-- 
cgit v1.2.3-24-g4f1b