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, 64 insertions, 50 deletions

diff --git a/template/en/default/bug/process/bugmail.html.tmpl b/template/en/default/bug/process/bugmail.html.tmpl
index 5445ef9cd..631842a40 100644
--- a/template/en/default/bug/process/bugmail.html.tmpl
+++ b/template/en/default/bug/process/bugmail.html.tmpl
@@ -22,20 +22,22 @@
 
 [%# INTERFACE:
   # mailing_bugid: string. ID of the bug this mail is concerning.
-  # mailrecipients: hash. People involved in this change. Hash has up to five 
+  # mailrecipients: hash. People involved in this change. Hash has up to five
   #                elements:
-  #                changer: string. The login name of the user who made the 
+  #                changer: string. The login name of the user who made the
   #                change.
   #
   #                For bug changes where people need to be notified:
   #                 owner: string. The login name of the bug assignee.
   #                 reporter: string. The login name of the bug reporter.
-  #                 qacontact: string. The login name of the bug's QA contact. 
+  #                 qacontact: string. The login name of the bug's QA contact.
   #                  Optional.
-  #                 cc: list of strings. The login names of those on the CC 
+  #                 cc: list of strings. The login names of those on the CC
   #                  list.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% mail = SendBugMail(mailing_bugid, mailrecipients) %]
 
 [% PROCESS emails
@@ -49,7 +51,7 @@
 %]
 <br>
 <center>
-  If you wish to tweak the kinds of mail Bugzilla sends you, you can
+  If you wish to tweak the kinds of mail [% terms.Bugzilla %] sends you, you can
   <a href="userprefs.cgi?tab=email">change your preferences</a>.
 </center>
 
@@ -62,7 +64,7 @@
   <b>[% description %]:</b>
   [% IF names.size > 0 %]
     [%+ FOREACH name = names %]
-      [% name %][% ", " UNLESS loop.last() %] 
+      [% name %][% ", " UNLESS loop.last() %]
     [% END %]
   [% ELSE %]
     no one
diff --git a/template/en/default/bug/process/confirm-duplicate.html.tmpl b/template/en/default/bug/process/confirm-duplicate.html.tmpl
index 72472a83b..e7c030309 100644
--- a/template/en/default/bug/process/confirm-duplicate.html.tmpl
+++ b/template/en/default/bug/process/confirm-duplicate.html.tmpl
@@ -26,45 +26,47 @@
   #   against which a bug is being duped
   # duplicate_bug_id: number; the bug number for the bug
   #   being duped
-  # cclist_accessible: boolean; whether or not users on the cc: list 
+  # cclist_accessible: boolean; whether or not users on the cc: list
   #   of the original bug can access that bug.
   #%]
- 
+
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS global/header.html.tmpl title="Duplicate Warning" %]
-    
+
 <p>
-  When marking a bug as a duplicate, the reporter of the duplicate 
-  is normally added to the CC list of the original. The permissions 
-  on bug [% original_bug_id %] (the original) are currently set 
+  When marking [% terms.abug %] as a duplicate, the reporter of the duplicate
+  is normally added to the CC list of the original. The permissions
+  on [% terms.bug %]&nbsp;[% original_bug_id %] (the original) are currently set
   such that the reporter would not normally be able to see it.
 </p>
 
 <p>
-  <b>Adding the reporter to the CC list of bug [% original_bug_id %] 
+  <b>Adding the reporter to the CC list of [% terms.bug %]&nbsp;[% original_bug_id %]
   [% IF cclist_accessible %]
     will immediately
   [% ELSE %]
     might, in the future,
   [% END %]
-  allow him/her access to view this bug.</b>
+  allow him/her access to view this [% terms.bug %].</b>
   Do you wish to do this?
 </p>
-    
+
 <form method="post" action="process_bug.cgi">
 
 [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
 
 <p>
-  <input type="radio" name="confirm_add_duplicate" value="1"> 
-    Yes, add the reporter to CC list on bug [% original_bug_id %]
+  <input type="radio" name="confirm_add_duplicate" value="1">
+    Yes, add the reporter to CC list on [% terms.bug %]&nbsp;[% original_bug_id %]
 </p>
 <p>
-  <input type="radio" name="confirm_add_duplicate" value="0" checked="checked"> 
-    No, do not add the reporter to CC list on bug [% original_bug_id %]
+  <input type="radio" name="confirm_add_duplicate" value="0" checked="checked">
+    No, do not add the reporter to CC list on [% terms.bug %]&nbsp;[% original_bug_id %]
 </p>
 <p>
-  <a href="show_bug.cgi?id=[% duplicate_bug_id %]">Throw away my changes, 
-    and revisit bug [% duplicate_bug_id %]</a>
+  <a href="show_bug.cgi?id=[% duplicate_bug_id %]">Throw away my changes,
+    and revisit [% terms.bug %]&nbsp;[% duplicate_bug_id %]</a>
 <p>
   <input type="submit" value="Submit">
 </p>
diff --git a/template/en/default/bug/process/header.html.tmpl b/template/en/default/bug/process/header.html.tmpl
index 08e27ec56..9c2f1fad7 100644
--- a/template/en/default/bug/process/header.html.tmpl
+++ b/template/en/default/bug/process/header.html.tmpl
@@ -22,11 +22,13 @@
 [%# INTERFACE:
   # As global/header.html.tmpl.
   #%]
- 
+
+[% PROCESS global/variables.none.tmpl %]
+
 [% IF    title_tag == "bug_processed" %]
-  [% title = "Bug processed" %]
+  [% title = "$terms.Bug processed" %]
 [% ELSIF title_tag == "mid_air" %]
   [% title = "Mid-air collision!" %]
 [% END %]
- 
+
 [% PROCESS global/header.html.tmpl %]
diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl
index e3698a640..f8b198689 100644
--- a/template/en/default/bug/process/midair.html.tmpl
+++ b/template/en/default/bug/process/midair.html.tmpl
@@ -33,7 +33,9 @@
   # comments: array; all the comments on the bug.
   # bug_id: number; the ID of the bug being changed.
   #%]
- 
+
+[% PROCESS global/variables.none.tmpl %]
+
 [% UNLESS header_done %]
   [% PROCESS bug/process/header.html.tmpl %]
 [% END %]
@@ -41,14 +43,14 @@
 <h1>Mid-air collision detected!</h1>
 
 <p>
-  Someone else has made changes to this bug at the same time you were trying to.
+  Someone else has made changes to this [% terms.bug %] at the same time you were trying to.
   The changes made were:
 </p>
 
 <p>
   [% PROCESS "bug/activity/table.html.tmpl" incomplete_data=0 %]
 </p>
-          
+
 [% IF comments.size > start_at %]
 <p>
   Added comments:
@@ -72,8 +74,8 @@ You have the following choices:
     </form>
   </li>
   <li>
-    <a href="show_bug.cgi?id=[% bug_id %]">Throw away my changes, 
-      and revisit bug [% bug_id %]</a>
+    <a href="show_bug.cgi?id=[% bug_id %]">Throw away my changes,
+      and revisit [% terms.bug %]&nbsp;[% bug_id %]</a>
   </li>
 </ul>
 
diff --git a/template/en/default/bug/process/next.html.tmpl b/template/en/default/bug/process/next.html.tmpl
index 1eeb9f367..73c8b5289 100644
--- a/template/en/default/bug/process/next.html.tmpl
+++ b/template/en/default/bug/process/next.html.tmpl
@@ -23,10 +23,12 @@
   # bug : Bug object; the next bug to show
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 <hr>
 
 <p>
-  The next bug in your list is bug
+  The next [% terms.bug %] in your list is [% terms.bug %]
   <a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a>:
 </p>
 
diff --git a/template/en/default/bug/process/results.html.tmpl b/template/en/default/bug/process/results.html.tmpl
index 5c3592954..2097e047b 100644
--- a/template/en/default/bug/process/results.html.tmpl
+++ b/template/en/default/bug/process/results.html.tmpl
@@ -25,24 +25,26 @@
   # type: string; the type of change/check that was made: "bug" when a bug
   #   is changed, "dupe" when a duplication notation is added to a bug,
   #   and "dep" when a bug is checked for changes to its dependencies.
-  # 
+  #
   # mailrecipients: hash; BugMail recipient params. Optional.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% UNLESS header_done %]
   [% PROCESS bug/process/header.html.tmpl %]
 [% END %]
 
 [% DEFAULT type="bug" %]
 
-[% 
+[%
   title = {
-    'bug' => "Changes submitted for bug $id" , 
-    'dupe' => "Duplicate notation added to bug $id" , 
-    'dep' => "Checking for dependency changes on bug $id" , 
-    'votes' => "Bug $id confirmed by number of votes" , 
-    'created' => "Bug $id has been added to the database" , 
-  } 
+    'bug' => "Changes submitted for $terms.bug $id" ,
+    'dupe' => "Duplicate notation added to $terms.bug $id" ,
+    'dep' => "Checking for dependency changes on $terms.bug $id" ,
+    'votes' => "$terms.Bug $id confirmed by number of votes" ,
+    'created' => "$terms.Bug $id has been added to the database" ,
+  }
 %]
 
 <table border="1">
@@ -52,7 +54,7 @@
       [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = id %]
     </td>
     <td>
-      <a href="show_bug.cgi?id=[% id %]">Back To BUG# [% id %]</a>
+      <a href="show_bug.cgi?id=[% id %]">Back To [% terms.Bug %]# [% id %]</a>
     </td>
   </tr>
 </table>
diff --git a/template/en/default/bug/process/verify-new-product.html.tmpl b/template/en/default/bug/process/verify-new-product.html.tmpl
index bba85d637..fd37707dc 100644
--- a/template/en/default/bug/process/verify-new-product.html.tmpl
+++ b/template/en/default/bug/process/verify-new-product.html.tmpl
@@ -22,7 +22,7 @@
 [%# INTERFACE:
   # form: hash; the form values submitted to the script
   # mform: hash; the form multi-values submitted to the script
-  # verify_fields: boolean; whether or not to verify 
+  # verify_fields: boolean; whether or not to verify
   #   the version, component, and target milestone fields
   # versions: array; versions for the new product.
   # components: array; components for the new product.
@@ -31,13 +31,15 @@
   #   those fields
   # verify_bug_group: boolean; whether or not to ask the user
   #   if they want to add the bug to its new product's group
-  # use_target_milestone: boolean; whether or not to use 
+  # use_target_milestone: boolean; whether or not to use
   #   the target milestone field
   #%]
- 
+
+[% PROCESS global/variables.none.tmpl %]
+
 <form action="process_bug.cgi" method="post">
 
-[% PROCESS "global/hidden-fields.html.tmpl" 
+[% PROCESS "global/hidden-fields.html.tmpl"
      exclude=(verify_fields ? "^version|component|target_milestone$" : "") %]
 
 [%# Verify the version, component, and target milestone fields. %]
@@ -46,12 +48,12 @@
 
   <p>
   [% IF use_target_milestone %]
-    You are moving the bug(s) to the product <b>[% form.product %]</b>, 
+    You are moving the [% terms.bug %](s) to the product <b>[% form.product %]</b>,
     and the version, component, and/or target milestone fields are no longer
     correct.  Please set the correct version, component, and target milestone now:
   [% ELSE %]
-    You are moving the bug(s) to the product <b>[% form.product %]</b>, 
-    and the version and component fields are no longer correct.  
+    You are moving the [% terms.bug %](s) to the product <b>[% form.product %]</b>,
+    and the version and component fields are no longer correct.
     Please set the correct version and component now:
   [% END %]
   <p>
@@ -76,19 +78,19 @@
   </table>
 
 [% END %]
-       
+
 [% IF verify_bug_group %]
-  <h3>Verify Bug Group</h3>
+  <h3>Verify [% terms.Bug %] Group</h3>
 
   <p>
-    Do you want to add the bug to its new product's default groups (if any)?
+    Do you want to add the [% terms.bug %] to its new product's default groups (if any)?
   </p>
 
   <p>
     <input type="radio" name="addtonewgroup" value="no"><b>no</b><br>
     <input type="radio" name="addtonewgroup" value="yes"><b>yes</b><br>
     <input type="radio" name="addtonewgroup" value="yesifinold" checked="checked">
-      <b>yes, but only if the bug was in any of its old product's default groups</b><br>
+      <b>yes, but only if the [% terms.bug %] was in any of its old product's default groups</b><br>
   </p>
 [% END %]