Bug 13540 - allow key terms, like "Bugzilla" and "bug", to be altered without changing all the templates. Patch by jwilmoth@starbucks.com; r=gerv, a=justdave.

7 files changed, 75 insertions, 61 deletions

diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl
index 7730bf78c..61ff34dd7 100644
--- a/template/en/default/list/change-columns.html.tmpl
+++ b/template/en/default/list/change-columns.html.tmpl
@@ -3,7 +3,7 @@
   # License Version 1.1 (the "License"); you may not use this file
   # except in compliance with the License. You may obtain a copy of
   # the License at http://www.mozilla.org/MPL/
-  # 
+  #
   # Software distributed under the License is distributed on an "AS
   # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
   # implied. See the License for the specific language governing
@@ -19,12 +19,14 @@
   # Contributor(s): Dave Lawrence <dkl@redhat.com>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
   title = "Change Columns"
 %]
 
 <p>
-  Select the columns you wish to appear in your buglists. Note that
+  Select the columns you wish to appear in your [% terms.bug %] lists. Note that
   this feature requires cookies to work.
 </p>
 
@@ -38,27 +40,27 @@
 <form action="colchange.cgi">
   <input type="hidden" name="rememberedquery" value="[% buffer FILTER html %]">
   [% FOREACH column = masterlist %]
-    <input type="checkbox" id="[% column %]" name="column_[% column %]" 
+    <input type="checkbox" id="[% column %]" name="column_[% column %]"
       [% "checked='checked'" IF lsearch(collist, column) != -1 %]>
     <label for="[% column %]">[% field_descs.${column} || column %]</label>
     <br>
   [% END %]
-  
+
   <p>
-    <input id="nosplitheader" type="radio" name="splitheader" value="0" 
+    <input id="nosplitheader" type="radio" name="splitheader" value="0"
       [% "checked='checked'" IF NOT splitheader %]>
     <label for="nosplitheader">
       Normal headers (prettier)
     </label>
     <br>
-    
-    <input id="splitheader" type="radio" name="splitheader" value="1" 
+
+    <input id="splitheader" type="radio" name="splitheader" value="1"
       [% "checked='checked'" IF splitheader %]>
     <label for="splitheader">
       Stagger headers (often makes list more compact)
     </label>
   </p>
-  
+
   <p>
     <input type="submit" value="Change Columns">
   </p>
@@ -67,7 +69,7 @@
 <form action="colchange.cgi">
   <input type="hidden" name="rememberedquery" value="[% buffer FILTER html %]">
   <input type="hidden" name="resetit" value="1">
-  <input type="submit" value="Reset to Bugzilla default">
+  <input type="submit" value="Reset to [% terms.Bugzilla %] default">
 </form>
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 4d769c5fa..f7b40a18f 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -19,6 +19,8 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% dontchange = "--do_not_change--" %]
 <input type="hidden" name="dontchange" value="[% dontchange FILTER html %]">
 
@@ -38,9 +40,9 @@
 <hr>
 
 <p><font size="-1">
-  To change multiple bugs:
+  To change multiple [% terms.bugs %]:
   <ol>
-    <li>Check the bugs you want to change above.</li>
+    <li>Check the [% terms.bugs %] you want to change above.</li>
     <li>Make your changes in the form fields below.  If the change
         you are making requires an explanation, include it in
         the comments box.</li>
@@ -53,13 +55,13 @@
 
     <th><label for="product">Product:</label></th>
     <td>
-      [% PROCESS selectmenu menuname = "product" 
+      [% PROCESS selectmenu menuname = "product"
                             menuitems = products %]
     </td>
 
     <th><label for="version">Version:</label></th>
     <td>
-      [% PROCESS selectmenu menuname = "version" 
+      [% PROCESS selectmenu menuname = "version"
                             menuitems = versions %]
     </td>
 
@@ -72,7 +74,7 @@
       </label>
     </th>
     <td>
-      [% PROCESS selectmenu menuname = "rep_platform" 
+      [% PROCESS selectmenu menuname = "rep_platform"
                             menuitems = platforms %]
     </td>
 
@@ -82,7 +84,7 @@
       </label>
     </th>
     <td>
-      [% PROCESS selectmenu menuname = "priority" 
+      [% PROCESS selectmenu menuname = "priority"
                             menuitems = priorities %]
     </td>
 
@@ -91,7 +93,7 @@
 
     <th><label for="component">Component:</label></th>
     <td>
-      [% PROCESS selectmenu menuname = "component" 
+      [% PROCESS selectmenu menuname = "component"
                             menuitems = components %]
     </td>
 
@@ -101,7 +103,7 @@
       </label>
     </th>
     <td>
-      [% PROCESS selectmenu menuname = "bug_severity" 
+      [% PROCESS selectmenu menuname = "bug_severity"
                             menuitems = severities %]
     </td>
 
@@ -110,7 +112,7 @@
 
     <th><label for="target_milestone">Target Milestone:</label></th>
     <td colspan="3">
-      [% PROCESS selectmenu menuname = "target_milestone" 
+      [% PROCESS selectmenu menuname = "target_milestone"
                             menuitems = targetmilestones %]
     </td>
 
@@ -139,9 +141,9 @@
     <tr>
       <th><label for="qa_contact">QA Contact:</label></th>
       <td colspan="3">
-        <input id="qa_contact" 
-               name="qa_contact" 
-               value="[% dontchange FILTER html %]" 
+        <input id="qa_contact"
+               name="qa_contact"
+               value="[% dontchange FILTER html %]"
                size="32">
       </td>
     </tr>
@@ -192,9 +194,9 @@
   <b>Groupset:</b><br>
   <table border="1">
     <tr>
-      <th>Don&apos;t<br>change<br>this group<br>restriction</td>
-      <th>Remove<br>bugs<br>from this<br>group</td>
-      <th>Add<br>bugs<br>to this<br>group</td>
+      <th>Don't<br>change<br>this group<br>restriction</td>
+      <th>Remove<br>[% terms.bugs %]<br>from this<br>group</td>
+      <th>Add<br>[% terms.bugs %]<br>to this<br>group</td>
       <th>Group Name:</td>
     </tr>
 
@@ -229,7 +231,7 @@
   </table>
 
   [% IF foundinactive %]
-    <font size="-1">(Note: Bugs may not be added to <strike>inactive 
+    <font size="-1">(Note: [% terms.Bugs %] may not be added to <strike>inactive
     groups</strike>, only removed.)</font><br>
   [% END %]
 
@@ -245,14 +247,14 @@
   [% knum = knum + 1 %]
   <input id="knob-confirm" type="radio" name="knob" value="confirm">
   <label for="knob-confirm">
-    Confirm bugs (change status to <b>NEW</b>)
+    Confirm [% terms.bugs %] (change status to <b>NEW</b>)
   </label><br>
 [% END %]
 
 [% knum = knum + 1 %]
 <input id="knob-accept" type="radio" name="knob" value="accept">
 <label for="knob-accept">
-  Accept bugs (change status to <b>ASSIGNED</b>)
+  Accept [% terms.bugs %] (change status to <b>ASSIGNED</b>)
 </label><br>
 
 [%# If all the bugs being changed are open, allow the user to close them. %]
@@ -264,7 +266,7 @@
   [% knum = knum + 1 %]
   <input id="knob-resolve" type="radio" name="knob" value="resolve">
   <label for="knob-resolve">
-    Resolve bugs, changing <a href="bug_status.html">resolution</a> to
+    Resolve [% terms.bugs %], changing <a href="bug_status.html">resolution</a> to
   </label>
   <select name="resolution" onchange="document.forms.changeform.knob[[% knum %]].checked=true">
     [% FOREACH resolution = resolutions %]
@@ -281,38 +283,38 @@
 [% IF !bugstatuses.containsany(openstates) %]
   [% knum = knum + 1 %]
   <input id="knob-reopen" type="radio" name="knob" value="reopen">
-  <label for="knob-reopen">Reopen bugs</label><br>
+  <label for="knob-reopen">Reopen [% terms.bugs %]</label><br>
 [% END %]
 
 [% IF bugstatuses.size == 1 %]
   [% IF bugstatuses.contains('RESOLVED') %]
     [% knum = knum + 1 %]
     <input id="knob-verify" type="radio" name="knob" value="verify">
-    <label for="knob-verify">Mark bugs as <b>VERIFIED</b></label><br>
+    <label for="knob-verify">Mark [% terms.bugs %] as <b>VERIFIED</b></label><br>
   [% ELSIF bugstatuses.contains('VERIFIED') %]
     [% knum = knum + 1 %]
     <input id="knob-close" type="radio" name="knob" value="close">
-    <label for="knob-close">Mark bugs as <b>CLOSED</b></label><br>
+    <label for="knob-close">Mark [% terms.bugs %] as <b>CLOSED</b></label><br>
   [% END %]
 [% END %]
 
 [% knum = knum + 1 %]
 <input id="knob-reassign" type="radio" name="knob" value="reassign">
 <label for="knob-reassign"><a href="bug_status.html#assigned_to">
-  Reassign</a> bugs to
+  Reassign</a> [% terms.bugs %] to
 </label>
-<input name="assigned_to" 
+<input name="assigned_to"
        value="[% user.login FILTER html %]"
        onchange="document.forms.changeform.knob[[% knum %]].checked = true;"
        size="32"><br>
 
 [% knum = knum + 1 %]
-<input id="knob-reassignbycomponent" 
-       type="radio" 
-       name="knob" 
+<input id="knob-reassignbycomponent"
+       type="radio"
+       name="knob"
        value="reassignbycomponent">
 <label for="knob-reassignbycomponent">
-  Reassign bugs to owner of selected component
+  Reassign [% terms.bugs %] to owner of selected component
 </label><br>
 
 <input type="submit" value="Commit">
diff --git a/template/en/default/list/list-simple.html.tmpl b/template/en/default/list/list-simple.html.tmpl
index 25c8c82ec..0ca3e976c 100644
--- a/template/en/default/list/list-simple.html.tmpl
+++ b/template/en/default/list/list-simple.html.tmpl
@@ -23,11 +23,13 @@
   # title: string. The title for this page. (optional)
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [%############################################################################%]
 [%# Initialization                                                           #%]
 [%############################################################################%]
 
-[% DEFAULT title = "Bug List" %]
+[% DEFAULT title = "$terms.Bug List" %]
 [% title = title FILTER html %]
 
 
@@ -44,7 +46,7 @@
 
   <body>
     [% IF bugs.size == 0 %]
-      <h3>Zarro Boogs found.</h3>
+      <h3>[% terms.zeroSearchResults %].</h3>
     [% ELSE %]
       [% PROCESS list/table.html.tmpl %]
     [% END %]
diff --git a/template/en/default/list/list.csv.tmpl b/template/en/default/list/list.csv.tmpl
index e2b3d1583..cb6bb6708 100644
--- a/template/en/default/list/list.csv.tmpl
+++ b/template/en/default/list/list.csv.tmpl
@@ -20,6 +20,8 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 bug_id,
 [% FOREACH column = displaycolumns %]
   [% column FILTER csv %],
@@ -30,5 +32,5 @@ bug_id,
     [% FOREACH column = displaycolumns %]
       [% bug.$column FILTER csv %],
     [% END %]
-    
+
 [% END %]
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 91a5584cf..35a80d08a 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -23,7 +23,9 @@
 [%# Template Initialization                                                  #%]
 [%############################################################################%]
 
-[% DEFAULT title = "Bug List" %]
+[% PROCESS global/variables.none.tmpl %]
+
+[% DEFAULT title = "$terms.Bug List" %]
 [% style_urls = [ "css/buglist.css" ] %]
 [% qorder = order FILTER url_quote IF order %]
 
@@ -45,7 +47,7 @@
   [% END %]
 
   [% IF Param('enablequips') != 'off' %]
-    [% DEFAULT quip = "Bugzilla would like to put a random quip here, but no one has entered any." %]
+    [% DEFAULT quip = "$terms.Bugzilla would like to put a random quip here, but no one has entered any." %]
     <a href="quips.cgi"><i>[% quip FILTER html %]</i></a>
   [% END %]
 
@@ -53,8 +55,8 @@
 
 [% IF toolong %]
   <h2>
-    This list is too long for Bugzilla's little mind; the 
-    Next/Prev/First/Last buttons won't appear on individual bugs.
+    This list is too long for [% terms.Bugzilla %]'s little mind; the
+    Next/Prev/First/Last buttons won't appear on individual [% terms.bugs %].
   </h2>
 [% END %]
 
@@ -66,7 +68,7 @@
 [%############################################################################%]
 
 [% IF bugs.size > 9 %]
-  [% bugs.size %] bugs found.
+  [% bugs.size %]&nbsp;[% terms.bugs %] found.
 [% END %]
 
 
@@ -91,18 +93,18 @@
 [%############################################################################%]
 
 [% IF bugs.size == 0 %]
-  Zarro Boogs found.
+  [% terms.zeroSearchResults %].
   <p>
     <a href="query.cgi">Query Page</a>
-    &nbsp;&nbsp;<a href="enter_bug.cgi">Enter New Bug</a>
+    &nbsp;&nbsp;<a href="enter_bug.cgi">Enter New [% terms.Bug %]</a>
     <a href="query.cgi?[% urlquerypart FILTER html %]">Edit this query</a>
   </p>
 
 [% ELSIF bugs.size == 1 %]
-  One bug found.
+  One [% terms.bug %] found.
 
 [% ELSE %]
-  [% bugs.size %] bugs found.
+  [% bugs.size %]&nbsp;[% terms.bugs %] found.
 
 [% END %]
 
@@ -116,7 +118,7 @@
 [% IF dotweak %]
 
   [% PROCESS "list/edit-multiple.html.tmpl" %]
-  
+
   </form>
 
   <hr>
@@ -140,13 +142,13 @@
 
     [% IF bugs.size > 1 && caneditbugs && !dotweak %]
       <a href="buglist.cgi?[% urlquerypart FILTER html %]
-        [%- "&order=$qorder" FILTER html IF order %]&amp;tweak=1">Change Several 
-        Bugs at Once</a>
+        [%- "&order=$qorder" FILTER html IF order %]&amp;tweak=1">Change Several&nbsp;
+        [% terms.Bugs %] at Once</a>
       &nbsp;&nbsp;
     [% END %]
 
     [% IF bugowners %]
-      <a href="mailto:[% bugowners %]">Send Mail to Bug Owners</a> &nbsp;&nbsp;
+      <a href="mailto:[% bugowners %]">Send Mail to [% terms.Bug %] Owners</a> &nbsp;&nbsp;
     [% END %]
 
     <a href="query.cgi?
diff --git a/template/en/default/list/quips.html.tmpl b/template/en/default/list/quips.html.tmpl
index d9f092db2..661f7595b 100644
--- a/template/en/default/list/quips.html.tmpl
+++ b/template/en/default/list/quips.html.tmpl
@@ -20,14 +20,16 @@
   #%]
 
 [%# INTERFACE:
-  # added_quip: string. Defined if the CGI added a quip data before 
+  # added_quip: string. Defined if the CGI added a quip data before
   #                displaying anything; if defined, its value is that quip.
   # show_quips: boolean. True if we are showing the entire quip list.
   # quips: list of strings. Defined iff show_quips is true. List of all quips.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl
-           title = "Bugzilla Quip System"
+           title = "$terms.Bugzilla Quip System"
            h1 = "Add your own clever headline"
  %]
 
@@ -55,8 +57,8 @@
 [% END %]
 
 <p>
-  Bugzilla will pick a random quip for the headline on each bug list, and 
-  you can extend the quip list. Type in something clever or funny or boring 
+  [% terms.Bugzilla %] will pick a random quip for the headline on each [% terms.bug %] list, and
+  you can extend the quip list. Type in something clever or funny or boring
   (but not obscene or offensive, please) and bonk on the button.
   [% IF Param("enablequips") == "approved" AND !user.groups.admin %]
     Note that your quip has to be approved before it is used.
@@ -141,8 +143,8 @@
   [% END %]
 [% ELSE %]
   <p>
-    Those who like their wisdom in large doses can 
-    <a href="quips.cgi?action=show">view 
+    Those who like their wisdom in large doses can
+    <a href="quips.cgi?action=show">view
     [% IF UserInGroup('admin') %]
       and edit
     [% END %]
diff --git a/template/en/default/list/server-push.html.tmpl b/template/en/default/list/server-push.html.tmpl
index 9b7131654..377a43786 100644
--- a/template/en/default/list/server-push.html.tmpl
+++ b/template/en/default/list/server-push.html.tmpl
@@ -23,10 +23,12 @@
   # debug: boolean. True if we want the query displayed while we wait.
   # query: string. The SQL query which makes the buglist.
   #%]
-  
+
+[% PROCESS global/variables.none.tmpl %]
+
 <html>
   <head>
-    <title>Bugzilla is pondering your query</title>
+    <title>[% terms.Bugzilla %] is pondering your query</title>
   </head>
   <body>
     <h1 style="margin-top: 20%; text-align: center;">Please stand by ...</h1>