From: Matt Selsky <selsky@columbia.edu>
Date: Tue, 9 Aug 2011 22:30:08 +0000 (-0700)
Subject: Bug 451801: Make all pages use field_descs.bug_severity instead of a hard-coded
X-Git-Tag: bugzilla-4.3.1~297
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72839930451ca44afd7431471654067fa8b19e42;p=thirdparty%2Fbugzilla.git

Bug 451801: Make all pages use field_descs.bug_severity instead of a hard-coded
"Severity"
r=mkanat, a=mkanat
---

diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index d10314628d..7c291d4ddd 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -23,7 +23,7 @@
   # This template has the same interface as create.html.tmpl
   #%]
 
-[% PROCESS global/variables.none.tmpl %]
+[% PROCESS global/field-descs.none.tmpl %]
 
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
@@ -440,7 +440,7 @@ function PutDescription() {
 
   <tr>
     <td valign="top" align="right">
-      <b>Severity</b>
+      <b>[% field_descs.bug_severity FILTER html %]</b>
     </td>
     <td valign="top">
       <select name="bug_severity">
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 92e578e8f7..fb37631b24 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -22,7 +22,7 @@
   #                 Reed Loden <reed@reedloden.com>
   #%]
 
-[% PROCESS global/variables.none.tmpl %]
+[% PROCESS global/field-descs.none.tmpl %]
 
 [% dontchange = "--do_not_change--" %]
 <input type="hidden" name="dontchange" value="[% dontchange FILTER html %]">
@@ -107,7 +107,8 @@
 
     <th>
       <label for="bug_severity">
-        <a href="page.cgi?id=fields.html#bug_severity">Severity</a>:
+        <a href="page.cgi?id=fields.html#bug_severity">[% field_descs.bug_severity
+          FILTER html %]</a>:
       </label>
     </th>
     <td>
diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index a094b5cc22..ee3fed0ade 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -1263,9 +1263,12 @@
   <li><b>+</b> as a prefix to mean "search additional resolutions", and
     <b>+</b> as a prefix to mean "search just the summary". You can
     instead use <kbd>summary:</kbd> to explicitly search summaries.</li>
-  <li>Searching the Severity field if you type something that matches
-    the first few characters of a severity. You can explicitly search
-    the Severity field if you want to find [% terms.bugs %] by severity.</li>
+  <li>Searching the [% field_descs.bug_severity FILTER html %] field if you
+    type something that matches the first few characters of a [% 
+    field_descs.bug_severity FILTER html %]. You can explicitly
+    search the [% field_descs.bug_severity FILTER html %] field if you want to
+    find [% terms.bugs %] by [% field_descs.bug_severity FILTER
+    html %].</li>
   <li>Searching the Priority field if you typed something that exactly
     matched the name of a priority. You can explicitly search the
     Priority field if you want to find [% terms.bugs %] by priority.</li>
diff --git a/template/en/default/whine/mail.txt.tmpl b/template/en/default/whine/mail.txt.tmpl
index 13216d895e..eb6631fa5c 100644
--- a/template/en/default/whine/mail.txt.tmpl
+++ b/template/en/default/whine/mail.txt.tmpl
@@ -28,8 +28,7 @@
   # recipient: user object for the intended recipient of the message
   #%]
 
-[% PROCESS global/variables.none.tmpl %]
-[% PROCESS 'global/field-descs.none.tmpl' %]
+[% PROCESS global/field-descs.none.tmpl %]
 
 [% body %]
 
@@ -50,7 +49,7 @@
   [% terms.Bug +%] [%+ bug.bug_id %]:
   [%+ urlbase %]show_bug.cgi?id=[% bug.bug_id +%]
   Priority: [%+ display_value("priority", bug.priority) -%]
-  Severity: [%+ display_value("bug_severity", bug.bug_severity) -%]
+  [% field_descs.bug_severity %]: [%+ display_value("bug_severity", bug.bug_severity) -%]
   Platform: [%+ display_value("rep_platform", bug.rep_platform) %]
   Assignee: [%+ bug.assigned_to %]
     Status: [%+ display_value("bug_status", bug.bug_status) %]