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 +- template/en/default/bug/choose.html.tmpl | 10 +- .../en/default/bug/create/create-guided.html.tmpl | 214 +++++++++++---------- template/en/default/bug/create/create.html.tmpl | 62 +++--- template/en/default/bug/create/created.html.tmpl | 6 +- .../en/default/bug/create/make-template.html.tmpl | 6 +- .../en/default/bug/create/user-message.html.tmpl | 10 +- template/en/default/bug/dependency-graph.html.tmpl | 34 ++-- template/en/default/bug/dependency-tree.html.tmpl | 56 +++--- template/en/default/bug/edit.html.tmpl | 168 ++++++++-------- template/en/default/bug/navigate.html.tmpl | 18 +- template/en/default/bug/process/bugmail.html.tmpl | 14 +- .../bug/process/confirm-duplicate.html.tmpl | 32 +-- template/en/default/bug/process/header.html.tmpl | 8 +- template/en/default/bug/process/midair.html.tmpl | 12 +- template/en/default/bug/process/next.html.tmpl | 4 +- template/en/default/bug/process/results.html.tmpl | 20 +- .../bug/process/verify-new-product.html.tmpl | 24 +-- template/en/default/bug/show-multiple.html.tmpl | 60 +++--- template/en/default/bug/show.html.tmpl | 8 +- template/en/default/bug/votes/delete-all.html.tmpl | 10 +- .../en/default/bug/votes/list-for-bug.html.tmpl | 10 +- .../en/default/bug/votes/list-for-user.html.tmpl | 12 +- 24 files changed, 437 insertions(+), 389 deletions(-) (limited to 'template/en/default/bug') 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 $bug_id" + h2 = "$terms.Bug $bug_id" %]
@@ -37,7 +39,7 @@ [% PROCESS bug/activity/table.html.tmpl %]

- Back to bug [% bug_id %] + Back to [% terms.bug %] [% bug_id %]

[% 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 %]

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

[% END %] @@ -55,7 +57,7 @@ Added - [% FOREACH operation = operations %] + [% FOREACH operation = operations %] [% operation.who %] @@ -68,7 +70,7 @@ [% IF change.attachid %] - Attachment #[% change.attachid %] + Attachment #[% change.attachid %] [% END %] [% change.field %] diff --git a/template/en/default/bug/choose.html.tmpl b/template/en/default/bug/choose.html.tmpl index f965ccc4d..4b67c306f 100644 --- a/template/en/default/bug/choose.html.tmpl +++ b/template/en/default/bug/choose.html.tmpl @@ -19,15 +19,17 @@ # Contributor(s): Gervase Markham #%] -[% PROCESS global/header.html.tmpl - title = "Search by bug number" +[% PROCESS global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl + title = "Search by $terms.bug number" %]

- You may find a single bug by entering its bug id here: + You may find a single [% terms.bug %] by entering its [% terms.bug %] id here: - +

diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl index 7ab7436a7..60faa0f03 100644 --- a/template/en/default/bug/create/create-guided.html.tmpl +++ b/template/en/default/bug/create/create-guided.html.tmpl @@ -24,21 +24,23 @@ # This template has the same interface as create.html.tmpl #%] +[% PROCESS global/variables.none.tmpl %] + [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] [% PROCESS global/header.html.tmpl - title = "Enter A Bug" + title = "Enter $terms.ABug" onload = "PutDescription()" %]

- This is a template used on mozilla.org - it, along with the + This is a template used on mozilla.org - it, along with the comment-guided.txt.tmpl template, are included as a demo of what it's - possible to do with custom templates in general, and custom bug entry + possible to do with custom templates in general, and custom [% terms.bug %] entry templates in particular. It is recommended that this template be - customised if you want to use it on your Bugzilla installation. + customised if you want to use it on your [% terms.Bugzilla %] installation.

@@ -66,15 +68,15 @@ function PutDescription() { [%# Browser sniff to try and reduce the incidence of 4.x and NS 6/7 bugs %] [% IF cgi.user_agent("Mozilla/4") AND NOT cgi.user_agent("compatible") %] -
- Note: This is a tool for reporting bugs in software from mozilla.org. + Note: This is a tool for reporting [% terms.bugs %] in software from mozilla.org. Use Netscape's - bug reporting - form to report bugs with Netscape products like Navigator 4.x. + [% terms.bug %] reporting + form to report [% terms.bugs %] with Netscape products like Navigator 4.x. Netscape products have a blue and black N in the top right hand corner. @@ -84,74 +86,74 @@ function PutDescription() { [% IF cgi.user_agent('Netscape(\d)') %] [% matches = cgi.user_agent().match('Netscape(\d)') %] -
- You are using Netscape [% matches.0 %]. - Report bugs with this browser to the + You are using Netscape [% matches.0 %]. + Report [% terms.bugs %] with this browser to the Netscape [% matches.0 %] Feedback Center. - This form is only for reporting bugs in the Mozilla web browser and other - products from mozilla.org. To report a bug you find in - Netscape [% matches.0 %] with this form, - you must reproduce it first in a + This form is only for reporting [% terms.bugs %] in the Mozilla web browser and other + products from mozilla.org. To report [% terms.abug %] you find in + Netscape [% matches.0 %] with this form, + you must reproduce it first in a - recent build of Mozilla to make sure the problem hasn't been + recent build of Mozilla to make sure the problem hasn't been fixed already.
[% END %]

This form prompts you for the information required to - file a good bug report (or enhancement request.) - It may seem lengthy, but developers need all this information - to understand and reproduce the bug, which is the first step towards - fixing it. Please note that we do not accept bug reports by - email - please do not email developers or mozilla.org staff - with bug reports. Also, please do not - file Mozilla bugs on copies of Mozilla older than two weeks - first, - download a + file a good [% terms.bug %] report (or enhancement request.) + It may seem lengthy, but developers need all this information + to understand and reproduce the [% terms.bug %], which is the first step towards + fixing it. Please note that we do not accept [% terms.bug %] reports by + email - please do not email developers or mozilla.org staff + with [% terms.bug %] reports. Also, please do not + file Mozilla [% terms.bugs %] on copies of Mozilla older than two weeks - first, + download a newer build and check that the problem is still present.

- -

Step 1 - search for your bug

+ +

Step 1 - search for your [% terms.bug %]

- You need to see if your bug has already been reported. - Please don't skip this step. - 50% of the bugs filed in - Bugzilla are duplicates, and and this wastes a lot of our QA engineers' time. + You need to see if your [% terms.bug %] has already been reported. + Please don't skip this step. + 50% of the [% terms.bugs %] filed in + [% terms.Bugzilla %] are duplicates, and and this wastes a lot of our QA engineers' time.

[%# Stop NS 4.x and all v.3 browsers from getting @@ -181,41 +183,41 @@ function PutDescription() {

Look through the search results. If you get the - Zarro Boogs message, Bugzilla found no bugs that + Zarro Boogs message, [% terms.Bugzilla %] found no [% terms.bugs %] that match. Check for typos, or add fewer or different keywords.

- If you find a bug that looks the same as yours, you can add - useful comments to that bug, but please don't open a new one. - Please don't add comments like "please fix this bug" - this + If you find [% terms.abug %] that looks the same as yours, you can add + useful comments to that [% terms.bug %], but please don't open a new one. + Please don't add comments like "please fix this [% terms.bug %]" - this tends to annoy engineers and slow, rather than speed, the fixing of it.

- If you find bugs similar to yours, read them and note which component - they are in. You should file your bug in that same component. + If you find [% terms.bugs %] similar to yours, read them and note which component + they are in. You should file your [% terms.bug %] in that same component.

- +

Step 2 - give information

- If you're pretty certain that your bug isn't in there already, then + If you're pretty certain that your [% terms.bug %] isn't in there already, then please try to complete this form as accurately as you can. The more you can tell us, the better our chance of being able - to understand and reproduce your bug. + to understand and reproduce your [% terms.bug %].

-
+ - - - + @@ -233,18 +235,18 @@ function PutDescription() { Component
-

+

The area where the problem occurs. - To pick the right component, you could use the same one as - similar bugs you found in your search, or read the full list of + To pick the right component, you could use the same one as + similar [% terms.bugs %] you found in your search, or read the full list of component descriptions if you need more help.

- + -
- [% FOREACH c = component_ %]