Skip to content

bugzilla
bugzilla
Commit df891085 authored by gerv%gerv.net's avatar gerv%gerv.net
Browse files
Options

Bug 215148 - make status and resolution localisable. Patch by eseyman@linagora.com; r=gerv, a=myk.

parent ab723ea0
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 58 deletions
template/en/default/bug/create/create.html.tmpl
View file @ df891085
......@@ -22,6 +22,7 @@
#%]
[% PROCESS global/variables.none.tmpl %]
[% PROCESS "global/field-descs.none.tmpl" %]
[% product_name = product FILTER html %]
[% PROCESS global/header.html.tmpl
......@@ -200,7 +201,7 @@ function set_assign_to() {
<input type="hidden" name="bug_status"
value="[% default.bug_status FILTER html %]">
<td align="right" valign="top"><strong>Initial State:</strong></td>
<td valign="top">[% default.bug_status FILTER html %]</td>
<td valign="top">[% status_descs.${default.bug_status} FILTER html %]</td>
[% ELSE %]
[% sel = { description => 'Initial State', name => 'bug_status' } %]
[% INCLUDE select %]
......
template/en/default/bug/edit.html.tmpl
View file @ df891085
......@@ -22,6 +22,8 @@
[% PROCESS global/variables.none.tmpl %]
[% PROCESS "global/field-descs.none.tmpl" %]
[% PROCESS bug/time.html.tmpl %]
<script type="text/javascript">
......@@ -197,9 +199,9 @@
[% PROCESS select selname => "component" accesskey => "m" %]
<td align="right">
<b>Version:</b>
<b><u>V</u>ersion:</b>
</td>
[% PROCESS select selname => "version" %]
[% PROCESS select selname => "version" accesskey => "v" %]
<td rowspan="4" align="right" valign="top">
<b>CC:</b>
......@@ -226,7 +228,7 @@
<a href="page.cgi?id=fields.html#status">Status</a>:
</b>
</td>
<td>[% bug.bug_status FILTER html %]</td>
<td>[% status_descs.${bug.bug_status} FILTER html %]</td>
<td>&nbsp;</td>
<td align="right">
......@@ -242,7 +244,7 @@
</b>
</td>
<td>
[% bug.resolution FILTER html %]
[% resolution_descs.${bug.resolution} FILTER html %]
[% IF bug.resolution == "DUPLICATE" %]
of [% terms.bug %] [%+ "${bug.dup_id}" FILTER bug_link(bug.dup_id) %]
[% END %]
......@@ -250,9 +252,9 @@
<td>&nbsp;</td>
<td align="right">
<b><a href="page.cgi?id=fields.html#bug_severity">Severity</a>:</b>
<b><a href="page.cgi?id=fields.html#bug_severity">S<u>e</u>verity</a>:</b>
</td>
[% PROCESS select selname = "bug_severity" %]
[% PROCESS select selname = "bug_severity" accesskey => "e" %]
</tr>
......@@ -271,10 +273,10 @@
[% IF bug.milestoneurl %]
<a href="[% bug.milestoneurl FILTER html %]">
[% END %]
Target Milestone[% "</a>" IF bug.milestoneurl %]:
<u>T</u>arget Milestone[% "</a>" IF bug.milestoneurl %]:
</b>
</td>
[% PROCESS select selname = "target_milestone" %]
[% PROCESS select selname = "target_milestone" accesskey => "t" %]
[% ELSE %]
<td colspan="3">&nbsp;</td>
[% END %]
......@@ -442,8 +444,8 @@
<table>
<tr>
[% PROCESS dependencies
dep = { title => "depends on", fieldname => "dependson" } %]
[% PROCESS dependencies accesskey = "d"
dep = { title => "<u>d</u>epends on", fieldname => "dependson" } %]
<td rowspan="2">
<a href="showdependencytree.cgi?id=[% bug.bug_id %]">Show
dependency tree</a>
......
template/en/default/bug/knob.html.tmpl
View file @ df891085
......@@ -27,8 +27,8 @@
<br>
<input type="radio" id="knob-leave" name="knob" value="none" checked="checked">
<label for="knob-leave">
Leave as <b>[% bug.bug_status FILTER html %]&nbsp;
[% bug.resolution FILTER html %]</b>
Leave as <b>[% status_descs.${bug.bug_status} FILTER html %]&nbsp;
[% resolution_descs.${bug.resolution} FILTER html %]</b>
</label>
<br>
......@@ -37,7 +37,7 @@
[% IF bug.isunconfirmed && bug.user.canconfirm %]
<input type="radio" id="knob-confirm" name="knob" value="confirm">
<label for="knob-confirm">
Confirm [% terms.bug %] (change status to <b>NEW</b>)
Confirm [% terms.bug %] (change status to <b>[% status_descs.NEW FILTER html %]</b>)
</label>
<br>
[% knum = knum + 1 %]
......@@ -49,7 +49,7 @@
<label for="knob-accept">
Accept [% terms.bug %] (
[% IF bug.isunconfirmed %]confirm [% terms.bug %], and [% END %]change
status to <b>ASSIGNED</b>)
status to <b>[% status_descs.ASSIGNED FILTER html %]</b>)
</label>
<br>
[% knum = knum + 1 %]
......@@ -61,7 +61,7 @@
<input type="radio" id="knob-clear" name="knob" value="clearresolution">
<label for="knob-clear">
Clear the resolution (remove the current resolution of
<b>[% bug.resolution FILTER html %]</b>)
<b>[% status_descs.${bug.resolution} FILTER html %]</b>)
</label>
<br>
[% knum = knum + 1 %]
......@@ -75,7 +75,7 @@
<select name="resolution"
onchange="document.changeform.knob[[% knum %]].checked=true">
[% FOREACH r = bug.choices.resolution %]
<option value="[% r FILTER html %]">[% r FILTER html %]</option>
<option value="[% r FILTER html %]">[% resolution_descs.${r} FILTER html %]</option>
[% END %]
</select>
<br>
......@@ -110,7 +110,7 @@
[% IF bug.isunconfirmed && bug.user.canconfirm %]
&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="andconfirm" name="andconfirm">
<label for="andconfirm">
and confirm [% terms.bug %] (change status to <b>NEW</b>)
and confirm [% terms.bug %] (change status to <b>[% status_descs.NEW FILTER html %]</b>)
</label>
<br>
[% END %]
......@@ -126,7 +126,7 @@
[% IF bug.isunconfirmed && bug.user.canconfirm %]
&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="compconfirm" name="compconfirm">
<label for="compconfirm">
and confirm [% terms.bug %] (change status to <b>NEW</b>)
and confirm [% terms.bug %] (change status to <b>[% status_descs.NEW FILTER html %]</b>)
</label>
<br>
[% END %]
......@@ -145,7 +145,7 @@
[% IF bug.bug_status == "RESOLVED" %]
<input type="radio" id="knob-verify" name="knob" value="verify">
<label for="knob-verify">
Mark [% terms.bug %] as <b>VERIFIED</b>
Mark [% terms.bug %] as <b>[% status_descs.VERIFIED FILTER html %]</b>
</label>
<br>
[% knum = knum + 1 %]
......@@ -153,7 +153,7 @@
[% IF bug.bug_status != "CLOSED" %]
<input type="radio" id="knob-close" name="knob" value="close">
<label for="knob-close">
Mark [% terms.bug %] as <b>CLOSED</b>
Mark [% terms.bug %] as <b>[% status_descs.CLOSED FILTER html %]</b>
</label>
<br>
[% knum = knum + 1 %]
......
template/en/default/global/field-descs.none.tmpl
View file @ df891085
......@@ -68,3 +68,21 @@
"version" => "Version",
"votes" => "Votes",
"work_time" => "Hours Worked"} %]
[% status_descs = { "UNCONFIRMED" => "UNCONFIRMED",
"NEW" => "NEW",
"ASSIGNED" => "ASSIGNED",
"REOPENED" => "REOPENED",
"RESOLVED" => "RESOLVED",
"VERIFIED" => "VERIFIED",
"CLOSED" => "CLOSED" } %]
[% resolution_descs = { "FIXED" => "FIXED",
"INVALID" => "INVALID",
"WONTFIX" => "WONTFIX",
"LATER" => "LATER",
"REMIND" => "REMIND",
"DUPLICATE" => "DUPLICATE",
"WORKSFORME" => "WORKSFORME",
"MOVED" => "MOVED" } %]
template/en/default/list/edit-multiple.html.tmpl
View file @ df891085
......@@ -245,7 +245,7 @@
[% knum = knum + 1 %]
<input id="knob-confirm" type="radio" name="knob" value="confirm">
<label for="knob-confirm">
Confirm [% terms.bugs %] (change status to <b>NEW</b>)
Confirm [% terms.bugs %] (change status to <b>[% status_descs.NEW FILTER html %]</b>)
</label><br>
[% END %]
......@@ -255,7 +255,7 @@
[% knum = knum + 1 %]
<input id="knob-accept" type="radio" name="knob" value="accept">
<label for="knob-accept">
Accept [% terms.bugs %] (change status to <b>ASSIGNED</b>)
Accept [% terms.bugs %] (change status to <b>[% status_descs.ASSIGNED FILTER html %]</b>)
</label><br>
[% knum = knum + 1 %]
......@@ -289,14 +289,14 @@
[% IF bugstatuses.contains('RESOLVED') %]
[% knum = knum + 1 %]
<input id="knob-verify" type="radio" name="knob" value="verify">
<label for="knob-verify">Mark [% terms.bugs %] as <b>VERIFIED</b></label><br>
<label for="knob-verify">Mark [% terms.bugs %] as <b>[% status_descs.VERIFIED FILTER html %]</b></label><br>
[% END %]
[% END %]
[% IF !bugstatuses.containsany(openstates) AND !bugstatuses.contains('CLOSED') %]
[% knum = knum + 1 %]
<input id="knob-close" type="radio" name="knob" value="close">
<label for="knob-close">Mark [% terms.bugs %] as <b>CLOSED</b></label><br>
<label for="knob-close">Mark [% terms.bugs %] as <b>[% status_descs.CLOSED FILTER html %]</b></label><br>
[% END %]
[% knum = knum + 1 %]
......
template/en/default/pages/fields.html.tmpl
View file @ df891085
......@@ -21,6 +21,7 @@
#%]
[% PROCESS global/variables.none.tmpl %]
[% PROCESS "global/field-descs.none.tmpl" %]
[% INCLUDE global/header.html.tmpl title = "A $terms.Bug's Life Cycle" %]
<p>
......@@ -54,45 +55,45 @@ cycle of [% terms.abug %].
<td>
<dl>
<dt>
<b>UNCONFIRMED</b>
<b>[% status_descs.UNCONFIRMED FILTER html %]</b>
</dt>
<dd>
This [% terms.bug %] has recently been added to the database.
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 NEW. Or, it may be
directly resolved and marked RESOLVED.
this [% terms.bug %], changing its state to [% status_descs.NEW FILTER html %]. Or, it may be
directly resolved and marked [% status_descs.RESOLVED FILTER html %].
</dd>
<dt>
<b>NEW</b>
<b>[% status_descs.NEW FILTER html %]</b>
</dt>
<dd>
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 <b>ASSIGNED</b>, passed
on to someone else, and remain <b>NEW</b>, or resolved and marked
<b>RESOLVED</b>.
this state may be accepted, and become <b>[% status_descs.ASSIGNED FILTER html %]</b>, passed
on to someone else, and remain <b>[% status_descs.NEW FILTER html %]</b>, or resolved and marked
<b>[% status_descs.RESOLVED FILTER html %]</b>.
</dd>
<dt>
<b>ASSIGNED</b>
<b>[% status_descs.ASSIGNED FILTER html %]</b>
</dt>
<dd>
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 <b>NEW</b>, or resolved and become <b>RESOLVED</b>.
person and become <b>[% status_descs.NEW FILTER html %]</b>, or resolved and become <b>[% descs.bug_status_descs.RESOLVED FILTER html %]</b>.
</dd>
<dt>
<b>REOPENED</b>
<b>[% status_descs.REOPENED FILTER html %]</b>
</dt>
<dd>
This [% terms.bug %] was once resolved, but the resolution was
deemed incorrect. For example, a <b>WORKSFORME</b> [% terms.bug %] is
<b>REOPENED</b> when more information shows up and
deemed incorrect. For example, a <b>[% status_descs.WORKSFORME FILTER html %]</b> [% terms.bug %] is
<b>[% status_descs.REOPENED FILTER html %]</b> when more information shows up and
the [% terms.bug %] is now reproducible. From here [% terms.bugs %] are
either marked <b>ASSIGNED</b> or <b>RESOLVED</b>.
either marked <b>[% status_descs.ASSIGNED FILTER html %]</b> or <b>[% descs.bug_status_descs.RESOLVED FILTER html %]</b>.
</dd>
</dl>
</td>
......@@ -113,33 +114,33 @@ cycle of [% terms.abug %].
<td>
<dl>
<dt>
<b>RESOLVED</b>
<b>[% status_descs.RESOLVED FILTER html %]</b>
</dt>
<dd>
A resolution has been taken, and it is awaiting verification by
QA. From here [% terms.bugs %] are either re-opened and become
<b>REOPENED</b>, are marked <b>VERIFIED</b>, or are closed for
good and marked <b>CLOSED</b>.
<b>[% status_descs.REOPENED FILTER html %]</b>, are marked <b>[% descs.bug_status_descs.VERIFIED FILTER html %]</b>, or are closed for
good and marked <b>[% status_descs.CLOSED FILTER html %]</b>.
</dd>
<dt>
<b>VERIFIED</b>
<b>[% status_descs.VERIFIED FILTER html %]</b>
</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>CLOSED</b>.
<b>[% status_descs.CLOSED FILTER html %]</b>.
</dd>
<dt>
<b>CLOSED</b>
<b>[% status_descs.CLOSED FILTER html %]</b>
</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>REOPENED</b>.
do so by becoming <b>[% status_descs.REOPENED FILTER html %]</b>.
</dd>
</dl>
</td>
......@@ -147,7 +148,7 @@ cycle of [% terms.abug %].
<td>
<dl>
<dt>
<b>FIXED</b>
<b>[% resolution_descs.FIXED FILTER html %]</b>
</dt>
<dd>
A fix for this [% terms.bug %] is checked into the tree and
......@@ -155,14 +156,14 @@ cycle of [% terms.abug %].
</dd>
<dt>
<b>INVALID</b>
<b>[% resolution_descs.INVALID FILTER html %]</b>
</dt>
<dd>
The problem described is not [% terms.abug %].
</dd>
<dt>
<b>WONTFIX</b>
<b>[% resolution_descs.WONTFIX FILTER html %]</b>
</dt>
<dd>
The problem described is [% terms.abug %] which will never be
......@@ -170,7 +171,7 @@ cycle of [% terms.abug %].
</dd>
<dt>
<b>DUPLICATE</b>
<b>[% resolution_descs.DUPLICATE FILTER html %]</b>
</dt>
<dd>
The problem is a duplicate of an existing [% terms.bug %].
......@@ -180,7 +181,7 @@ cycle of [% terms.abug %].
</dd>
<dt>
<b>WORKSFORME</b>
<b>[% resolution_descs.WORKSFORME FILTER html %]</b>
</dt>
<dd>
All attempts at reproducing this [% terms.bug %] were futile,
......@@ -190,7 +191,7 @@ cycle of [% terms.abug %].
</dd>
<dt>
<b>MOVED</b>
<b>[% resolution_descs.MOVED FILTER html %]</b>
</dt>
<dd>
The problem was specific to a related product
......@@ -295,12 +296,12 @@ others.
<p>
This is the person in charge of resolving the [% terms.bug %]. Every time
this field changes, the status changes to <b>NEW</b> to make it
this field changes, the status changes to <b>[% status_descs.NEW FILTER html %]</b> to make it
easy to see which new [% terms.bugs %] have appeared on a person's list.</p>
<p>
The default status for queries is set to NEW, ASSIGNED and
REOPENED. When searching for [% terms.bugs %] that have been resolved or
The default status for queries is set to [% status_descs.NEW FILTER html %], [% descs.bug_status_descs.ASSIGNED FILTER html %] and
[% status_descs.REOPENED FILTER html %]. When searching for [% terms.bugs %] that have been resolved or
verified, remember to set the status field appropriately.
</p>
......
template/en/default/whine/mail.html.tmpl
View file @ df891085
......@@ -82,8 +82,8 @@
<td align="left">[% bug.priority FILTER html %]</td>
<td align="left">[% bug.rep_platform FILTER html %]</td>
<td align="left">[% bug.$assignee_login_string FILTER html %]</td>
<td align="left">[% bug.bug_status FILTER html %]</td>
<td align="left">[% bug.resolution FILTER html %]</td>
<td align="left">[% status_descs.${bug.bug_status} FILTER html %]</td>
<td align="left">[% resolutions.descs.${bug.resolution} FILTER html %]</td>
<td align="left">[% bug.short_desc FILTER html %]</td>
</tr>
[% END %]
......
template/en/default/whine/mail.txt.tmpl
View file @ df891085
......@@ -57,8 +57,8 @@
Severity: [%+ bug.bug_severity -%]
Platform: [%+ bug.rep_platform %]
Assignee: [%+ bug.$assignee_login_string %]
Status: [%+ bug.bug_status %]
[%- IF bug.resolution -%] Resolution: [% bug.resolution -%]
Status: [%+ status_descs.${bug.bug_status} %]
[%- IF bug.resolution -%] Resolution: [% resolution_descs.${bug.resolution} -%]
[%- END %]
Summary: [% bug.short_desc %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment