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.

author: gerv%gerv.net <> 2003-07-04 06:31:13 +0200
committer: gerv%gerv.net <> 2003-07-04 06:31:13 +0200
commit: 44b48df3901d829e1423749136d142964ccb4a3e (patch)
tree: f87659c97f6c97654cde63005c514a5504913631 /template/en/default/reports
parent: 7b35e1a271f27612cba91216d50e5f497dd0c69a (diff)
download: bugzilla-44b48df3901d829e1423749136d142964ccb4a3e.tar.gz
bugzilla-44b48df3901d829e1423749136d142964ccb4a3e.tar.xz
8 files changed, 93 insertions, 77 deletions
diff --git a/template/en/default/reports/duplicates-simple.html.tmpl b/template/en/default/reports/duplicates-simple.html.tmpl
index 481dd6eca..a74926f8e 100644
--- a/template/en/default/reports/duplicates-simple.html.tmpl
+++ b/template/en/default/reports/duplicates-simple.html.tmpl
@@ -22,13 +22,15 @@
 [%# INTERFACE:
   # You need to fulfill the interface to duplicates-table.html.tmpl.
   #%]
-  
+
+[% PROCESS global/variables.none.tmpl %]
+
 <html>
 
   [% IF product %]
-    [% title = "Most Frequently Reported Bugs for $product" %]
-  [% ELSE %]   
-    [% title = "Most Frequently Reported Bugs" %]
+    [% title = "Most Frequently Reported $terms.Bugs for $product" %]
+  [% ELSE %]
+    [% title = "Most Frequently Reported $terms.Bugs" %]
   [% END%]
 
   <head>
diff --git a/template/en/default/reports/duplicates-table.html.tmpl b/template/en/default/reports/duplicates-table.html.tmpl
index 073399ad6..0ebd2b4de 100644
--- a/template/en/default/reports/duplicates-table.html.tmpl
+++ b/template/en/default/reports/duplicates-table.html.tmpl
@@ -31,36 +31,38 @@
   #   short_desc: string. The bug's summary.
   #   bug_status: string. The bug's status.
   #   resolution: string. The bug's resolution, if any.
-  #   
+  #
   # bug_ids: list of integers. May be empty. The IDs of the bugs in $bugs.
-  #  
+  #
   # sortby: string. the column on which we are sorting the buglist.
   # reverse: boolean. True if we are reversing the current sort.
   # maxrows: integer. Max number of rows to display.
   # changedsince: integer. The number of days ago for the changedsince column.
-  # openonly: boolean. True if we are only showing open bugs.    
+  # openonly: boolean. True if we are only showing open bugs.
   # product: string. Restrict to this product only.
   #%]
-  
+
+[% PROCESS global/variables.none.tmpl %]
+
 [%# *** Column Headers *** %]
 
 [% IF bug_ids.size > 0 %]
   <table border>
     <tr bgcolor="#CCCCCC">
-      [% FOREACH column = [ { name => "id", description => "Bug #" },
+      [% FOREACH column = [ { name => "id", description => "$terms.Bug #" },
                             { name => "count", description => "Dupe<br>Count" },
-                            { name => "delta", 
+                            { name => "delta",
                         description => "Change in last<br>$changedsince day(s)" },
                             { name => "component", description => "Component" },
                             { name => "bug_severity", description => "Severity" },
-                            { name => "op_sys", description => "Op Sys" }, 
-                            { name => "target_milestone", 
+                            { name => "op_sys", description => "Op Sys" },
+                            { name => "target_milestone",
                               description => "Target<br>Milestone" },
-                            { name => "short_desc", description => "Summary" } ] 
+                            { name => "short_desc", description => "Summary" } ]
        %]
 
         [%# Small hack to keep delta column out if we don't need it %]
-        [% NEXT IF column.name == "delta" AND NOT dobefore %]                     
+        [% NEXT IF column.name == "delta" AND NOT dobefore %]
 
         <td>
           <center>
@@ -112,7 +114,7 @@
 
   [% FOREACH bug = bugs %]
     [% LAST IF loop.index() >= maxrows %]
-    [% vis_bug_ids.push(bug.id) %]      
+    [% vis_bug_ids.push(bug.id) %]
 
     <tr [% "class='resolved'" IF bug.resolution != "" %]>
       <td>
@@ -143,5 +145,5 @@
 
   </table>
 [% ELSE %]
-  <h3>No duplicate bugs found.</h3>
+  <h3>No duplicate [% terms.bugs %] found.</h3>
 [% END %]
diff --git a/template/en/default/reports/duplicates.html.tmpl b/template/en/default/reports/duplicates.html.tmpl
index a522c4db7..bab06d941 100644
--- a/template/en/default/reports/duplicates.html.tmpl
+++ b/template/en/default/reports/duplicates.html.tmpl
@@ -21,25 +21,27 @@
 
 [%# INTERFACE:
   # products: list of strings. The products this user can see.
-  #  
+  #
   # sortby: string. the column on which we are sorting the buglist.
   # reverse: boolean. True if we are reversing the current sort.
   # maxrows: integer. Max number of rows to display.
   # changedsince: integer. The number of days ago for the changedsince column.
-  # openonly: boolean. True if we are only showing open bugs.    
+  # openonly: boolean. True if we are only showing open bugs.
   # product: string. Restrict to this product only.
   #
   # Additionally, you need to fulfill the interface to
   # duplicates-table.html.tmpl.
   #%]
- 
+
+[% PROCESS global/variables.none.tmpl %]
+
 [% IF product %]
-  [% title = "Most Frequently Reported Bugs for $product" %]
-[% ELSE %]   
-  [% title = "Most Frequently Reported Bugs" %]
+  [% title = "Most Frequently Reported $terms.Bugs for $product" %]
+[% ELSE %]
+  [% title = "Most Frequently Reported $terms.Bugs" %]
 [% END%]
 
-[% PROCESS global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl
    style = ".resolved { background-color: #d9d9d9; color: #000000; }"
 %]
 
@@ -66,14 +68,14 @@
       <td>When sorting or restricting,
           work with:</td>
       <td>
-        <input type="radio" name="sortvisible" id="entirelist" value="0" 
-          [% "checked" IF NOT sortvisible %]>         
+        <input type="radio" name="sortvisible" id="entirelist" value="0"
+          [% "checked" IF NOT sortvisible %]>
         <label for="entirelist">
           entire list
         </label>
-        <br>        
-        <input type="radio" name="sortvisible" id="visiblelist" value="1" 
-          [% "checked" IF sortvisible %]> 
+        <br>
+        <input type="radio" name="sortvisible" id="visiblelist" value="1"
+          [% "checked" IF sortvisible %]>
         <label for="visiblelist">
           currently visible list
         </label>
@@ -106,65 +108,65 @@
     <tr>
       <td>
         <label for="openonly">
-          Open bugs only:
+          Open [% terms.bugs %] only:
         </label>
       </td>
       <td>
-        <input type="checkbox" name="openonly" id="openonly" value="1" 
-          [% "checked" IF openonly %]>      
+        <input type="checkbox" name="openonly" id="openonly" value="1"
+          [% "checked" IF openonly %]>
       </td>
     </tr>
 
   </table>
 
-  <input type="submit" value="Change"> 
+  <input type="submit" value="Change">
 </form>
 
 <form method="post" action="buglist.cgi">
   <input type="hidden" name="bug_id" value="[% bug_ids_string %]">
   <input type="hidden" name="order" value="Reuse same sort as last time">
-  Or just give this to me as a <input type="submit" value="bug list">. 
+  Or just give this to me as a <input type="submit" value="[% terms.bug %] list">.
   (Note: the order may not be the same.)
 </form>
 
 <hr>
 
 <b>
-  <a name="explanation">What are "Most Frequently Reported Bugs"?</a>
+  <a name="explanation">What are "Most Frequently Reported [% terms.Bugs %]"?</a>
 </b>
 
 <blockquote>
-  The Most Frequent Bugs page lists the known open bugs which 
-  are reported most frequently. It is 
-  automatically generated from the Bugzilla database every 24 hours, by 
-  counting the number of direct and indirect duplicates of bugs.
+  The Most Frequent [% terms.Bugs %] page lists the known open [% terms.bugs %] which
+  are reported most frequently. It is
+  automatically generated from the [% terms.Bugzilla %] database every 24 hours, by
+  counting the number of direct and indirect duplicates of [% terms.bugs %].
   This information is provided in order to assist in minimizing
-  the amount of duplicate bugs entered into Bugzilla, which saves time
-  for Quality Assurance engineers who have to triage the bugs.
+  the amount of duplicate [% terms.bugs %] entered into [% terms.Bugzilla %], which
+  saves time for Quality Assurance engineers who have to triage the [% terms.bugs %].
 </blockquote>
 
 <b>How do I use this list?</b>
 
 <ul>
-  <li>Review the most frequent bugs list.</li>
+  <li>Review the most frequent [% terms.bugs %] list.</li>
   <li>If your problem is listed:</li>
 
   <ul>
-    <li>Click on the bug number to confirm that you have found the same bug, 
-        and comment if you have additional information or move on with your 
-        testing of the product.
+    <li>Click on the [% terms.bug %] number to confirm that you have found the
+    	same [% terms.bug %], and comment if you have additional information
+    	or move on with your testing of the product.
     </li>
   </ul>
 
   <li>If your problem not listed:</li>
 
   <ul>
-    <li><a href="query.cgi">Try and locate a similar bug</a> 
+    <li><a href="query.cgi">Try and locate a similar [% terms.bug %]</a>
         that has already been filed.</li>
-    <li>If you find your bug in Bugzilla, feel free to comment with any new or
-        additional data you may have.</li>
-    <li>If you cannot find your problem already documented in Bugzilla, 
-        <a href="enter_bug.cgi">file a new bug</a>.</li>
+    <li>If you find your [% terms.bug %] in [% terms.Bugzilla %],
+    	feel free to comment with any new or additional data you may have.</li>
+    <li>If you cannot find your problem already documented in [% terms.Bugzilla %],
+        <a href="enter_bug.cgi">file a new [% terms.bug %]</a>.</li>
   </ul>
 </ul>
 
diff --git a/template/en/default/reports/keywords.html.tmpl b/template/en/default/reports/keywords.html.tmpl
index 665e360c0..2fc024b2c 100644
--- a/template/en/default/reports/keywords.html.tmpl
+++ b/template/en/default/reports/keywords.html.tmpl
@@ -26,9 +26,11 @@
   #   bugcount: number of bugs with that keyword
   # caneditkeywords: boolean. True if this user can edit keywords
  %]
- 
-[% PROCESS global/header.html.tmpl 
-  title = "Bugzilla Keyword Descriptions"
+
+[% PROCESS global/variables.none.tmpl %]
+
+[% PROCESS global/header.html.tmpl
+  title = "$terms.Bugzilla Keyword Descriptions"
 %]
 
 [% FOREACH keyword = keywords %]
@@ -36,15 +38,15 @@
     [% IF loop.index != 0 %]
        </table>
     [% END %]
-    
+
     <table border="1" cellpadding="4" cellspacing="0">
       <tr bgcolor="#6666FF">
         <th align="left">Name</th>
         <th align="left">Description</th>
-        <th align="left">Bugs</th>
+        <th align="left">[% terms.Bugs %]</th>
       </tr>
-  [% END %]  
-  
+  [% END %]
+
   <tr>
     <th>
       <a name="[% keyword.name FILTER html %]">
diff --git a/template/en/default/reports/menu.html.tmpl b/template/en/default/reports/menu.html.tmpl
index f28f1f697..a6817a36a 100644
--- a/template/en/default/reports/menu.html.tmpl
+++ b/template/en/default/reports/menu.html.tmpl
@@ -24,12 +24,14 @@
   # types in Bugzilla.
   #%]
 
-[% PROCESS global/header.html.tmpl 
+[% PROCESS global/variables.none.tmpl %]
+
+[% PROCESS global/header.html.tmpl
   title = "Reporting and Charting Kitchen"
 %]
 
 <p>
-  Bugzilla allows you to view and track the state of the bug database in
+  [% terms.Bugzilla %] allows you to view and track the state of the [% terms.bug %] database in
   all manner of exciting ways.
 </p>
 
@@ -37,14 +39,14 @@
 
 <ul>
   <li>
-    <strong><a href="query.cgi">Search</a></strong> - 
-    list sets of bugs.
+    <strong><a href="query.cgi">Search</a></strong> -
+    list sets of [% terms.bugs %].
   </li>
   <li>
     <strong>
       <a href="query.cgi?format=report-table">Tabular reports</a>
     </strong> -
-    tables of bug counts in 1, 2 or 3 dimensions, as HTML or CSV.
+    tables of [% terms.bug %] counts in 1, 2 or 3 dimensions, as HTML or CSV.
   </li>
   <li>
     <strong>
@@ -59,7 +61,7 @@
 <ul>
   <li>
     <strong><a href="reports.cgi">Old Charts</a></strong> - 
-    plot the status and/or resolution of bugs against
+    plot the status and/or resolution of [% terms.bugs %] against
     time, for each product in your database.
   </li>
   <li>
diff --git a/template/en/default/reports/report-bar.png.tmpl b/template/en/default/reports/report-bar.png.tmpl
index 143768a25..72a5d9dd4 100644
--- a/template/en/default/reports/report-bar.png.tmpl
+++ b/template/en/default/reports/report-bar.png.tmpl
@@ -19,7 +19,9 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% y_label = "Bugs" %]
+[% PROCESS global/variables.none.tmpl %]
+
+[% y_label = "$terms.Bugs" %]
 
 [% PROCESS "global/field-descs.none.tmpl" %]
 
@@ -30,26 +32,26 @@
 
   graph.set(x_label           => col_field_disp,
             y_label           => y_label,
-            y_tick_number     => 8, 
-            y_number_format   => "%d", 
+            y_tick_number     => 8,
+            y_number_format   => "%d",
             x_label_position  => 0.5,
             x_labels_vertical => x_labels_vertical,
             bar_spacing       => 8,
-            shadow_depth      => 4, 
+            shadow_depth      => 4,
             shadowclr         => 'dred',
-            show_values       => 1,    
+            show_values       => 1,
             legend_placement  => "RT");
-  
+
   graph.set(cumulate          => "true",
             show_values       => 0) IF cumulate;
-  
-  # Workaround for the fact that set_legend won't take row_names directly, 
+
+  # Workaround for the fact that set_legend won't take row_names directly,
   # because row_names is an array reference rather than an array.
   graph.set_legend(row_names.0, row_names.1, row_names.2, row_names.3,
                    row_names.4, row_names.5, row_names.6, row_names.7,
                    row_names.8, row_names.9, row_names.10, row_names.11,
                    row_names.12, row_names.13, row_names.14, row_names.15);
-                                            
+
   graph.plot(data.0).png | stdout(1);
   END;
 -%]
diff --git a/template/en/default/reports/report-line.png.tmpl b/template/en/default/reports/report-line.png.tmpl
index 5fe7663d0..780ec37e3 100644
--- a/template/en/default/reports/report-line.png.tmpl
+++ b/template/en/default/reports/report-line.png.tmpl
@@ -19,7 +19,9 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% y_label = "Bugs" %]
+[% PROCESS global/variables.none.tmpl %]
+
+[% y_label = "$terms.Bugs" %]
 
 [% PROCESS "global/field-descs.none.tmpl" %]
 
@@ -35,19 +37,19 @@
 [% FILTER null;
   graph.set(x_label           => col_field_disp,
             y_label           => y_label,
-            y_tick_number     => 8, 
+            y_tick_number     => 8,
             x_label_position  => 0.5,
             x_labels_vertical => x_labels_vertical,
             legend_placement  => "RT",
             line_width        => 2);
-  
-  # Workaround for the fact that set_legend won't take row_names directly, 
+
+  # Workaround for the fact that set_legend won't take row_names directly,
   # because row_names is an array reference rather than an array.
   graph.set_legend(row_names.0, row_names.1, row_names.2, row_names.3,
                    row_names.4, row_names.5, row_names.6, row_names.7,
                    row_names.8, row_names.9, row_names.10, row_names.11,
                    row_names.12, row_names.13, row_names.14, row_names.15);
-                      
+
   graph.plot(data.0).png | stdout(1);
   END;
 -%]
diff --git a/template/en/default/reports/report-table.csv.tmpl b/template/en/default/reports/report-table.csv.tmpl
index 3e702f396..989790e47 100644
--- a/template/en/default/reports/report-table.csv.tmpl
+++ b/template/en/default/reports/report-table.csv.tmpl
@@ -21,7 +21,9 @@
 [%# INTERFACE:
   # See report-table.html.tmpl.
   #%]
-[% num_bugs = "Number of bugs" %]
+[% PROCESS global/variables.none.tmpl %]
+
+[% num_bugs = BLOCK %]Number of [% terms.bugs %][% END %]
 [% tbl_field_disp = field_descs.$tbl_field || tbl_field %]
 [% col_field_disp = field_descs.$col_field || col_field %]
 [% row_field_disp = field_descs.$row_field || row_field %]
author	gerv%gerv.net <>	2003-07-04 06:31:13 +0200
committer	gerv%gerv.net <>	2003-07-04 06:31:13 +0200
commit	44b48df3901d829e1423749136d142964ccb4a3e (patch)
tree	f87659c97f6c97654cde63005c514a5504913631 /template/en/default/reports
parent	7b35e1a271f27612cba91216d50e5f497dd0c69a (diff)
download	bugzilla-44b48df3901d829e1423749136d142964ccb4a3e.tar.gz bugzilla-44b48df3901d829e1423749136d142964ccb4a3e.tar.xz