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.

5 files changed, 49 insertions, 39 deletions

diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 56bad7fae..c2e5378e1 100644
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -19,13 +19,15 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [%# Define strings that will serve as the title and header of this page %]
-[% title = BLOCK %]Create New Attachment for Bug #[% bugid %][% END %]
+[% title = BLOCK %]Create New Attachment for [% terms.Bug %] #[% bugid %][% END %]
 [% h1 = BLOCK %]Create New Attachment for
-  [%+ GetBugLink(bugid, "Bug $bugid") %][% END %]
+  [%+ GetBugLink(bugid, "$terms.Bug $bugid") %][% END %]
 [% h2 = BLOCK %][% bugsummary FILTER html %][% END %]
 
-[% PROCESS global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl
   title = title
   h1 = h1
   h2 = h2
@@ -48,7 +50,7 @@
 <form name="entryform" method="post" action="attachment.cgi" enctype="multipart/form-data">
   <input type="hidden" name="bugid" value="[% bugid %]">
   <input type="hidden" name="action" value="insert">
-   
+
   <table class="attachment_entry">
     <tr>
       <th>File:</th>
@@ -74,15 +76,15 @@
       <td>
         <em>If the attachment is a patch, check the box below.</em><br>
         <input type="checkbox" id="ispatch" name="ispatch" value="1"
-               onchange="setContentTypeDisabledState();"> 
+               onchange="setContentTypeDisabledState();">
         <label for="ispatch">patch</label><br><br>
 
         <em>Otherwise, choose a method for determining the content type.</em><br>
         <input type="radio" id="autodetect"
-               name="contenttypemethod" value="autodetect"> 
+               name="contenttypemethod" value="autodetect">
           <label for="autodetect">auto-detect</label><br>
         <input type="radio" id="list"
-               name="contenttypemethod" value="list"> 
+               name="contenttypemethod" value="list">
           <label for="list">select from list:</label>
           <select name="contenttypeselection"
                   onchange="this.form.contenttypemethod[1].checked = true;">
@@ -128,17 +130,17 @@
       <tr>
         <th>Reassignment:</th>
         <td>
-          <em>If you want to assign this bug to yourself, 
+          <em>If you want to assign this [% terms.bug %] to yourself,
               check the box below.</em><br>
-          <input type="checkbox" id="takebug" name="takebug" value="1"> 
-          <label for="takebug">take bug</label>
+          <input type="checkbox" id="takebug" name="takebug" value="1">
+          <label for="takebug">take [% terms.bug %]</label>
         </td>
       </tr>
     [% END %]
     <tr>
       <th>Comment:</th>
       <td>
-        <em>(optional) Add a comment about this attachment to the bug.</em><br>
+        <em>(optional) Add a comment about this attachment to the [% terms.bug %].</em><br>
         <textarea wrap="soft" name="comment" rows="6" cols="80"></textarea>
       </td>
     </tr>
@@ -152,12 +154,12 @@
 
 <script language="JavaScript" type="text/javascript">
   <!--
-  function setContentTypeDisabledState() 
+  function setContentTypeDisabledState()
   {
     var entryform = document.entryform;
 
     var isdisabled = false;
-    if (entryform.ispatch.checked) 
+    if (entryform.ispatch.checked)
       isdisabled = true;
 
     for (var i=0 ; i<entryform.contenttypemethod.length ; i++)
diff --git a/template/en/default/attachment/created.html.tmpl b/template/en/default/attachment/created.html.tmpl
index 2b985bd0c..9fa7011fd 100644
--- a/template/en/default/attachment/created.html.tmpl
+++ b/template/en/default/attachment/created.html.tmpl
@@ -27,8 +27,10 @@
   # contenttypemethod: string. How we got the content type of the attachment.
   #  Possible values: autodetect, list, manual.
   #%]
-  
-[% PROCESS global/header.html.tmpl 
+
+[% PROCESS global/variables.none.tmpl %]
+
+[% PROCESS global/header.html.tmpl
   title = "Changes Submitted"
   style = "th { text-align: left; }"
 %]
@@ -37,29 +39,30 @@
   <tr>
     <td>
       <h2>
-        <a title="[% description FILTER html %]" href="attachment.cgi?id=[% attachid %]&amp;action=edit">Attachment #[% attachid %]</a> 
-        to <a href="show_bug.cgi?id=[% bugid %]">Bug #[% bugid %]</a> Created
+        <a title="[% description FILTER html %]" href="attachment.cgi?id=[% attachid %]&amp;action=edit">Attachment #[% attachid %]</a>
+        to <a href="show_bug.cgi?id=[% bugid %]">[% terms.Bug %] #[% bugid %]</a> Created
       </h2>
 
       [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
 
       [% IF contenttypemethod == 'autodetect' %]
         <p>
-          <b>Note:</b> Bugzilla automatically detected the content type
-          <em>[% contenttype %]</em> for this attachment.  If this is 
-          incorrect, correct the value by 
+          <b>Note:</b> [% terms.Bugzilla %] automatically detected the content type
+          <em>[% contenttype %]</em> for this attachment.  If this is
+          incorrect, correct the value by
           <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">editing the attachment</a>.
         </p>
       [% END %]
     </td>
     <td>
-      <a href="show_bug.cgi?id=[% bugid %]">Go back to bug #[% bugid %]</a>
+      <a href="show_bug.cgi?id=[% bugid %]">Go back to [% terms.bug %] #[% bugid %]</a>
     </td>
   </tr>
 </table>
 
 <p>
-<a href="attachment.cgi?bugid=[% bugid %]&amp;action=enter">Create Another Attachment to Bug #[% bugid %]</a>
+<a href="attachment.cgi?bugid=[% bugid %]&amp;action=enter">Create
+ Another Attachment to [% terms.Bug %] #[% bugid %]</a>
 </p>
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 7cd682cd5..14c2dc1fe 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -19,13 +19,15 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [%# Define strings that will serve as the title and header of this page %]
-[% title = BLOCK %]Edit Attachment #[% attachid %] for Bug #[% bugid %][% END %]
+[% title = BLOCK %]Edit Attachment #[% attachid %] for [% terms.Bug %] #[% bugid %][% END %]
 [% h1 = BLOCK %]Edit Attachment #[% attachid %] for
-  [%+ GetBugLink(bugid, "Bug $bugid") %][% END %]
+  [%+ GetBugLink(bugid, "$terms.Bugs $bugid") %][% END %]
 [% h2 = BLOCK %][% bugsummary FILTER html %][% END %]
 
-[% PROCESS global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl
   title = title
   h1 = h1
   h2 = h2
@@ -33,7 +35,7 @@
     table.attachment_info th { text-align: right; vertical-align: top; }
     table.attachment_info td { text-align: left; vertical-align: top; }
     #noview { text-align: left; vertical-align: center; }
-    
+
     table#flags th, table#flags td { font-size: small; vertical-align: baseline; text-align: left; }
   "
 %]
@@ -161,7 +163,7 @@
 
         <b>MIME Type:</b><br>
           <input type="text" size="20" name="contenttypeentry" value="[% contenttype FILTER html %]"><br>
-          
+
           <input type="checkbox" id="ispatch" name="ispatch" value="1"
                  [% 'checked="checked"' IF ispatch %]>
           <label for="ispatch">patch</label>
@@ -176,9 +178,9 @@
         [% IF flag_types.size > 0 %]
           [% PROCESS "flag/list.html.tmpl" bug_id=bugid attach_id=attachid %]<br>
         [% END %]
-        
+
         <div id="smallCommentFrame">
-          <b>Comment (on the bug):</b><br>
+          <b>Comment (on the [% terms.bug %]):</b><br>
             <textarea name="comment" rows="5" cols="25" wrap="soft"></textarea><br>
         </div>
 
@@ -217,7 +219,7 @@
 
   </table>
 
-  Attachments on this Bug:
+  Attachments on this [% terms.Bug %]:
   [% FOREACH a = attachments %]
     [% IF a == attachid %]
       #[% a %]
diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl
index b137504e5..28de78430 100644
--- a/template/en/default/attachment/show-multiple.html.tmpl
+++ b/template/en/default/attachment/show-multiple.html.tmpl
@@ -19,11 +19,12 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
 [% filtered_summary = bugsummary FILTER html %]
 [% h1 = BLOCK %]View All Attachments for
-  [%+ GetBugLink(bugid, "Bug $bugid") %][% END %]
-[% PROCESS global/header.html.tmpl 
-  title = "View All Attachments for Bug #$bugid"
+  [%+ GetBugLink(bugid, "$terms.Bug $bugid") %][% END %]
+[% PROCESS global/header.html.tmpl
+  title = "View All Attachments for $terms.Bug #$bugid"
   h1 = h1
   h2 = filtered_summary
   style = "
@@ -73,7 +74,7 @@
       </td>
 
       <td valign="top">
-        <a href="attachment.cgi?id=[% a.attachid %]&amp;action=edit">Edit</a> 
+        <a href="attachment.cgi?id=[% a.attachid %]&amp;action=edit">Edit</a>
       </td>
     </tr>
   </table>
diff --git a/template/en/default/attachment/updated.html.tmpl b/template/en/default/attachment/updated.html.tmpl
index df5f4665a..00b5a66f8 100644
--- a/template/en/default/attachment/updated.html.tmpl
+++ b/template/en/default/attachment/updated.html.tmpl
@@ -24,8 +24,10 @@
   # bugid: integer. ID of the bug we are updating.
   # attachid: integer. ID of the attachment we just attached.
   #%]
-  
-[% PROCESS global/header.html.tmpl 
+
+[% PROCESS global/variables.none.tmpl %]
+
+[% PROCESS global/header.html.tmpl
   title = "Changes Submitted"
   style = "th { text-align: left; }"
 %]
@@ -35,15 +37,15 @@
 <table border="1">
   <tr>
     <td>
-      <h2>Changes to 
+      <h2>Changes to
         <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">attachment [% attachid %]</a>
-        of bug [% bugid %] submitted
+        of [% terms.bug %]&nbsp;[% bugid %] submitted
       </h2>
       [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
     </td>
 
     <td>
-      <a href="show_bug.cgi?id=[% bugid %]">Back to Bug #[% bugid %]</a>
+      <a href="show_bug.cgi?id=[% bugid %]">Back to [% terms.Bug %] #[% bugid %]</a>
     </td>
   </tr>
 </table>