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/request/email.txt.tmpl  |  9 ++++--
 template/en/default/request/queue.html.tmpl | 46 +++++++++++++++--------------
 2 files changed, 30 insertions(+), 25 deletions(-)

(limited to 'template/en/default/request')

diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl
index cd7e43358..9024a6fe0 100644
--- a/template/en/default/request/email.txt.tmpl
+++ b/template/en/default/request/email.txt.tmpl
@@ -19,6 +19,9 @@
   # Contributor(s):     Myk Melez <myk@mozilla.org>
   #                     Jeff Hedlund <jeff.hedlund@matrixsi.com>
   #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
 [% bugidsummary = flag.target.bug.id _ ': ' _ flag.target.bug.summary %]
 [% attidsummary = flag.target.attachment.id _ ': ' _
                   flag.target.attachment.summary %]
@@ -36,8 +39,8 @@
 From: bugzilla-request-daemon
 To: [% to_email %]
 CC: [% flag.type.cc_list %]
-Subject: [% flag.type.name %] [%+ subject_status %]: [Bug [% flag.target.bug.id %]] [% flag.target.bug.summary %]
-[%- IF flag.target.attachment.exists %] : 
+Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %]&nbsp;[% flag.target.bug.id %]] [% flag.target.bug.summary %]
+[%- IF flag.target.attachment.exists %] :
   [Attachment [% flag.target.attachment.id %]] [% flag.target.attachment.summary %][% END %]
 
 [%+ USE wrap -%]
@@ -45,7 +48,7 @@ Subject: [% flag.type.name %] [%+ subject_status %]: [Bug [% flag.target.bug.id
 
 [% user.identity %] has [% statuses.${flag.status} %] [%+ to_identity %] for [% flag.type.name %]:
 
-Bug [% bugidsummary %]
+[% terms.Bug %]&nbsp;[% bugidsummary %]
 [% END %]
 [%+ Param('urlbase') %]show_bug.cgi?id=[% flag.target.bug.id %]
 [% IF flag.target.attachment.exists %]
diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index 19e2cbe54..ed900d263 100644
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -19,6 +19,8 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [%# The javascript and header_html blocks get used in header.html.tmpl. %]
 [% javascript = BLOCK %]
   var usetms = 0; // do we have target milestone?
@@ -26,7 +28,7 @@
   var last_sel = []; // caches last selection
   var cpts = new Array();
   [% FOREACH p = products %]
-    cpts['[% p FILTER js %]'] = [ 
+    cpts['[% p FILTER js %]'] = [
       [%- FOREACH item = components_by_product.$p %]'[% item FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%] ];
   [% END %]
 [% END %]
@@ -48,30 +50,30 @@
         <select name="product" onchange="selectProduct(this.form, 'product', 'component', 'Any');">
           <option value="">Any</option>
           [% FOREACH item = products %]
-            <option value="[% item FILTER html %]" 
+            <option value="[% item FILTER html %]"
                     [% "selected" IF form.product == item %]>[% item FILTER html %]</option>
           [% END %]
         </select>
       </td>
       <th>Flag:</th>
       <td>
-        [% PROCESS "global/select-menu.html.tmpl" 
-                    name="type" 
+        [% PROCESS "global/select-menu.html.tmpl"
+                    name="type"
                     options=types
                     default=form.type %]
       </td>
-      
+
       [%# We could let people see a "queue" of non-pending requests. %]
       <!--
       <th>Status:</th>
       <td>
-        [%# PROCESS "global/select-menu.html.tmpl" 
-                    name="status" 
+        [%# PROCESS "global/select-menu.html.tmpl"
+                    name="status"
                     options=["all", "?", "+-", "+", "-"]
                     default=form.status %]
       </td>
       -->
-    
+
     </tr>
     <tr>
       <th>Requestee:</th>
@@ -81,18 +83,18 @@
         <select name="component">
           <option value="">Any</option>
           [% FOREACH item = components %]
-            <option value="[% item FILTER html %]" [% "selected" IF form.component == item %]> 
+            <option value="[% item FILTER html %]" [% "selected" IF form.component == item %]>
               [% item FILTER html %]</option>
           [% END %]
         </select>
       </td>
       <th>Group By:</th>
       <td>
-        [% groups = { 
-            "Requester" => 'requester' , 
-            "Requestee" => 'requestee', 
-            "Flag" => 'type' , 
-            "Product/Component" => 'category' 
+        [% groups = {
+            "Requester" => 'requester' ,
+            "Requestee" => 'requestee',
+            "Flag" => 'type' ,
+            "Product/Component" => 'category'
           } %]
         [% PROCESS "global/select-menu.html.tmpl" name="group" options=groups default=form.group %]
       </td>
@@ -103,14 +105,14 @@
 </form>
 [% END %]
 
-[% column_headers = { 
-      "type"       => "Flag" , 
-      "status"     => "Status" , 
-      "bug"        => "Bug" , 
-      "attachment" => "Attachment" , 
+[% column_headers = {
+      "type"       => "Flag" ,
+      "status"     => "Status" ,
+      "bug"        => "$terms.Bug" ,
+      "attachment" => "Attachment" ,
       "requester"  => "Requester" ,
-      "requestee"  => "Requestee" , 
-      "created"    => "Created" , 
+      "requestee"  => "Requestee" ,
+      "created"    => "Created" ,
       "category"   => "Product/Component"    } %]
 
 [% DEFAULT display_columns = ["requester", "requestee", "type", "bug", "attachment", "created"]
@@ -119,7 +121,7 @@
 %]
 
 
-[% PROCESS global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl
   title="Request Queue"
   h2=filter_form
   style = "
-- 
cgit v1.2.3-24-g4f1b