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.

---
 .../bug/process/confirm-duplicate.html.tmpl        | 32 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'template/en/default/bug/process/confirm-duplicate.html.tmpl')

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>
-- 
cgit v1.2.3-24-g4f1b