From 57584dc4744fea59833ef355f7513690d246c70f Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 4 Oct 2011 18:25:23 -0400 Subject: more porting work --- template/en/default/pages/bugzilla.dtd.tmpl | 179 ++++++++++++++++++++++++++++ template/en/default/pages/fields.html.tmpl | 61 +++++----- 2 files changed, 213 insertions(+), 27 deletions(-) create mode 100644 template/en/default/pages/bugzilla.dtd.tmpl (limited to 'template/en/default/pages') diff --git a/template/en/default/pages/bugzilla.dtd.tmpl b/template/en/default/pages/bugzilla.dtd.tmpl new file mode 100644 index 000000000..f7fc1b4ad --- /dev/null +++ b/template/en/default/pages/bugzilla.dtd.tmpl @@ -0,0 +1,179 @@ +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Dawn Endico + # Dave Miller + # Bradley Baetz + # Myk Mylez + # Colin Ogilvie + # Joel Peshkin + # Frédéric Buclin + # Gervase Markham + # Max Kanat-Alexander + # David Lawrence + # + #%] +[% USE Bugzilla %] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +[% FOREACH field = Bugzilla.active_custom_fields %] + +[% END %] + + + + + + + + + + + + + + + + + + + + + diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl index 2794e1cc4..568245653 100644 --- a/template/en/default/pages/fields.html.tmpl +++ b/template/en/default/pages/fields.html.tmpl @@ -62,34 +62,41 @@
This [% terms.bug %] has recently been added to the database. - Nobody has confirmed that this [% terms.bug %] is valid. Users + Nobody has validated that this [% terms.bug %] is true. Users who have the "canconfirm" permission set may confirm - this [% terms.bug %], changing its state to - [% display_value("bug_status", "CONFIRMED") FILTER html %]. - Or, it may be directly resolved and marked + this [% terms.bug %], changing its state to [% display_value("bug_status", "NEW") FILTER html %]. Or, it may be + directly resolved and marked [% display_value("bug_status", "RESOLVED") FILTER html %]. +
+
+ [% display_value("bug_status", "NEW") FILTER html %] +
+
+ This [% terms.bug %] has recently been added to the assignee's + list of [% terms.bugs %] and must be processed. [% terms.Bugs %] in + this state may be accepted, and become [% display_value("bug_status", "ASSIGNED") FILTER html %], passed + on to someone else, and remain [% display_value("bug_status", "NEW") FILTER html %], or resolved and marked [% display_value("bug_status", "RESOLVED") FILTER html %].
-
- [% display_value("bug_status", "CONFIRMED") FILTER html %] +
+ [% display_value("bug_status", "ASSIGNED") FILTER html %]
-
- This [% terms.bug %] is valid and has recently been filed. - [%+ terms.Bugs %] in this state become - [% display_value("bug_status", "IN_PROGRESS") FILTER html %] - when somebody is working on them, or become resolved and marked - [% display_value("bug_status", "RESOLVED") FILTER html %]. +
+ This [% terms.bug %] is not yet resolved, but is assigned to the + proper person. From here [% terms.bugs %] can be given to another + person and become [% display_value("bug_status", "NEW") FILTER html %], or + resolved and become [% display_value("bug_status", "RESOLVED") FILTER html %].
-
- [% display_value("bug_status", "IN_PROGRESS") FILTER html %] +
+ [% display_value("bug_status", "REOPENED") FILTER html %]
-
- 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 - [% display_value("bug_status", "CONFIRMED") FILTER html %], or - resolved and become +
+ This [% terms.bug %] was once resolved, but the resolution was + deemed incorrect. For example, a [% display_value("resolution", "WORKSFORME") FILTER html %] [% terms.bug %] is + [% display_value("bug_status", "REOPENED") FILTER html %] when more information shows up and + the [% terms.bug %] is now reproducible. From here [% terms.bugs %] are + either marked [% display_value("bug_status", "ASSIGNED") FILTER html %] or [% display_value("bug_status", "RESOLVED") FILTER html %].
@@ -124,9 +131,10 @@ [% display_value("bug_status", "VERIFIED") FILTER html %]
- QA has looked at the [% terms.bug %] and the resolution and - agrees that the appropriate resolution has been taken. This is - the final status for [% terms.bugs %]. + QA has looked at the [% terms.bug %] and the resolution and + agrees that the appropriate resolution has been taken. + Any zombie [% terms.bugs %] who choose to walk the earth again must + do so by becoming [% display_value("bug_status", "REOPENED") FILTER html %].
[% Hook.process('closed-status') %] @@ -163,10 +171,9 @@
The problem is a duplicate of an existing [% terms.bug %]. - When [% terms.abug %] is marked as a - [% display_value("resolution", "DUPLICATE") FILTER html %], - you will see which [% terms.bug %] it is a duplicate of, - next to the resolution. + Marking [% terms.abug %] duplicate requires the [% terms.bug %]# + of the duplicating [% terms.bug %] and will at least put + that [% terms.bug %] number in the description field.
-- cgit v1.2.3-24-g4f1b