From 12b3b674e4dac42707c39ce2389907f2e4e6a74c Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Fri, 14 Jul 2006 01:00:40 +0000
Subject: Bug 94534: Customised resolutions - Patch by Frédéric Buclin
 <LpSolit@gmail.com> r=mkanat a=myk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/en/default/bug/activity/table.html.tmpl | 4 ++--
 template/en/default/bug/edit.html.tmpl           | 2 +-
 template/en/default/bug/knob.html.tmpl           | 4 ++--
 template/en/default/bug/show-multiple.html.tmpl  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'template/en/default/bug')

diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl
index 31556623d..5bfb79f37 100644
--- a/template/en/default/bug/activity/table.html.tmpl
+++ b/template/en/default/bug/activity/table.html.tmpl
@@ -85,7 +85,7 @@
                 [% ELSIF change.fieldname == 'bug_status' %]
                   [% status_descs.${change.removed} FILTER html %]
                 [% ELSIF change.fieldname == 'resolution' %]
-                  [% resolution_descs.${change.removed} FILTER html %]
+                  [% get_resolution(change.removed) FILTER html %]
                 [% ELSIF change.fieldname == 'blocked' ||
                          change.fieldname == 'dependson' %]
                   [% change.removed FILTER bug_list_link FILTER none %]
@@ -105,7 +105,7 @@
                 [% ELSIF change.fieldname == 'bug_status' %]
                   [% status_descs.${change.added} FILTER html %]
                 [% ELSIF change.fieldname == 'resolution' %]
-                  [% resolution_descs.${change.added} FILTER html %]
+                  [% get_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/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index adbccd141..2ea8d0db6 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -198,7 +198,7 @@
               </b>
             </td>
             <td>
-              [% resolution_descs.${bug.resolution} FILTER html %]
+              [% get_resolution(bug.resolution) FILTER html %]
               [% IF bug.resolution == "DUPLICATE" %]
                 of [% terms.bug %] [%+ "${bug.dup_id}" FILTER bug_link(bug.dup_id) %]
               [% END %]
diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index 38a4898fe..36712911e 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -28,7 +28,7 @@
   <input type="radio" id="knob-leave" name="knob" value="none" checked="checked">
   <label for="knob-leave">
     Leave as <b>[% status_descs.${bug.bug_status} FILTER html %]&nbsp;
-                [% resolution_descs.${bug.resolution} FILTER html %]</b>
+                [% get_resolution(bug.resolution) FILTER html %]</b>
   </label>
   <br>
 
@@ -185,7 +185,7 @@
   <select name="resolution"
           onchange="document.changeform.knob[[% knum %]].checked=true">
     [% FOREACH r = bug.choices.resolution %]
-      <option value="[% r FILTER html %]">[% resolution_descs.${r} FILTER html %]</option>
+      <option value="[% r FILTER html %]">[% get_resolution(r) FILTER html %]</option>
     [% END %]
   </select>
   <br>
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 023cb9573..22bc3db69 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -117,7 +117,7 @@
       <th>[% field_descs.bug_status  FILTER html %]:</th>
       <td>
         [% status_descs.${bug.bug_status} FILTER html %]
-        [%+ resolution_descs.${bug.resolution} FILTER html %]
+        [%+ get_resolution(bug.resolution) FILTER html %]
       </td>
 
       [% PROCESS rightcell %]
-- 
cgit v1.2.3-24-g4f1b