diff options
| author | mkanat%bugzilla.org <> | 2009-11-18 07:04:57 +0000 |
|---|---|---|
| committer | mkanat%bugzilla.org <> | 2009-11-18 07:04:57 +0000 |
| commit | a44e152480c9c22ca9b3a89da774317c5590d21b (patch) | |
| tree | 035210618c0987beaffc953cbf09611866e0d3e5 /template/en/default/bug | |
| parent | bc19f61c0c33e71a00dcc8e4ca3e791a9e3b661d (diff) | |
| download | bugs-a44e152480c9c22ca9b3a89da774317c5590d21b.tar bugs-a44e152480c9c22ca9b3a89da774317c5590d21b.tar.gz bugs-a44e152480c9c22ca9b3a89da774317c5590d21b.tar.bz2 bugs-a44e152480c9c22ca9b3a89da774317c5590d21b.tar.xz bugs-a44e152480c9c22ca9b3a89da774317c5590d21b.zip | |
Bug 519142: Replace IF/ELSE statements about bug_status/resolution with just a display_value call, and use display_value in more places to translate field values.
Patch by Vitaly Fedrushkov <vitaly.fedrushkov@gmail.com> r=mkanat, a=mkanat
Diffstat (limited to 'template/en/default/bug')
| -rw-r--r-- | template/en/default/bug/activity/table.html.tmpl | 12 | ||||
| -rw-r--r-- | template/en/default/bug/create/create.html.tmpl | 7 | ||||
| -rw-r--r-- | template/en/default/bug/show-multiple.html.tmpl | 6 |
3 files changed, 7 insertions, 18 deletions
diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl index a467fe5f2..ae9dbcb80 100644 --- a/template/en/default/bug/activity/table.html.tmpl +++ b/template/en/default/bug/activity/table.html.tmpl @@ -80,15 +80,11 @@ change.fieldname == 'remaining_time' || change.fieldname == 'work_time' %] [% PROCESS formattimeunit time_unit=change.removed %] - [% ELSIF change.fieldname == 'bug_status' %] - [% display_value("bug_status", change.removed) FILTER html %] - [% ELSIF change.fieldname == 'resolution' %] - [% display_value("resolution", change.removed) FILTER html %] [% ELSIF change.fieldname == 'blocked' || change.fieldname == 'dependson' %] [% change.removed FILTER bug_list_link FILTER none %] [% ELSE %] - [% change.removed FILTER email FILTER html %] + [% display_value(change.fieldname, change.removed) FILTER email FILTER html %] [% END %] [% ELSE %] @@ -100,15 +96,11 @@ change.fieldname == 'remaining_time' || change.fieldname == 'work_time' %] [% PROCESS formattimeunit time_unit=change.added %] - [% ELSIF change.fieldname == 'bug_status' %] - [% display_value("bug_status", change.added) FILTER html %] - [% ELSIF change.fieldname == 'resolution' %] - [% display_value("resolution", change.added) FILTER html %] [% ELSIF change.fieldname == 'blocked' || change.fieldname == 'dependson' %] [% change.added FILTER bug_list_link FILTER none %] [% ELSE %] - [% change.added FILTER email FILTER html %] + [% display_value(change.fieldname, change.added) FILTER email FILTER html %] [% END %] [% ELSE %] diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index 3572ec372..f466f7704 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -664,11 +664,8 @@ TUI_hide_default('expert_fields'); [%- FOREACH x = ${sel.name} %] <option value="[% x FILTER html %]" [% " selected=\"selected\"" IF x == default.${sel.name} %]> - [% IF sel.name == "bug_status" %] - [% display_value("bug_status", x) FILTER html %] - [% ELSE %] - [% x FILTER html %] - [% END %]</option> + [% display_value(sel.name, x) FILTER html %] + </option> [% END %] </select> diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl index b6507b964..177bea14f 100644 --- a/template/en/default/bug/show-multiple.html.tmpl +++ b/template/en/default/bug/show-multiple.html.tmpl @@ -139,7 +139,7 @@ <tr> <th>[% field_descs.bug_severity FILTER html %]:</th> <td class="bz_[% bug.bug_severity FILTER css_class_quote -%]"> - [% bug.bug_severity FILTER html %] + [% display_value("bug_severity", bug.bug_severity) FILTER html %] </td> [% PROCESS rightcell %] @@ -301,7 +301,7 @@ [% BLOCK row %] <tr> <th>[% field_descs.${cell} FILTER html %]:</th> - <td[% " colspan=3" IF fullrow %]>[% bug.${cell} FILTER html %]</td> + <td[% " colspan=3" IF fullrow %]>[% display_value(cell, bug.${cell}) FILTER html %]</td> [% PROCESS rightcell IF !fullrow %] </tr> [% fullrow = 0 %] @@ -357,7 +357,7 @@ </td> [% ELSIF name != "" %] <th class="rightcell">[% field_descs.${name} FILTER html %]:</th> - <td>[% bug.${name} FILTER html %]</td> + <td>[% display_value(name, bug.${name}) FILTER html %]</td> [% ELSE %] <td> </td> <td> </td> |