diff options
27 files changed, 93 insertions, 93 deletions
diff --git a/template/en/default/admin/products/edit-common.html.tmpl b/template/en/default/admin/products/edit-common.html.tmpl index 8b42592cb..e7bcbbb7a 100644 --- a/template/en/default/admin/products/edit-common.html.tmpl +++ b/template/en/default/admin/products/edit-common.html.tmpl @@ -105,7 +105,7 @@ <td> Enter the number of votes [% terms.abug %] in this product needs to automatically get out of the - <a href="page.cgi?id=fields.html#status">[% get_status("UNCONFIRMED") FILTER html %]</a> + <a href="page.cgi?id=fields.html#status">[% display_value("bug_status", "UNCONFIRMED") FILTER html %]</a> state.<br> <input size="5" maxlength="5" name="votestoconfirm" value="[% product.votestoconfirm FILTER html %]"> diff --git a/template/en/default/admin/workflow/edit.html.tmpl b/template/en/default/admin/workflow/edit.html.tmpl index 1328ce005..787937989 100644 --- a/template/en/default/admin/workflow/edit.html.tmpl +++ b/template/en/default/admin/workflow/edit.html.tmpl @@ -35,8 +35,8 @@ <p> This page allows you to define which status transitions are valid in your workflow. For compatibility with older versions of [% terms.Bugzilla %], reopening [% terms.abug %] - will only display either [% get_status("UNCONFIRMED") FILTER html %] or - [%+ get_status("REOPENED") FILTER html %] (if allowed by your workflow) but not + will only display either [% display_value("bug_status", "UNCONFIRMED") FILTER html %] or + [%+ display_value("bug_status", "REOPENED") FILTER html %] (if allowed by your workflow) but not both. The decision depends on whether the [% terms.bug %] has ever been confirmed or not. So it is a good idea to allow both transitions and let [% terms.Bugzilla %] select the correct one. diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl index 0b965bc4e..72844a36e 100644 --- a/template/en/default/attachment/create.html.tmpl +++ b/template/en/default/attachment/create.html.tmpl @@ -84,10 +84,10 @@ [% IF bug_statuses.size %] <label for="takebug">and set the [% terms.bug %] status to</label> <select id="bug_status" name="bug_status"> - <option value="[% bug.status.name FILTER html %]">[% get_status(bug.status.name) FILTER html %] (current)</option> + <option value="[% bug.status.name FILTER html %]">[% display_value("bug_status", bug.status.name) FILTER html %] (current)</option> [% FOREACH bug_status = bug_statuses %] [% NEXT IF bug_status.id == bug.status.id %] - <option value="[% bug_status.name FILTER html %]">[% get_status(bug_status.name) FILTER html %]</option> + <option value="[% bug_status.name FILTER html %]">[% display_value("bug_status", bug_status.name) FILTER html %]</option> [% END %] </select> [% END %] diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl index 8e44230ae..55f7f6e45 100644 --- a/template/en/default/bug/activity/table.html.tmpl +++ b/template/en/default/bug/activity/table.html.tmpl @@ -82,9 +82,9 @@ change.fieldname == 'work_time' %] [% PROCESS formattimeunit time_unit=change.removed %] [% ELSIF change.fieldname == 'bug_status' %] - [% get_status(change.removed) FILTER html %] + [% display_value("bug_status", change.removed) FILTER html %] [% ELSIF change.fieldname == 'resolution' %] - [% get_resolution(change.removed) FILTER html %] + [% display_value("resolution", change.removed) FILTER html %] [% ELSIF change.fieldname == 'blocked' || change.fieldname == 'dependson' %] [% change.removed FILTER bug_list_link FILTER none %] @@ -102,9 +102,9 @@ change.fieldname == 'work_time' %] [% PROCESS formattimeunit time_unit=change.added %] [% ELSIF change.fieldname == 'bug_status' %] - [% get_status(change.added) FILTER html %] + [% display_value("bug_status", change.added) FILTER html %] [% ELSIF change.fieldname == 'resolution' %] - [% get_resolution(change.added) FILTER html %] + [% display_value("resolution", change.added) FILTER html %] [% ELSIF change.fieldname == 'blocked' || change.fieldname == 'dependson' %] [% change.added FILTER bug_list_link FILTER none %] diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index dab451ed7..1d3160563 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -336,7 +336,7 @@ TUI_hide_default('expert_fields'); <input type="hidden" name="bug_status" value="[% default.bug_status FILTER html %]"> <th>Initial State:</th> - <td>[% get_status(default.bug_status) FILTER html %]</td> + <td>[% display_value("bug_status", default.bug_status) FILTER html %]</td> [% ELSE %] [% sel = { description => 'Initial State', name => 'bug_status' } %] [% INCLUDE select %] @@ -665,7 +665,7 @@ TUI_hide_default('expert_fields'); <option value="[% x FILTER html %]" [% " selected=\"selected\"" IF x == default.${sel.name} %]> [% IF sel.name == "bug_status" %] - [% get_status(x) FILTER html %] + [% display_value("bug_status", x) FILTER html %] [% ELSE %] [% x FILTER html %] [% END %]</option> diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl index 347478bfc..c42c3c4d1 100644 --- a/template/en/default/bug/dependency-tree.html.tmpl +++ b/template/en/default/bug/dependency-tree.html.tmpl @@ -153,7 +153,7 @@ [% END %] [% BLOCK buginfo %] - [% get_status(bug.bug_status) FILTER html -%] [%+ get_resolution(bug.resolution) FILTER html %]; + [% display_value("bug_status", bug.bug_status) FILTER html -%] [%+ display_value("resolution", bug.resolution) FILTER html %]; [%-%] assigned to [% bug.assigned_to.login FILTER email FILTER html %] [%-%][% "; Target: " _ bug.target_milestone IF bug.target_milestone %] [% END %] diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 765306438..e050ee64c 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -445,9 +445,9 @@ </td> <td id="bz_field_status"> <span id="static_bug_status"> - [% get_status(bug.bug_status) FILTER html %] + [% display_value("bug_status", bug.bug_status) FILTER html %] [% IF bug.resolution %] - [%+ get_resolution(bug.resolution) FILTER html %] + [%+ display_value("resolution", bug.resolution) FILTER html %] [% IF bug.dup_id %] of [% "${terms.bug} ${bug.dup_id}" FILTER bug_link(bug.dup_id) FILTER none %] [% END %] diff --git a/template/en/default/bug/format_comment.txt.tmpl b/template/en/default/bug/format_comment.txt.tmpl index 6da39e6eb..e399d8218 100755..100644 --- a/template/en/default/bug/format_comment.txt.tmpl +++ b/template/en/default/bug/format_comment.txt.tmpl @@ -54,7 +54,7 @@ If the move succeeded, [% comment.extra_data %] will receive a mail containing the number of the new [% terms.bug %] in the other database. If all went well, please mark this [% terms.bug %] -[%+ get_status('VERIFIED') %], and paste in a link to the new [% terms.bug %]. +[%+ display_value("bug_status", 'VERIFIED') %], and paste in a link to the new [% terms.bug %]. Otherwise, reopen this [% terms.bug %]. [%- ELSE -%] [%- wrapped_comment %] diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl index a8a3a9df8..cd586fceb 100644 --- a/template/en/default/bug/knob.html.tmpl +++ b/template/en/default/bug/knob.html.tmpl @@ -44,7 +44,7 @@ [% PROCESS initial_action %] [% NEXT IF bug_status.name == bug.bug_status %] <option value="[% bug_status.name FILTER html %]"> - [% get_status(bug_status.name) FILTER html %] + [% display_value("bug_status", bug_status.name) FILTER html %] </option> [% IF !bug_status.is_open %] [% show_resolution = 1 %] @@ -71,9 +71,9 @@ [% IF bug_status_select_displayed %] </select> [% ELSE %] - [% get_status(bug.bug_status) FILTER html %] + [% display_value("bug_status", bug.bug_status) FILTER html %] [% IF bug.resolution %] - [%+ get_resolution(bug.resolution) FILTER html %] + [%+ display_value("resolution", bug.resolution) FILTER html %] [% IF bug.dup_id %] <span id="duplicate_display">of [% "${terms.bug} ${bug.dup_id}" FILTER bug_link(bug.dup_id) FILTER none %]</span> @@ -133,7 +133,7 @@ [% BLOCK initial_action %] [% IF !initial_action_shown %] <option selected value="[% bug.bug_status FILTER html %]"> - [% get_status(bug.bug_status) FILTER html %] + [% display_value("bug_status", bug.bug_status) FILTER html %] </option> [% IF !bug.isopened %] [% show_resolution = 1 %] @@ -150,7 +150,7 @@ [% NEXT IF r == "MOVED" && bug.resolution != "MOVED" %] <option value="[% r FILTER html %]" [% "selected" IF r == bug.resolution %]> - [% get_resolution(r) FILTER html %]</option> + [% display_value("resolution", r) FILTER html %]</option> [% END %] </select> [% END %] diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl index f1a5cc466..473453eb5 100644 --- a/template/en/default/bug/show-multiple.html.tmpl +++ b/template/en/default/bug/show-multiple.html.tmpl @@ -129,8 +129,8 @@ <tr> <th>[% field_descs.bug_status FILTER html %]:</th> <td> - [% get_status(bug.bug_status) FILTER html %] - [%+ get_resolution(bug.resolution) FILTER html %] + [% display_value("bug_status", bug.bug_status) FILTER html %] + [%+ display_value("resolution", bug.resolution) FILTER html %] </td> [% PROCESS rightcell %] diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl index e07452ed1..eb5ba7a77 100644 --- a/template/en/default/bug/summarize-time.html.tmpl +++ b/template/en/default/bug/summarize-time.html.tmpl @@ -186,7 +186,7 @@ <td width="80" valign="top"> <b>[% "$terms.Bug $id" FILTER bug_link(id) FILTER none %]</b> </td> - <td width="100"><b>[% get_status(bugs.$id.bug_status) FILTER html %]</b></td> + <td width="100"><b>[% display_value("bug_status", bugs.$id.bug_status) FILTER html %]</b></td> <td colspan="2">[% bugs.$id.short_desc FILTER html %]</td> [% IF extra %] <td align="right" valign="top">[% bugdata.total_time FILTER html %]</td> diff --git a/template/en/default/email/whine.txt.tmpl b/template/en/default/email/whine.txt.tmpl index caf43eb6d..a97887ede 100644 --- a/template/en/default/email/whine.txt.tmpl +++ b/template/en/default/email/whine.txt.tmpl @@ -30,14 +30,14 @@ 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 [% get_status("NEW") %] or -[% get_status("REOPENED") %] state, and have not been +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. You need to take a look at them, and decide on an initial action. Generally, this means one of three things: -(1) You decide this [% terms.bug %] is really quick to deal with (like, it's [% get_resolution("INVALID") %]), +(1) You decide this [% terms.bug %] is really quick to deal with (like, it's [% display_value("resolution", "INVALID") %]), and so you get rid of it immediately. (2) You decide the [% terms.bug %] doesn't belong to you, and you reassign it to someone else. (Hint: if you don't know who to reassign it to, make @@ -46,7 +46,7 @@ Generally, this means one of three things: (3) You decide the [% terms.bug %] belongs to you, but you can't solve it this moment. Just use the "Accept [% terms.bug %]" command. -To get a list of all [% get_status("NEW") %]/[% get_status("REOPENED") %] [%+ terms.bugs %], you can use this URL (bookmark +To get a list of all [% display_value("bug_status", "NEW") %]/[% display_value("bug_status", "REOPENED") %] [%+ terms.bugs %], you can use this URL (bookmark it if you like!): [% urlbase %]buglist.cgi?bug_status=NEW&bug_status=REOPENED&assigned_to=[% email %] @@ -54,7 +54,7 @@ it if you like!): Or, you can use the general query page, at [%+ urlbase %]query.cgi -Appended below are the individual URLs to get to all of your [% get_status("NEW") %] [%+ terms.bugs %] +Appended below are the individual URLs to get to all of your [% display_value("bug_status", "NEW") %] [%+ 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/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 4ba5e647a..d75ca4432 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -336,7 +336,7 @@ [% ELSIF error == "no_open_bug_status" %] [% title = "$terms.Bug Cannot Be Confirmed" %] There is no valid transition from - [%+ get_status("UNCONFIRMED") FILTER html %] to an open state. + [%+ display_value("bug_status", "UNCONFIRMED") FILTER html %] to an open state. [% ELSIF error == "param_invalid" %] [% title = "Invalid Parameter" %] diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index dd3967dc1..766e39113 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -346,10 +346,10 @@ [% field_descs.$field_name FILTER html %] [% ELSIF message_tag == "get_resolution" %] - [% get_resolution(resolution) FILTER html %] + [% display_value("resolution", resolution) FILTER html %] [% ELSIF message_tag == "get_status" %] - [% get_status(status) FILTER html %] + [% display_value("bug_status", status) FILTER html %] [% ELSIF message_tag == "group_created" %] [% title = "New Group Created" %] diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl index 4cbc8b6e2..fa8d3d1ae 100644 --- a/template/en/default/list/edit-multiple.html.tmpl +++ b/template/en/default/list/edit-multiple.html.tmpl @@ -384,7 +384,7 @@ [% FOREACH bug_status = new_bug_statuses %] <option value="[% bug_status.name FILTER html %]"> - [% get_status(bug_status.name) FILTER html %] + [% display_value("bug_status", bug_status.name) FILTER html %] </option> [% IF !bug_status.is_open %] [% filtered_status = bug_status.name FILTER js %] @@ -405,7 +405,7 @@ [% FOREACH r = resolutions %] [% NEXT IF !r %] [% NEXT IF r == "DUPLICATE" || r == "MOVED" %] - <option value="[% r FILTER html %]">[% get_resolution(r) FILTER html %]</option> + <option value="[% r FILTER html %]">[% display_value("resolution", r) FILTER html %]</option> [% END %] </select> </span> diff --git a/template/en/default/list/list.csv.tmpl b/template/en/default/list/list.csv.tmpl index 1a25b3907..6114d6fae 100644 --- a/template/en/default/list/list.csv.tmpl +++ b/template/en/default/list/list.csv.tmpl @@ -36,9 +36,9 @@ bug_id [% rawcolumn = column.replace("date", "time") %] [% bug.$column = bug.$rawcolumn FILTER time("%Y-%m-%d %H:%M:%S") %] [% ELSIF column == 'bug_status' %] - [% bug.$column = get_status(bug.$column) %] + [% bug.$column = display_value("bug_status", bug.$column) %] [% ELSIF column == 'resolution' %] - [%- bug.$column = get_resolution(bug.$column) %] + [%- bug.$column = display_value("resolution", bug.$column) %] [% END %] [% bug.$column FILTER csv %] [% END %] diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl index c723e3f95..7c372f1f4 100644 --- a/template/en/default/list/list.html.tmpl +++ b/template/en/default/list/list.html.tmpl @@ -93,11 +93,11 @@ [% END %] [% IF desc_item.field == 'bug_status' %] [% FOREACH status IN desc_item.value.split(',') %] - [%+ get_status(status) FILTER html %][% ',' UNLESS loop.last %] + [%+ display_value("bug_status", status) FILTER html %][% ',' UNLESS loop.last %] [% END %] [% ELSIF desc_item.field == 'resolution' %] [% FOREACH resolution IN desc_item.value.split(',') %] - [%+ get_resolution(resolution) FILTER html %][% ',' UNLESS loop.last %] + [%+ display_value("resolution", resolution) FILTER html %][% ',' UNLESS loop.last %] [% END %] [% ELSE %] [%+ desc_item.value FILTER html %] diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index 87833ff5b..2305d2fa5 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -199,9 +199,9 @@ [% IF abbrev.$column.maxlength %] <span title=" [%- IF column == 'bug_status' %] - [%- get_status(bug.$column) FILTER html %] + [%- display_value("bug_status", bug.$column) FILTER html %] [% ELSIF column == 'resolution' %] - [%- get_resolution(bug.$column) FILTER html %] + [%- display_value("resolution", bug.$column) FILTER html %] [% ELSE %] [%- bug.$column FILTER html %] [% END %]"> @@ -213,9 +213,9 @@ column == 'estimated_time' %] [% PROCESS formattimeunit time_unit=bug.$column %] [% ELSIF column == 'bug_status' %] - [%- get_status(bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html %] + [%- display_value("bug_status", bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html %] [% ELSIF column == 'resolution' %] - [%- get_resolution(bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html %] + [%- display_value("resolution", bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html %] [%# Display the login name of the user if their real name is empty. %] [% ELSIF column.match('_realname$') && bug.$column == '' %] diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl index 7487841c8..9e938bbcb 100644 --- a/template/en/default/pages/fields.html.tmpl +++ b/template/en/default/pages/fields.html.tmpl @@ -54,47 +54,47 @@ cycle of [% terms.abug %]. <td> <dl> <dt> - <b>[% get_status("UNCONFIRMED") FILTER html %]</b> + <b>[% display_value("bug_status", "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 [% get_status("NEW") FILTER html %]. Or, it may be - directly resolved and marked [% get_status("RESOLVED") FILTER html %]. + 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 %]. </dd> <dt> - <b>[% get_status("NEW") FILTER html %]</b> + <b>[% display_value("bug_status", "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>[% get_status("ASSIGNED") FILTER html %]</b>, passed - on to someone else, and remain <b>[% get_status("NEW") FILTER html %]</b>, or resolved and marked - <b>[% get_status("RESOLVED") FILTER html %]</b>. + this state may be accepted, and become <b>[% display_value("bug_status", "ASSIGNED") FILTER html %]</b>, passed + on to someone else, and remain <b>[% display_value("bug_status", "NEW") FILTER html %]</b>, or resolved and marked + <b>[% display_value("bug_status", "RESOLVED") FILTER html %]</b>. </dd> <dt> - <b>[% get_status("ASSIGNED") FILTER html %]</b> + <b>[% display_value("bug_status", "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>[% get_status("NEW") FILTER html %]</b>, or - resolved and become <b>[% get_status("RESOLVED") FILTER html %]</b>. + person and become <b>[% display_value("bug_status", "NEW") FILTER html %]</b>, or + resolved and become <b>[% display_value("bug_status", "RESOLVED") FILTER html %]</b>. </dd> <dt> - <b>[% get_status("REOPENED") FILTER html %]</b> + <b>[% display_value("bug_status", "REOPENED") FILTER html %]</b> </dt> <dd> This [% terms.bug %] was once resolved, but the resolution was - deemed incorrect. For example, a <b>[% get_resolution("WORKSFORME") FILTER html %]</b> [% terms.bug %] is - <b>[% get_status("REOPENED") FILTER html %]</b> when more information shows up and + deemed incorrect. For example, a <b>[% display_value("resolution", "WORKSFORME") FILTER html %]</b> [% terms.bug %] is + <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>[% get_status("ASSIGNED") FILTER html %]</b> or - <b>[% get_status("RESOLVED") FILTER html %]</b>. + either marked <b>[% display_value("bug_status", "ASSIGNED") FILTER html %]</b> or + <b>[% display_value("bug_status", "RESOLVED") FILTER html %]</b>. </dd> </dl> </td> @@ -115,34 +115,34 @@ cycle of [% terms.abug %]. <td> <dl> <dt> - <b>[% get_status("RESOLVED") FILTER html %]</b> + <b>[% display_value("bug_status", "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>[% get_status("REOPENED") FILTER html %]</b>, are marked - <b>[% get_status("VERIFIED") FILTER html %]</b>, or are closed for - good and marked <b>[% get_status("CLOSED") FILTER html %]</b>. + <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>. </dd> <dt> - <b>[% get_status("VERIFIED") FILTER html %]</b> + <b>[% display_value("bug_status", "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>[% get_status("CLOSED") FILTER html %]</b>. + <b>[% display_value("bug_status", "CLOSED") FILTER html %]</b>. </dd> <dt> - <b>[% get_status("CLOSED") FILTER html %]</b> + <b>[% display_value("bug_status", "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>[% get_status("REOPENED") FILTER html %]</b>. + do so by becoming <b>[% display_value("bug_status", "REOPENED") FILTER html %]</b>. </dd> </dl> </td> @@ -150,7 +150,7 @@ cycle of [% terms.abug %]. <td> <dl> <dt> - <b>[% get_resolution("FIXED") FILTER html %]</b> + <b>[% display_value("resolution", "FIXED") FILTER html %]</b> </dt> <dd> A fix for this [% terms.bug %] is checked into the tree and @@ -158,14 +158,14 @@ cycle of [% terms.abug %]. </dd> <dt> - <b>[% get_resolution("INVALID") FILTER html %]</b> + <b>[% display_value("resolution", "INVALID") FILTER html %]</b> </dt> <dd> The problem described is not [% terms.abug %]. </dd> <dt> - <b>[% get_resolution("WONTFIX") FILTER html %]</b> + <b>[% display_value("resolution", "WONTFIX") FILTER html %]</b> </dt> <dd> The problem described is [% terms.abug %] which will never be @@ -173,7 +173,7 @@ cycle of [% terms.abug %]. </dd> <dt> - <b>[% get_resolution("DUPLICATE") FILTER html %]</b> + <b>[% display_value("resolution", "DUPLICATE") FILTER html %]</b> </dt> <dd> The problem is a duplicate of an existing [% terms.bug %]. @@ -183,7 +183,7 @@ cycle of [% terms.abug %]. </dd> <dt> - <b>[% get_resolution("WORKSFORME") FILTER html %]</b> + <b>[% display_value("resolution", "WORKSFORME") FILTER html %]</b> </dt> <dd> All attempts at reproducing this [% terms.bug %] were futile, @@ -193,7 +193,7 @@ cycle of [% terms.abug %]. </dd> <dt> - <b>[% get_resolution("MOVED") FILTER html %]</b> + <b>[% display_value("resolution", "MOVED") FILTER html %]</b> </dt> <dd> The problem was specific to a related product @@ -303,12 +303,12 @@ others. <p> This is the person in charge of resolving the [% terms.bug %]. Every time -this field changes, the status changes to <b>[% get_status("NEW") FILTER html %]</b> to make it +this field changes, the status changes to <b>[% display_value("bug_status", "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 [% get_status("NEW") FILTER html %], -[%+ get_status("ASSIGNED") FILTER html %] and [% get_status("REOPENED") FILTER html %]. +The default status for queries is set to [% display_value("bug_status", "NEW") FILTER html %], +[%+ display_value("bug_status", "ASSIGNED") FILTER html %] and [% display_value("bug_status", "REOPENED") FILTER html %]. When searching for [% terms.bugs %] that have been resolved or verified, remember to set the status field appropriately. </p> diff --git a/template/en/default/reports/report-bar.png.tmpl b/template/en/default/reports/report-bar.png.tmpl index 74e2ca34e..cb9fab24f 100644 --- a/template/en/default/reports/report-bar.png.tmpl +++ b/template/en/default/reports/report-bar.png.tmpl @@ -28,25 +28,25 @@ [% IF col_field == 'bug_status' %] [% FOR i IN [ 0 .. data.0.0.max ] %] - [% data.0.0.$i = get_status(data.0.0.$i) %] + [% data.0.0.$i = display_value("bug_status", data.0.0.$i) %] [% END %] [% END %] [% IF col_field == 'resolution' %] [% FOR i IN [ 0 .. data.0.0.max ] %] - [% data.0.0.$i = get_resolution(data.0.0.$i) %] + [% data.0.0.$i = display_value("resolution", data.0.0.$i) %] [% END %] [% END %] [% IF row_field == 'bug_status' %] [% FOR i IN [ 0 .. row_names.max ] %] - [% row_names.$i = get_status(row_names.$i) %] + [% row_names.$i = display_value("bug_status", row_names.$i) %] [% END %] [% END %] [% IF row_field == 'resolution' %] [% FOR i IN [ 0 .. row_names.max ] %] - [% row_names.$i = get_resolution(row_names.$i) %] + [% row_names.$i = display_value("resolution", row_names.$i) %] [% END %] [% END %] diff --git a/template/en/default/reports/report-line.png.tmpl b/template/en/default/reports/report-line.png.tmpl index d4982bc7a..fc8b418af 100644 --- a/template/en/default/reports/report-line.png.tmpl +++ b/template/en/default/reports/report-line.png.tmpl @@ -28,25 +28,25 @@ [% IF col_field == 'bug_status' %] [% FOR i IN [ 0 .. data.0.0.max ] %] - [% data.0.0.$i = get_status(data.0.0.$i) %] + [% data.0.0.$i = display_value("bug_status", data.0.0.$i) %] [% END %] [% END %] [% IF col_field == 'resolution' %] [% FOR i IN [ 0 .. data.0.0.max ] %] - [% data.0.0.$i = get_resolution(data.0.0.$i) %] + [% data.0.0.$i = display_value("resolution", data.0.0.$i) %] [% END %] [% END %] [% IF row_field == 'bug_status' %] [% FOR i IN [ 0 .. row_names.max ] %] - [% row_names.$i = get_status(row_names.$i) %] + [% row_names.$i = display_value("bug_status", row_names.$i) %] [% END %] [% END %] [% IF row_field == 'resolution' %] [% FOR i IN [ 0 .. row_names.max ] %] - [% row_names.$i = get_resolution(row_names.$i) %] + [% row_names.$i = display_value("resolution", row_names.$i) %] [% END %] [% END %] diff --git a/template/en/default/reports/report-pie.png.tmpl b/template/en/default/reports/report-pie.png.tmpl index 342d9b78a..05a359032 100644 --- a/template/en/default/reports/report-pie.png.tmpl +++ b/template/en/default/reports/report-pie.png.tmpl @@ -24,13 +24,13 @@ [% IF col_field == 'bug_status' %] [% FOR i IN [ 0 .. data.0.0.max ] %] - [% data.0.0.$i = get_status(data.0.0.$i) %] + [% data.0.0.$i = display_value("bug_status", data.0.0.$i) %] [% END %] [% END %] [% IF col_field == 'resolution' %] [% FOR i IN [ 0 .. data.0.0.max ] %] - [% data.0.0.$i = get_resolution(data.0.0.$i) %] + [% data.0.0.$i = display_value("resolution", data.0.0.$i) %] [% END %] [% END %] diff --git a/template/en/default/reports/report-table.csv.tmpl b/template/en/default/reports/report-table.csv.tmpl index 0f315cc02..3694b9b35 100644 --- a/template/en/default/reports/report-table.csv.tmpl +++ b/template/en/default/reports/report-table.csv.tmpl @@ -69,9 +69,9 @@ [% BLOCK value_display %] [% SET disp_value = value %] [% IF field == 'bug_status' %] - [% SET disp_value = get_status(value) %] + [% SET disp_value = display_value("bug_status", value) %] [% ELSIF field == 'resolution' %] - [% SET disp_value = get_resolution(value) %] + [% SET disp_value = display_value("resolution", value) %] [% ELSIF field == 'assigned_to' OR field == 'reporter' OR field == 'qa_contact' %] diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl index 6c5d6ede2..6c0abe4d3 100644 --- a/template/en/default/reports/report-table.html.tmpl +++ b/template/en/default/reports/report-table.html.tmpl @@ -156,9 +156,9 @@ [% BLOCK value_display %] [% SET disp_value = value %] [% IF field == 'bug_status' %] - [% SET disp_value = get_status(value) %] + [% SET disp_value = display_value("bug_status", value) %] [% ELSIF field == 'resolution' %] - [% SET disp_value = get_resolution(value) %] + [% SET disp_value = display_value("resolution", value) %] [% ELSIF field == 'assigned_to' OR field == 'reporter' OR field == 'qa_contact' %] diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl index b09516de1..c6b3c3b30 100644 --- a/template/en/default/search/form.html.tmpl +++ b/template/en/default/search/form.html.tmpl @@ -617,10 +617,10 @@ function doOnSelectProduct(selectmode) { <option value="[% value.name OR '---' FILTER html %]" [% " selected" IF lsearch(default.${sel.name}, value.name) != -1 %]> [% IF sel.name == "bug_status" %] - [% get_status(value.name) FILTER html %] + [% display_value("bug_status", value.name) FILTER html %] [% ELSIF sel.name == "resolution" %] [%# Again, resolution has that odd empty value. Replace it with '---' %] - [% get_resolution(value.name) OR '---' FILTER html %] + [% display_value("resolution", value.name) OR '---' FILTER html %] [% ELSE %] [% value.name FILTER html %] [% END %] diff --git a/template/en/default/whine/mail.html.tmpl b/template/en/default/whine/mail.html.tmpl index e1df9dbad..d25bcd4dd 100644 --- a/template/en/default/whine/mail.html.tmpl +++ b/template/en/default/whine/mail.html.tmpl @@ -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">[% get_status(bug.bug_status) FILTER html %]</td> - <td align="left">[% get_resolution(bug.resolution) FILTER html %]</td> + <td align="left">[% display_value("bug_status", bug.bug_status) FILTER html %]</td> + <td align="left">[% display_value("resolution", bug.resolution) FILTER html %]</td> <td align="left">[% bug.short_desc FILTER html %]</td> </tr> [% END %] diff --git a/template/en/default/whine/mail.txt.tmpl b/template/en/default/whine/mail.txt.tmpl index 4375ee13b..6df8d4346 100644 --- a/template/en/default/whine/mail.txt.tmpl +++ b/template/en/default/whine/mail.txt.tmpl @@ -57,8 +57,8 @@ Severity: [%+ bug.bug_severity -%] Platform: [%+ bug.rep_platform %] Assignee: [%+ bug.$assignee_login_string %] - Status: [%+ get_status(bug.bug_status) %] - [%- IF bug.resolution -%] Resolution: [% get_resolution(bug.resolution) -%] + Status: [%+ display_value("bug_status", bug.bug_status) %] + [%- IF bug.resolution -%] Resolution: [% display_value("resolution", bug.resolution) -%] [%- END %] Summary: [% bug.short_desc %] |
