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. --- .../admin/flag-type/confirm-delete.html.tmpl | 14 ++-- template/en/default/admin/flag-type/edit.html.tmpl | 35 ++++++---- template/en/default/admin/flag-type/list.html.tmpl | 22 +++--- .../products/groupcontrol/confirm-edit.html.tmpl | 15 ++-- .../admin/products/groupcontrol/edit.html.tmpl | 81 +++++++++++----------- 5 files changed, 88 insertions(+), 79 deletions(-) (limited to 'template/en/default/admin') diff --git a/template/en/default/admin/flag-type/confirm-delete.html.tmpl b/template/en/default/admin/flag-type/confirm-delete.html.tmpl index 46522000b..6bf1ca43f 100644 --- a/template/en/default/admin/flag-type/confirm-delete.html.tmpl +++ b/template/en/default/admin/flag-type/confirm-delete.html.tmpl @@ -19,20 +19,22 @@ # Contributor(s): Myk Melez #%] +[% PROCESS global/variables.none.tmpl %] + [%# Filter off the name here to be used multiple times below %] [% name = BLOCK %][% flag_type.name FILTER html %][% END %] -[% PROCESS global/header.html.tmpl - title = "Confirm Deletion of Flag Type '$name'" +[% PROCESS global/header.html.tmpl + title = "Confirm Deletion of Flag Type '$name'" %]

- There are [% flag_count %] flags of type [% name %]. - If you delete this type, those flags will also be deleted. Note that - instead of deleting the type you can + There are [% flag_count %] flags of type [% name %]. + If you delete this type, those flags will also be deleted. Note that + instead of deleting the type you can deactivate it, in which case the type and its flags will remain in the database - but will not appear in the Bugzilla UI. + but will not appear in the [% terms.Bugzilla %] UI.

diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl index 157ad3592..a56c3bb65 100644 --- a/template/en/default/admin/flag-type/edit.html.tmpl +++ b/template/en/default/admin/flag-type/edit.html.tmpl @@ -19,6 +19,8 @@ # Contributor(s): Myk Melez #%] +[% 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 %] @@ -36,9 +38,13 @@ [% END %] [% IF type.target_type == "bug" %] - [% title = "Create Flag Type for Bugs" %] + [% title = BLOCK %]Create Flag Type for [% terms.Bugs %][% END %] + [% typeLabelLowerPlural = BLOCK %][% terms.bugs %][% END %] + [% typeLabelLowerSingular = BLOCK %][% terms.bug %][% END %] [% ELSE %] [% title = "Create Flag Type for Attachments" %] + [% typeLabelLowerPlural = BLOCK %]attachments[% END %] + [% typeLabelLowerSingular = BLOCK %]attachment[% END %] [% END %] [% IF last_action == "copy" %] @@ -47,7 +53,7 @@ [% title = "Edit Flag Type $type.name" %] [% END %] -[% PROCESS global/header.html.tmpl +[% PROCESS global/header.html.tmpl title = title style = " table#form th { text-align: right; vertical-align: baseline; white-space: nowrap; } @@ -66,13 +72,13 @@ [% FOREACH category = type.exclusions %] [% END %] - +
@@ -84,12 +90,13 @@ - + + - + @@ -159,11 +166,11 @@ - + @@ -172,7 +179,7 @@ diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl index 43fbf8d56..0e3306d27 100644 --- a/template/en/default/admin/flag-type/list.html.tmpl +++ b/template/en/default/admin/flag-type/list.html.tmpl @@ -19,7 +19,9 @@ # Contributor(s): Myk Melez #%] -[% PROCESS global/header.html.tmpl +[% PROCESS global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl title = 'Administer Flag Types' style = " table#flag_types tr th { text-align: left; } @@ -28,7 +30,7 @@ %]

- Flags are markers that identify whether a bug or attachment has been granted + Flags are markers that identify whether [% terms.abug %] or attachment has been granted or denied some status. Flags appear in the UI as a name and a status symbol ("+" for granted, "-" for denied, and "?" for statuses requested by users).

@@ -40,13 +42,13 @@ either the string "review+" or the string "review-" will appear in the patch, depending on whether the patch passed or failed review.

- -

Flag Types for Bugs

+ +

Flag Types for [% terms.Bugs %]

[% PROCESS display_flag_types types=bug_types %]

- Create Flag Type for Bugs + Create Flag Type for [% terms.Bugs %]

Flag Types for Attachments

@@ -63,8 +65,8 @@ { if (count > 0) { var msg = 'There are ' + count + ' flags of type ' + name + '. ' + - 'If you delete this type, those flags will also be ' + - 'deleted.\n\nNote: to deactivate the type instead ' + + 'If you delete this type, those flags will also be ' + + 'deleted.\n\nNote: to deactivate the type instead ' + 'of deleting it, edit it and uncheck its "is active" ' + 'flag.\n\nDo you really want to delete this flag type?'; if (!confirm(msg)) return false; @@ -95,12 +97,12 @@ - + [% END %]
Name: a short name identifying this type
-
Category: - the products/components to which [% type.target_type %]s must - (inclusions) or must not (exclusions) belong in order for users + the products/components to which [% typeLabelLowerPlural %] must + (inclusions) or must not (exclusions) belong in order for users to be able to set flags of this type for them @@ -124,11 +131,11 @@
Sort Key: - a number between 1 and 32767 by which this type will be sorted + a number between 1 and 32767 by which this type will be sorted when displayed to users in a list; ignore if you don't care what order the types appear in or if you want them to appear in alphabetical order
@@ -147,7 +154,7 @@
  - + requestable (users can ask for flags of this type to be set)
  - + specifically requestable (users can ask specific other users to set flags of this type as opposed to just asking the wind)
  - multiplicable (multiple flags of this type can be set on the same [% type.target_type %]) + multiplicable (multiple flags of this type can be set on the same [% typeLabelLowerSingular %])
[% type.description FILTER html %] Copy - | Delete
diff --git a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl index cf8fcca9c..8dfb97230 100644 --- a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl @@ -17,29 +17,30 @@ # Rights Reserved. # # Contributor(s): Joel Peshkin - # + # #%] - +[% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl title="Confirm Group Control Change for product \'$product\'" %] [% FOREACH group = mandatory_groups %]

-group '[% group.name FILTER html %]' impacts [% group.count %] bugs for which the group is -newly mandatory and will be added. +group '[% group.name FILTER html %]' impacts [% group.count %] [% terms.bugs %] for +which the group is newly mandatory and will be added. [% END %] [% FOREACH group = na_groups %]

-group '[% group.name FILTER html %]' impacts [% group.count %] bugs for which the group is no longer applicable and will be removed. -[% END %] +group '[% group.name FILTER html %]' impacts [% group.count %]  +[% terms.bugs %] for which the group is no longer applicable and will +be removed.[% END %]

[% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
- Click "Continue" to proceed with the change including the changes + Click "Continue" to proceed with the change including the changes indicated above. If you do not want these changes, use "back" to return to the previous page.

diff --git a/template/en/default/admin/products/groupcontrol/edit.html.tmpl b/template/en/default/admin/products/groupcontrol/edit.html.tmpl index 11bb99de5..bc6ce11b4 100644 --- a/template/en/default/admin/products/groupcontrol/edit.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/edit.html.tmpl @@ -19,16 +19,17 @@ # Contributor(s): Joel Peshkin #%] +[% PROCESS global/variables.none.tmpl %] [% filt_product = product FILTER html %] -[% PROCESS global/header.html.tmpl +[% PROCESS global/header.html.tmpl title = "Edit Group Controls for '$filt_product'" %] - + @@ -36,7 +37,7 @@ - + [% FOREACH group = groups %] [% IF group.isactive == 0 AND group.bugcount > 0 %] @@ -63,22 +64,22 @@
GroupMemberControl OtherControl CaneditBugs[% terms.Bugs %]
@@ -164,7 +165,7 @@ this group according to the following definitions. NA @@ -175,9 +176,9 @@ this group according to the following definitions. NA @@ -188,8 +189,8 @@ this group according to the following definitions. Shown @@ -201,9 +202,9 @@ this group according to the following definitions. Default @@ -214,11 +215,10 @@ this group according to the following definitions. Mandatory @@ -229,10 +229,9 @@ this group according to the following definitions. NA @@ -243,11 +242,10 @@ this group according to the following definitions. Default @@ -258,11 +256,10 @@ this group according to the following definitions. Mandatory @@ -273,7 +270,7 @@ this group according to the following definitions. Mandatory -- cgit v1.2.3-24-g4f1b
- Bugs in this product are never associated with this group. + [% terms.Bugs %] in this product are never associated with this group.
- Bugs in this product are permitted to be restricted to this - group. Users who are a member of this group will be able - to place bugs in this group. + [% terms.Bugs %] in this product are permitted to be restricted to this + group. Users who are a member of this group will be able to place [% terms.bugs %] in + this group.
- Bugs in this product can be placed in this group by anyone - with permission to edit the bug even if they are not a member + [% terms.Bugs %] in this product can be placed in this group by anyone + with permission to edit the [% terms.bug %] even if they are not a member of this group.
- Bugs in this product can be placed in this group by anyone - with permission to edit the bug even if they are not a member - of this group. Non-members place bugs in this group by default. + [% terms.Bugs %] in this product can be placed in this group by anyone + with permission to edit the [% terms.bug %] even if they are not a member + of this group. Non-members place [% terms.bugs %] in this group by default.
- Bugs in this product are permitted to be restricted to this - group. Users who are a member of this group will be able - to place bugs in this group. - Non-members will be forced to restrict bugs to this group - when they initially enter a bug in this product. + [% terms.Bugs %] in this product are permitted to be restricted to this + group. Users who are a member of this group will be able to place [% terms.bugs %] + in this group. Non-members will be forced to restrict [% terms.bugs %] to + this group when they initially enter [% terms.abug %] in this product.
- Bugs in this product are permitted to be restricted to this - group and are placed in this group by default. - Users who are a member of this group will be able - to place bugs in this group. + [% terms.Bugs %] in this product are permitted to be restricted to this + group and are placed in this group by default. Users who are a member of this + group will be able to place [% terms.bugs %] in this group.
- Bugs in this product are permitted to be restricted to this - group and are placed in this group by default. - Users who are a member of this group will be able - to place bugs in this group. Non-members will be able to - restrict bugs to this group on entry and will do so by default + [% terms.Bugs %] in this product are permitted to be restricted to this + group and are placed in this group by default. Users who are a member of this group + will be able to place [% terms.bugs %] in this group. Non-members will be + able to restrict [% terms.bugs %] to this group on entry and will do so by default
- Bugs in this product are permitted to be restricted to this - group and are placed in this group by default. - Users who are a member of this group will be able - to place bugs in this group. Non-members will be forced - to place bugs in this group on entry. + [% terms.Bugs %] in this product are permitted to be restricted to this + group and are placed in this group by default. Users who are a member of this group + will be able to place [% terms.bugs %] in this group. Non-members will be forced + to place [% terms.bugs %] in this group on entry.
- Bugs in this product are required to be restricted to this + [% terms.Bugs %] in this product are required to be restricted to this group. Users are not given any option.