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. --- .../en/default/reports/duplicates-simple.html.tmpl | 10 ++-- .../en/default/reports/duplicates-table.html.tmpl | 26 +++++---- template/en/default/reports/duplicates.html.tmpl | 68 +++++++++++----------- template/en/default/reports/keywords.html.tmpl | 16 ++--- template/en/default/reports/menu.html.tmpl | 14 +++-- template/en/default/reports/report-bar.png.tmpl | 20 ++++--- template/en/default/reports/report-line.png.tmpl | 12 ++-- template/en/default/reports/report-table.csv.tmpl | 4 +- 8 files changed, 93 insertions(+), 77 deletions(-) (limited to 'template/en/default/reports') 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 %] + [% 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%] 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 %] - [% FOREACH column = [ { name => "id", description => "Bug #" }, + [% FOREACH column = [ { name => "id", description => "$terms.Bug #" }, { name => "count", description => "Dupe
Count" }, - { name => "delta", + { name => "delta", description => "Change in last
$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
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 %]
@@ -112,7 +114,7 @@ [% FOREACH bug = bugs %] [% LAST IF loop.index() >= maxrows %] - [% vis_bug_ids.push(bug.id) %] + [% vis_bug_ids.push(bug.id) %]
@@ -143,5 +145,5 @@
[% ELSE %] -

No duplicate bugs found.

+

No duplicate [% terms.bugs %] found.

[% 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 @@ When sorting or restricting, work with: - + -
- +
+ @@ -106,65 +108,65 @@ - + - +
- Or just give this to me as a . + Or just give this to me as a . (Note: the order may not be the same.)
- What are "Most Frequently Reported Bugs"? + What are "Most Frequently Reported [% terms.Bugs %]"?
- 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 %].
How do I use this list? 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 %] [% END %] - + - + - [% END %] - + [% END %] +
Name DescriptionBugs[% terms.Bugs %]
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" %]

- 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.

@@ -37,14 +39,14 @@
  • - Search - - list sets of bugs. + Search - + list sets of [% terms.bugs %].
  • Tabular reports - - 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.
  • @@ -59,7 +61,7 @@
    • Old Charts - - 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.
    • 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 #%] -[% 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 #%] -[% 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 %] -- cgit v1.2.3-24-g4f1b