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.

1 files changed, 13 insertions, 11 deletions

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 %]