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

3 files changed, 24 insertions, 21 deletions

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index b4353a387..cf354ad05 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -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 %]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index d15cf9102..84b7774c1 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -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>
diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index f73821675..15bbcbacd 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -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 %]