From 44b48df3901d829e1423749136d142964ccb4a3e Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <>
Date: Fri, 4 Jul 2003 04:31:13 +0000
Subject: 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.

---
 template/en/default/bug/activity/show.html.tmpl  | 12 +++++++-----
 template/en/default/bug/activity/table.html.tmpl | 16 +++++++++-------
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'template/en/default/bug/activity')

diff --git a/template/en/default/bug/activity/show.html.tmpl b/template/en/default/bug/activity/show.html.tmpl
index 2e44f89fd..4a7461b60 100644
--- a/template/en/default/bug/activity/show.html.tmpl
+++ b/template/en/default/bug/activity/show.html.tmpl
@@ -25,11 +25,13 @@
   # This template also needs to be called with the interface to the
   # activity.html.tmpl template fulfilled.
   #%]
- 
-[% PROCESS global/header.html.tmpl 
-  title = "Changes made to bug $bug_id"
+
+[% PROCESS global/variables.none.tmpl %]
+
+[% PROCESS global/header.html.tmpl
+  title = "Changes made to $terms.bug $bug_id"
   h1 = "Activity log"
-  h2 = "Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>"
+  h2 = "$terms.Bug <a href=\"show_bug.cgi?id=$bug_id\">$bug_id</a>"
  %]
 
 <br>
@@ -37,7 +39,7 @@
 [% PROCESS bug/activity/table.html.tmpl %]
 
 <p>
-  <a href="show_bug.cgi?id=[% bug_id %]">Back to bug [% bug_id %]</a>
+  <a href="show_bug.cgi?id=[% bug_id %]">Back to [% terms.bug %]&nbsp;[% bug_id %]</a>
 </p>
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl
index 95beaef14..ec005cc38 100644
--- a/template/en/default/bug/activity/table.html.tmpl
+++ b/template/en/default/bug/activity/table.html.tmpl
@@ -23,7 +23,7 @@
   # operations: array of hashes. May be empty. Each has has three members:
   #   who: string. who performed the operation
   #   when: string. when they performed it
-  #   changes: hash. Details of what they changed. This hash has three 
+  #   changes: hash. Details of what they changed. This hash has three
   #            compulsory and one optional member:
   #     field: string. The name of the field
   #     removed: string. What was removed from the field
@@ -33,14 +33,16 @@
   #                  it was affected by an old Bugzilla bug.)
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% PROCESS bug/time.html.tmpl %]
- 
+
 [% IF incomplete_data %]
   <p>
-    There used to be a bug Bugzilla which caused activity data
+    There used to be a [% terms.bug %] in [% terms.Bugzilla %] which caused activity data
     to be lost if there was a large number of cc's or dependencies.  That
-    has been fixed, however, there was some data already lost on this bug
-    that could not be regenerated.  The changes that the script could not
+    has been fixed, however, there was some data already lost on this [% terms.bug %] that
+    could not be regenerated.  The changes that the script could not
     reliably determine are prefixed by '?'.
   </p>
 [% END %]
@@ -55,7 +57,7 @@
       <th>Added</th>
     </tr>
 
-    [% FOREACH operation = operations %]     
+    [% FOREACH operation = operations %]
       <tr>
         <td rowspan="[% operation.changes.size %]" valign="top">
           [% operation.who %]
@@ -68,7 +70,7 @@
             <td>
               [% IF change.attachid %]
                 <a href="attachment.cgi?id=[% change.attachid %]&amp;action=view">
-                Attachment #[% change.attachid %]</a>         
+                Attachment #[% change.attachid %]</a>
               [% END %]
               [% change.field %]
             </td>
-- 
cgit v1.2.3-24-g4f1b