summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/admin/params/bugchange.html.tmpl10
-rw-r--r--template/en/default/admin/params/mta.html.tmpl2
-rw-r--r--template/en/default/admin/products/create.html.tmpl2
-rw-r--r--template/en/default/email/whine.txt.tmpl13
-rw-r--r--template/en/default/global/field-descs.none.tmpl2
-rw-r--r--template/en/default/global/messages.html.tmpl3
-rw-r--r--template/en/default/list/list.ics.tmpl2
-rw-r--r--template/en/default/pages/fields.html.tmpl52
-rw-r--r--template/en/default/pages/quicksearch.html.tmpl4
9 files changed, 34 insertions, 56 deletions
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.",
diff --git a/template/en/default/admin/products/create.html.tmpl b/template/en/default/admin/products/create.html.tmpl
index 6ae400e27..1b50661cf 100644
--- a/template/en/default/admin/products/create.html.tmpl
+++ b/template/en/default/admin/products/create.html.tmpl
@@ -32,7 +32,7 @@
product.is_active = 1,
version = "unspecified",
product.defaultmilestone = constants.DEFAULT_MILESTONE
- product.allows_unconfirmed = 0
+ product.allows_unconfirmed = 1
%]
<form method="post" action="editproducts.cgi">
diff --git a/template/en/default/email/whine.txt.tmpl b/template/en/default/email/whine.txt.tmpl
index e90480e8b..32d8da8a0 100644
--- a/template/en/default/email/whine.txt.tmpl
+++ b/template/en/default/email/whine.txt.tmpl
@@ -30,9 +30,8 @@ You have one or more [% terms.bugs %] assigned to you in the [% terms.Bugzilla %
[% terms.bug %] tracking system ([% urlbase %]) that require
attention.
-All of these [% terms.bugs %] are in the [% display_value("bug_status", "NEW") %] or
-[%= display_value("bug_status", "REOPENED") %] state, and have not been
-touched in [% Param("whinedays") %] days or more.
+All of these [% terms.bugs %] are in the [% display_value("bug_status", "CONFIRMED") %]
+state, and have not been touched in [% Param("whinedays") %] days or more.
You need to take a look at them, and decide on an initial action.
Generally, this means one of three things:
@@ -44,17 +43,17 @@ Generally, this means one of three things:
sure that the Component field seems reasonable, and then use the
"Reset Assignee to default" option.)
(3) You decide the [% terms.bug %] belongs to you, but you can't solve it this moment.
- Accept the [% terms.bug %] by setting the status to [% display_value("bug_status", "ASSIGNED") %].
+ Accept the [% terms.bug %] by setting the status to [% display_value("bug_status", "IN_PROGRESS") %].
-To get a list of all [% display_value("bug_status", "NEW") %]/[% display_value("bug_status", "REOPENED") %] [%+ terms.bugs %], you can use this URL (bookmark
+To get a list of all [% display_value("bug_status", "CONFIRMED") %] [%+ terms.bugs %], you can use this URL (bookmark
it if you like!):
- [% urlbase %]buglist.cgi?bug_status=NEW&bug_status=REOPENED&assigned_to=[% email %]
+ [% urlbase %]buglist.cgi?bug_status=CONFIRMED&assigned_to=[% email %]
Or, you can use the general query page, at
[%+ urlbase %]query.cgi
-Appended below are the individual URLs to get to all of your [% display_value("bug_status", "NEW") %] [%+ terms.bugs %]
+Appended below are the individual URLs to get to all of your [% display_value("bug_status", "CONFIRMED") %] [%+ terms.bugs %]
that haven't been touched for [% Param("whinedays") %] days or more.
You will get this message once a day until you've dealt with these [% terms.bugs %]!
diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index ee75efaa3..2ef558ce4 100644
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -68,7 +68,7 @@
[% value_descs = {
"bug_status" => {
# "UNCONFIRMED" => "UNCO",
- # "NEW" => "NEWISH",
+ # "CONFIRMED" => "ITSABUG",
},
"resolution" => {
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index b45724b73..96225e128 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -719,6 +719,9 @@
Verify that the file permissions in your [% terms.Bugzilla %] directory are
suitable for your system. Avoid unnecessary write access.
+ [% ELSIF message_tag == "install_workflow_init" %]
+ Setting up the default status workflow...
+
[% ELSIF message_tag == "product_created" %]
[% title = "Product Created" %]
The product <em>[% product.name FILTER html %]</em> has been created. You will need to
diff --git a/template/en/default/list/list.ics.tmpl b/template/en/default/list/list.ics.tmpl
index 3f9e2b881..b135267f4 100644
--- a/template/en/default/list/list.ics.tmpl
+++ b/template/en/default/list/list.ics.tmpl
@@ -82,7 +82,7 @@ END:VCALENDAR
[% END %]
[% END %]
[% IF NOT status %]
- [% IF bug_status == 'ASSIGNED' %]
+ [% IF bug_status == 'IN_PROGRESS' || bug_status == 'ASSIGNED' %]
[% status = 'IN-PROGRESS' %]
[% ELSE %]
[% status = 'NEEDS-ACTION' %]
diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl
index de089ec11..d97a40f96 100644
--- a/template/en/default/pages/fields.html.tmpl
+++ b/template/en/default/pages/fields.html.tmpl
@@ -65,49 +65,33 @@
Nobody has confirmed that this [% terms.bug %] is valid. Users
who have the "canconfirm" permission set may confirm
this [% terms.bug %], changing its state to
- <b>[% display_value("bug_status", "NEW") FILTER html %]</b>.
+ <b>[% display_value("bug_status", "CONFIRMED") FILTER html %]</b>.
Or, it may be directly resolved and marked
<b>[% display_value("bug_status", "RESOLVED") FILTER html %]</b>.
</dd>
<dt>
- [% display_value("bug_status", "NEW") FILTER html %]
+ [% display_value("bug_status", "CONFIRMED") FILTER html %]
</dt>
<dd>
This [% terms.bug %] is valid and has recently been filed.
[%+ terms.Bugs %] in this state become
- <b>[% display_value("bug_status", "ASSIGNED") FILTER html %]</b> when
- somebody is working on them, or become resolved and marked
+ <b>[% display_value("bug_status", "IN_PROGRESS") FILTER html %]</b>
+ when somebody is working on them, or become resolved and marked
<b>[% display_value("bug_status", "RESOLVED") FILTER html %]</b>.
</dd>
<dt>
- [% display_value("bug_status", "ASSIGNED") FILTER html %]
+ [% display_value("bug_status", "IN_PROGRESS") FILTER html %]
</dt>
<dd>
This [% terms.bug %] is not yet resolved, but is assigned to the
proper person who is working on the [% terms.bug %]. From here,
[%+ terms.bugs %] can be given to another person and become
- <b>[% display_value("bug_status", "NEW") FILTER html %]</b>, or
+ <b>[% display_value("bug_status", "CONFIRMED") FILTER html %]</b>, or
resolved and become
<b>[% display_value("bug_status", "RESOLVED") FILTER html %]</b>.
</dd>
-
- <dt>
- [% display_value("bug_status", "REOPENED") FILTER html %]
- </dt>
- <dd>
- This [% terms.bug %] was once resolved, but the resolution was
- deemed incorrect. For example, a
- <b>[% display_value("resolution", "WORKSFORME") FILTER html %]</b>
- [%+ terms.bug %] is marked
- <b>[% display_value("bug_status", "REOPENED") FILTER html %]</b> when
- more information shows up and the [% terms.bug %] is now
- reproducible. From here, [% terms.bugs %] are either marked
- <b>[% display_value("bug_status", "ASSIGNED") FILTER html %]</b> or
- <b>[% display_value("bug_status", "RESOLVED") FILTER html %]</b>.
- </dd>
- </dl>
</td>
<td>
@@ -128,11 +112,9 @@
</dt>
<dd>
A resolution has been performed, and it is awaiting verification by
- QA. From here [% terms.bugs %] are either re-opened and become
- <b>[% display_value("bug_status", "REOPENED") FILTER html %]</b>, are
- marked <b>[% display_value("bug_status", "VERIFIED") FILTER html %]</b>,
- or are closed for good and marked
- <b>[% display_value("bug_status", "CLOSED") FILTER html %]</b>.
+ QA. From here [% terms.bugs %] are either reopened and given some
+ open status, or are verified by QA and marked
+ <b>[% display_value("bug_status", "VERIFIED") FILTER html %]</b>.
</dd>
<dt>
@@ -140,20 +122,8 @@
</dt>
<dd>
QA has looked at the [% terms.bug %] and the resolution and
- agrees that the appropriate resolution has been taken.
- [%+ terms.Bugs %] remain in this state until the product they were
- reported against actually ships, at which point they become
- <b>[% display_value("bug_status", "CLOSED") FILTER html %]</b>.
- </dd>
-
- <dt>
- [% display_value("bug_status", "CLOSED") FILTER html %]
- </dt>
- <dd>
- The [% terms.bug %] is considered dead, the resolution is correct.
- Any zombie [% terms.bugs %] who choose to walk the earth again must
- do so by becoming
- <b>[% display_value("bug_status", "REOPENED") FILTER html %]</b>.
+ agrees that the appropriate resolution has been taken. This is
+ the final staus for bugs.
</dd>
</dl>
</td>
diff --git a/template/en/default/pages/quicksearch.html.tmpl b/template/en/default/pages/quicksearch.html.tmpl
index 1a630671d..486261009 100644
--- a/template/en/default/pages/quicksearch.html.tmpl
+++ b/template/en/default/pages/quicksearch.html.tmpl
@@ -97,8 +97,8 @@
<p>You can specify any of these fields like <kbd>field:value</kbd>
in the search box, to search on them. You can also abbreviate
the field name, as long as your abbreviation matches only one field name.
- So, for example, searching on <kbd>stat:NEW</kbd> will find all
- [%+ terms.bugs %] in the <kbd>NEW</kbd> status. Some fields have
+ So, for example, searching on <kbd>stat:VERIFIED</kbd> will find all
+ [%+ terms.bugs %] in the <kbd>VERIFIED</kbd> status. Some fields have
multiple names, and you can use any of those names to search for them.</p>
[% IF Bugzilla.active_custom_fields.size %]
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-05 02:49:57 +0100