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/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 ++++++++--------
7 files changed, 64 insertions(+), 50 deletions(-)
(limited to 'template/en/default/bug/process')
diff --git a/template/en/default/bug/process/bugmail.html.tmpl b/template/en/default/bug/process/bugmail.html.tmpl
index 5445ef9cd..631842a40 100644
--- a/template/en/default/bug/process/bugmail.html.tmpl
+++ b/template/en/default/bug/process/bugmail.html.tmpl
@@ -22,20 +22,22 @@
[%# INTERFACE:
# mailing_bugid: string. ID of the bug this mail is concerning.
- # mailrecipients: hash. People involved in this change. Hash has up to five
+ # mailrecipients: hash. People involved in this change. Hash has up to five
# elements:
- # changer: string. The login name of the user who made the
+ # changer: string. The login name of the user who made the
# change.
#
# For bug changes where people need to be notified:
# owner: string. The login name of the bug assignee.
# reporter: string. The login name of the bug reporter.
- # qacontact: string. The login name of the bug's QA contact.
+ # qacontact: string. The login name of the bug's QA contact.
# Optional.
- # cc: list of strings. The login names of those on the CC
+ # cc: list of strings. The login names of those on the CC
# list.
#%]
+[% PROCESS global/variables.none.tmpl %]
+
[% mail = SendBugMail(mailing_bugid, mailrecipients) %]
[% PROCESS emails
@@ -49,7 +51,7 @@
%]
- If you wish to tweak the kinds of mail Bugzilla sends you, you can
+ If you wish to tweak the kinds of mail [% terms.Bugzilla %] sends you, you can
change your preferences.
@@ -62,7 +64,7 @@
[% description %]:
[% IF names.size > 0 %]
[%+ FOREACH name = names %]
- [% name %][% ", " UNLESS loop.last() %]
+ [% name %][% ", " UNLESS loop.last() %]
[% END %]
[% ELSE %]
no one
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" %]
-
+
- 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 %] [% original_bug_id %] (the original) are currently set
such that the reporter would not normally be able to see it.
- Adding the reporter to the CC list of bug [% original_bug_id %]
+ Adding the reporter to the CC list of [% terms.bug %] [% original_bug_id %]
[% IF cclist_accessible %]
will immediately
[% ELSE %]
might, in the future,
[% END %]
- allow him/her access to view this bug.
+ allow him/her access to view this [% terms.bug %].
Do you wish to do this?
-
+
- Throw away my changes,
- and revisit bug [% bug_id %]
+ Throw away my changes,
+ and revisit [% terms.bug %] [% bug_id %]
diff --git a/template/en/default/bug/process/next.html.tmpl b/template/en/default/bug/process/next.html.tmpl
index 1eeb9f367..73c8b5289 100644
--- a/template/en/default/bug/process/next.html.tmpl
+++ b/template/en/default/bug/process/next.html.tmpl
@@ -23,10 +23,12 @@
# bug : Bug object; the next bug to show
#%]
+[% PROCESS global/variables.none.tmpl %]
+
- The next bug in your list is bug
+ The next [% terms.bug %] in your list is [% terms.bug %]
[% bug.bug_id %]:
diff --git a/template/en/default/bug/process/results.html.tmpl b/template/en/default/bug/process/results.html.tmpl
index 5c3592954..2097e047b 100644
--- a/template/en/default/bug/process/results.html.tmpl
+++ b/template/en/default/bug/process/results.html.tmpl
@@ -25,24 +25,26 @@
# type: string; the type of change/check that was made: "bug" when a bug
# is changed, "dupe" when a duplication notation is added to a bug,
# and "dep" when a bug is checked for changes to its dependencies.
- #
+ #
# mailrecipients: hash; BugMail recipient params. Optional.
#%]
+[% PROCESS global/variables.none.tmpl %]
+
[% UNLESS header_done %]
[% PROCESS bug/process/header.html.tmpl %]
[% END %]
[% DEFAULT type="bug" %]
-[%
+[%
title = {
- 'bug' => "Changes submitted for bug $id" ,
- 'dupe' => "Duplicate notation added to bug $id" ,
- 'dep' => "Checking for dependency changes on bug $id" ,
- 'votes' => "Bug $id confirmed by number of votes" ,
- 'created' => "Bug $id has been added to the database" ,
- }
+ 'bug' => "Changes submitted for $terms.bug $id" ,
+ 'dupe' => "Duplicate notation added to $terms.bug $id" ,
+ 'dep' => "Checking for dependency changes on $terms.bug $id" ,
+ 'votes' => "$terms.Bug $id confirmed by number of votes" ,
+ 'created' => "$terms.Bug $id has been added to the database" ,
+ }
%]
diff --git a/template/en/default/bug/process/verify-new-product.html.tmpl b/template/en/default/bug/process/verify-new-product.html.tmpl
index bba85d637..fd37707dc 100644
--- a/template/en/default/bug/process/verify-new-product.html.tmpl
+++ b/template/en/default/bug/process/verify-new-product.html.tmpl
@@ -22,7 +22,7 @@
[%# INTERFACE:
# form: hash; the form values submitted to the script
# mform: hash; the form multi-values submitted to the script
- # verify_fields: boolean; whether or not to verify
+ # verify_fields: boolean; whether or not to verify
# the version, component, and target milestone fields
# versions: array; versions for the new product.
# components: array; components for the new product.
@@ -31,13 +31,15 @@
# those fields
# verify_bug_group: boolean; whether or not to ask the user
# if they want to add the bug to its new product's group
- # use_target_milestone: boolean; whether or not to use
+ # use_target_milestone: boolean; whether or not to use
# the target milestone field
#%]
-
+
+[% PROCESS global/variables.none.tmpl %]
+