diff options
Diffstat (limited to 'template/en/default/bug')
| -rw-r--r-- | template/en/default/bug/activity/table.html.tmpl | 8 | ||||
| -rw-r--r-- | template/en/default/bug/create/create.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/bug/dependency-tree.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | template/en/default/bug/format_comment.txt.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/bug/knob.html.tmpl | 10 | ||||
| -rw-r--r-- | template/en/default/bug/show-multiple.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/bug/summarize-time.html.tmpl | 2 |
8 files changed, 18 insertions, 18 deletions
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> |