From 331611541271cbe83c5d47aad80f6850834fd0c1 Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" Date: Thu, 3 Jul 2003 21:32:13 +0000 Subject: [PATCH] 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. --- webtools/bugzilla/t/008filter.t | 3 + .../default/account/auth/ldap-error.html.tmpl | 6 +- .../en/default/account/auth/login.html.tmpl | 16 +- .../en/default/account/cancel-token.txt.tmpl | 15 +- .../en/default/account/create.html.tmpl | 17 +- .../default/account/email/change-new.txt.tmpl | 9 +- .../default/account/email/change-old.txt.tmpl | 11 +- .../en/default/account/exists.html.tmpl | 8 +- .../password/forgotten-password.txt.tmpl | 13 +- .../en/default/account/prefs/email.html.tmpl | 66 ++--- .../en/default/account/prefs/footer.html.tmpl | 36 +-- .../account/prefs/permissions.html.tmpl | 22 +- .../admin/flag-type/confirm-delete.html.tmpl | 14 +- .../en/default/admin/flag-type/edit.html.tmpl | 35 ++- .../en/default/admin/flag-type/list.html.tmpl | 22 +- .../groupcontrol/confirm-edit.html.tmpl | 15 +- .../products/groupcontrol/edit.html.tmpl | 81 +++--- .../en/default/attachment/create.html.tmpl | 28 +- .../en/default/attachment/created.html.tmpl | 21 +- .../en/default/attachment/edit.html.tmpl | 18 +- .../attachment/show-multiple.html.tmpl | 9 +- .../en/default/attachment/updated.html.tmpl | 12 +- .../en/default/bug/activity/show.html.tmpl | 12 +- .../en/default/bug/activity/table.html.tmpl | 16 +- .../template/en/default/bug/choose.html.tmpl | 10 +- .../bug/create/create-guided.html.tmpl | 214 +++++++-------- .../en/default/bug/create/create.html.tmpl | 62 ++--- .../en/default/bug/create/created.html.tmpl | 6 +- .../bug/create/make-template.html.tmpl | 6 +- .../default/bug/create/user-message.html.tmpl | 10 +- .../en/default/bug/dependency-graph.html.tmpl | 34 +-- .../en/default/bug/dependency-tree.html.tmpl | 56 ++-- .../template/en/default/bug/edit.html.tmpl | 168 ++++++------ .../en/default/bug/navigate.html.tmpl | 18 +- .../en/default/bug/process/bugmail.html.tmpl | 14 +- .../bug/process/confirm-duplicate.html.tmpl | 32 +-- .../en/default/bug/process/header.html.tmpl | 8 +- .../en/default/bug/process/midair.html.tmpl | 12 +- .../en/default/bug/process/next.html.tmpl | 4 +- .../en/default/bug/process/results.html.tmpl | 20 +- .../bug/process/verify-new-product.html.tmpl | 24 +- .../en/default/bug/show-multiple.html.tmpl | 60 +++-- .../template/en/default/bug/show.html.tmpl | 8 +- .../en/default/bug/votes/delete-all.html.tmpl | 10 +- .../default/bug/votes/list-for-bug.html.tmpl | 10 +- .../default/bug/votes/list-for-user.html.tmpl | 12 +- .../en/default/global/banner.html.tmpl | 4 +- .../default/global/choose-product.html.tmpl | 10 +- .../en/default/global/code-error.html.tmpl | 56 ++-- .../en/default/global/field-descs.none.tmpl | 10 +- .../en/default/global/footer.html.tmpl | 9 +- .../en/default/global/header.html.tmpl | 20 +- .../en/default/global/hidden-fields.html.tmpl | 6 +- .../en/default/global/message.html.tmpl | 6 +- .../en/default/global/messages.html.tmpl | 22 +- .../default/global/site-navigation.html.tmpl | 10 +- .../en/default/global/useful-links.html.tmpl | 18 +- .../en/default/global/user-error.html.tmpl | 254 +++++++++--------- .../en/default/global/variables.none.tmpl | 44 +++ .../template/en/default/index.html.tmpl | 24 +- .../en/default/list/change-columns.html.tmpl | 20 +- .../en/default/list/edit-multiple.html.tmpl | 58 ++-- .../en/default/list/list-simple.html.tmpl | 6 +- .../template/en/default/list/list.csv.tmpl | 4 +- .../template/en/default/list/list.html.tmpl | 28 +- .../template/en/default/list/quips.html.tmpl | 14 +- .../en/default/list/server-push.html.tmpl | 6 +- .../en/default/pages/linkify.html.tmpl | 9 +- .../reports/duplicates-simple.html.tmpl | 10 +- .../reports/duplicates-table.html.tmpl | 26 +- .../en/default/reports/duplicates.html.tmpl | 68 ++--- .../en/default/reports/keywords.html.tmpl | 16 +- .../en/default/reports/menu.html.tmpl | 14 +- .../en/default/reports/report-bar.png.tmpl | 20 +- .../en/default/reports/report-line.png.tmpl | 12 +- .../en/default/reports/report-table.csv.tmpl | 4 +- .../en/default/request/email.txt.tmpl | 9 +- .../en/default/request/queue.html.tmpl | 46 ++-- .../template/en/default/search/form.html.tmpl | 114 ++++---- .../template/en/default/search/knob.html.tmpl | 16 +- .../default/search/search-advanced.html.tmpl | 14 +- .../en/default/search/search-help.html.tmpl | 58 ++-- .../search/search-report-graph.html.tmpl | 24 +- .../search/search-report-table.html.tmpl | 12 +- .../en/default/search/search.html.tmpl | 14 +- .../template/en/default/sidebar.xul.tmpl | 7 +- 86 files changed, 1323 insertions(+), 1102 deletions(-) create mode 100644 webtools/bugzilla/template/en/default/global/variables.none.tmpl diff --git a/webtools/bugzilla/t/008filter.t b/webtools/bugzilla/t/008filter.t index c9e063c78a0..fc8f77e6989 100644 --- a/webtools/bugzilla/t/008filter.t +++ b/webtools/bugzilla/t/008filter.t @@ -136,6 +136,9 @@ foreach my $path (@Support::Templates::include_paths) { # Special Template Toolkit loop variable next if $directive =~ /^loop\.(index|count)$/; + # Branding terms + next if $directive =~ /^terms\./; + # Things which are already filtered # Note: If a single directive prints two things, and only one is # filtered, we may not catch that case. diff --git a/webtools/bugzilla/template/en/default/account/auth/ldap-error.html.tmpl b/webtools/bugzilla/template/en/default/account/auth/ldap-error.html.tmpl index 7615fb32627..cc21ba2778b 100644 --- a/webtools/bugzilla/template/en/default/account/auth/ldap-error.html.tmpl +++ b/webtools/bugzilla/template/en/default/account/auth/ldap-error.html.tmpl @@ -25,6 +25,8 @@ # of the error. #%] +[% PROCESS global/variables.none.tmpl %] + [% SWITCH auth_err_tag %] [% CASE "cannot_retreive_attr" %] The specified LDAP attribute [% info.attr FILTER html %] was not found. @@ -36,12 +38,12 @@ [% END %] [% CASE "no_userid" %] - Bugzilla created a new account for you, but then could not find the + [% terms.Bugzilla %] created a new account for you, but then could not find the new userid. [% CASE "server_not_defined" %] The LDAP server for authentication has not been defined. - + [% CASE %] Unhandled authentication error: [% auth_err_tag FILTER html %] diff --git a/webtools/bugzilla/template/en/default/account/auth/login.html.tmpl b/webtools/bugzilla/template/en/default/account/auth/login.html.tmpl index f342b179140..a2587300eb2 100644 --- a/webtools/bugzilla/template/en/default/account/auth/login.html.tmpl +++ b/webtools/bugzilla/template/en/default/account/auth/login.html.tmpl @@ -22,11 +22,13 @@ [%# INTERFACE: # target: string. URL to go to after login. # form: hash; the form values which need to be submitted to the target script - # mform: hash; the form values with multiple values which need to be + # mform: hash; the form values with multiple values which need to be # submitted to the target script #%] -[% PROCESS global/header.html.tmpl +[% PROCESS global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl title = "Login" %] @@ -68,23 +70,23 @@ [% END %] - + [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password|restrictlogin)$" %] -[%# Allow the user to create a new account, or request a token to change +[%# Allow the user to create a new account, or request a token to change # their password, assuming that our auth method allows that. #%] - + [% IF caneditaccount %]
[% IF Param("createemailregexp") %]

- If you don't have a Bugzilla account, you can + If you don't have a [% terms.Bugzilla %] account, you can create a new account.

[% END %] @@ -92,7 +94,7 @@
If you have an account, but have forgotten your password, - enter your login name below and submit a request + enter your login name below and submit a request to change your password.
diff --git a/webtools/bugzilla/template/en/default/account/cancel-token.txt.tmpl b/webtools/bugzilla/template/en/default/account/cancel-token.txt.tmpl index be926d5e2c3..0554081f2eb 100644 --- a/webtools/bugzilla/template/en/default/account/cancel-token.txt.tmpl +++ b/webtools/bugzilla/template/en/default/account/cancel-token.txt.tmpl @@ -19,16 +19,19 @@ # Contributor(s): John Vandenberg # Tobias Burnus #%] + +[% PROCESS global/variables.none.tmpl %] + From: bugzilla-admin-daemon To: [% emailaddress %] Subject: [% PROCESS subject %] A request was cancelled from [% remoteaddress %]. -If you did not request this, it could be either an honest -mistake or someone attempting to break into your Bugzilla account. +If you did not request this, it could be either an honest +mistake or someone attempting to break into your [% terms.Bugzilla %] account. -Take a look at the information below and forward this email +Take a look at the information below and forward this email to [% maintainer %] if you suspect foul play. Token: [% token %] @@ -84,12 +87,12 @@ Cancelled Because: [% ELSE %] [%# Give sensible error if the cancel-token function is used incorrectly. - #%] - You are using Bugzilla's cancel-token function incorrectly. You + #%] + You are using [% terms.Bugzilla %]'s cancel-token function incorrectly. You passed in the string '[% cancelaction %]'. The correct use is to pass in a tag, and define that tag in the file cancel-token.txt.tmpl. - If you are a Bugzilla end-user seeing this message, please forward this + If you are a [% terms.Bugzilla %] end-user seeing this message, please forward this email to [% Param('maintainer') %]. [% END %] [% END %] diff --git a/webtools/bugzilla/template/en/default/account/create.html.tmpl b/webtools/bugzilla/template/en/default/account/create.html.tmpl index da8979c912c..ec3964e9f5c 100644 --- a/webtools/bugzilla/template/en/default/account/create.html.tmpl +++ b/webtools/bugzilla/template/en/default/account/create.html.tmpl @@ -19,14 +19,17 @@ # Contributor(s): Gervase Markham #%] -[% PROCESS global/header.html.tmpl - title = "Create a new Bugzilla account" -%] +[% PROCESS global/variables.none.tmpl %] + +[% title = BLOCK %] +Create a new [% terms.Bugzilla %] account +[% END %] +[% PROCESS global/header.html.tmpl %]

- To create a Bugzilla account, all that you need to do is to enter a + To create a [% terms.Bugzilla %] account, all that you need to do is to enter a legitimate e-mail address. The account will be created, and its - password will be mailed to you. Optionally you may enter your real name + password will be mailed to you. Optionally you may enter your real name as well.

@@ -41,7 +44,7 @@ [% Param('emailsuffix') FILTER html %] - + Real name: @@ -55,4 +58,4 @@ -[% PROCESS global/footer.html.tmpl %] +[% PROCESS global/footer.html.tmpl %] diff --git a/webtools/bugzilla/template/en/default/account/email/change-new.txt.tmpl b/webtools/bugzilla/template/en/default/account/email/change-new.txt.tmpl index b07be609cce..5568acc0ce4 100644 --- a/webtools/bugzilla/template/en/default/account/email/change-new.txt.tmpl +++ b/webtools/bugzilla/template/en/default/account/email/change-new.txt.tmpl @@ -18,12 +18,15 @@ # # Contributor(s): John Vandenberg #%] + +[% PROCESS global/variables.none.tmpl %] + [% expiration_ts = token_ts + (max_token_age * 86400) %] From: bugzilla-admin-daemon To: [% emailaddress %] -Subject: Bugzilla Change Email Address Request +Subject: [% terms.Bugzilla %] Change Email Address Request -Bugzilla has received a request to change the email address +[% terms.Bugzilla %] has received a request to change the email address for the [% oldemailaddress %] account to your address. To confirm the change, visit the following link: @@ -35,5 +38,5 @@ this request, visit the following link: [% Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER url_quote %] -If you do nothing, the request will lapse after +If you do nothing, the request will lapse after [%- max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]). diff --git a/webtools/bugzilla/template/en/default/account/email/change-old.txt.tmpl b/webtools/bugzilla/template/en/default/account/email/change-old.txt.tmpl index cd1334d3f7e..e5fa87e7fe5 100644 --- a/webtools/bugzilla/template/en/default/account/email/change-old.txt.tmpl +++ b/webtools/bugzilla/template/en/default/account/email/change-old.txt.tmpl @@ -23,15 +23,18 @@ # newemailaddress: string. The user's new Bugzilla login email address. # token: string. The token associated with this change. #%] + +[% PROCESS global/variables.none.tmpl %] + [% expiration_ts = token_ts + (max_token_age * 86400) %] From: bugzilla-admin-daemon To: [% emailaddress %] -Subject: Bugzilla Change Email Address Request +Subject: [% terms.Bugzilla %] Change Email Address Request Importance: High X-MSMail-Priority: High X-Priority: 1 -Bugzilla has received a request to change the email address +[% terms.Bugzilla %] has received a request to change the email address for your account to [% newemailaddress %]. If you are not the person who made this request, or you wish to cancel @@ -39,6 +42,6 @@ this request, visit the following link: [% Param('urlbase') %]token.cgi?a=cxlem&t=[% token FILTER url_quote %] -If you do nothing, and [% newemailaddress %] confirms this request, the -change will be made permanent after +If you do nothing, and [% newemailaddress %] confirms this request, the +change will be made permanent after [%- max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]). diff --git a/webtools/bugzilla/template/en/default/account/exists.html.tmpl b/webtools/bugzilla/template/en/default/account/exists.html.tmpl index 3516dc7ccb8..4b3de22093f 100644 --- a/webtools/bugzilla/template/en/default/account/exists.html.tmpl +++ b/webtools/bugzilla/template/en/default/account/exists.html.tmpl @@ -23,15 +23,17 @@ # login: string. The user's Bugzilla login email address. #%] -[% PROCESS global/header.html.tmpl +[% PROCESS global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl title = "Account Exists" %]
- A Bugzilla account for [% login FILTER html %] already exists. If you - are the account holder and have forgotten your password, + A [% terms.Bugzilla %] account for [% login FILTER html %] already exists. If you + are the account holder and have forgotten your password, .
diff --git a/webtools/bugzilla/template/en/default/account/password/forgotten-password.txt.tmpl b/webtools/bugzilla/template/en/default/account/password/forgotten-password.txt.tmpl index bf3242c0898..c6b04b35a5e 100644 --- a/webtools/bugzilla/template/en/default/account/password/forgotten-password.txt.tmpl +++ b/webtools/bugzilla/template/en/default/account/password/forgotten-password.txt.tmpl @@ -18,13 +18,16 @@ # # Contributor(s): John Vandenberg #%] + +[% PROCESS global/variables.none.tmpl %] + [% expiration_ts = token_ts + (max_token_age * 86400) %] From: bugzilla-admin-daemon To: [% emailaddress %] -Subject: Bugzilla Change Password Request +Subject: [% terms.Bugzilla %] Change Password Request -You (or someone impersonating you) has requested to change your Bugzilla -password. To change your password, visit the following link: +You (or someone impersonating you) has requested to change your [% terms.Bugzilla %] + password. To change your password, visit the following link: [%+ Param('urlbase') %]token.cgi?a=cfmpw&t=[% token FILTER url_quote %] @@ -33,6 +36,6 @@ this request, visit the following link: [%+ Param('urlbase') %]token.cgi?a=cxlpw&t=[% token FILTER url_quote %] -If you do nothing, the request will lapse after -[%- max_token_age %] days +If you do nothing, the request will lapse after +[%- max_token_age %] days ([% time2str("%H:%M on the %o of %B, %Y", expiration_ts) -%]) or when you log in successfully. diff --git a/webtools/bugzilla/template/en/default/account/prefs/email.html.tmpl b/webtools/bugzilla/template/en/default/account/prefs/email.html.tmpl index 8bbb62dfc2b..fa6295e7217 100644 --- a/webtools/bugzilla/template/en/default/account/prefs/email.html.tmpl +++ b/webtools/bugzilla/template/en/default/account/prefs/email.html.tmpl @@ -21,19 +21,21 @@ #%] [%# INTERFACE: - # watchedusers: string. + # watchedusers: string. # Comma-separated list of email addresses this user watches. # excludeself: boolean. # True if user is not receiving self-generated mail. - # : Multiple hashes, one for each rolename (e.g. owner; see - # below), keyed by reasonname (e.g. comments; again, see - # below). The value is a boolean - true if the user is + # : Multiple hashes, one for each rolename (e.g. owner; see + # below), keyed by reasonname (e.g. comments; again, see + # below). The value is a boolean - true if the user is # receiving mail for that reason when in that role. # Also references the 'supportwatchers' Param. #%] +[% PROCESS global/variables.none.tmpl %] + [% useqacontact = Param('useqacontact') %] - + [% IF Param('supportwatchers') %] @@ -45,8 +47,8 @@ @@ -64,7 +66,7 @@ @@ -138,7 +140,7 @@ document.write(' - - + + [% IF queries.size %] [% FOREACH query = queries %] @@ -46,31 +48,31 @@ - [% END %] [% ELSE %] [% END %] - +
If you want to help cover for someone when they're on vacation, or if - you need to do the QA related to all of their bugs, you can tell - Bugzilla to send mail related to their bugs to you also. List the + you need to do the QA related to all of their [% terms.bugs %], you can tell + [% terms.Bugzilla %] to send mail related to their [% terms.bugs %] to you also. List the email addresses of any users you wish to watch here, separated by commas.

If you don't like getting a notification for "trivial" - changes to bugs, you can use the settings below to + changes to [% terms.bugs %], you can use the settings below to filter some (or even all) notifications.

- When my relationship to this bug is: + When my relationship to this [% terms.bug %] is: I want to receive mail when: @@ -165,28 +167,32 @@ document.write(' - [% FOREACH role = [ "Reporter", "Owner", "QAcontact", "CClist", "Voter" ] + [% FOREACH role = [ "Reporter", "Owner", "QAcontact", "CClist", "Voter" ] %] [% NEXT IF role == "QAcontact" AND NOT useqacontact %] @@ -199,6 +205,6 @@ document.write('The 'My bugs' link: + The 'My [% terms.bugs %]' link:
Your query named '[% query.name FILTER html %]':
-
- If you create remembered queries using the +
+ If you create remembered queries using the query page, - you can then come to this page and choose to have some of them - appear in the footer of each Bugzilla page. + you can then come to this page and choose to have some of them + appear in the footer of each [% terms.Bugzilla %] page.

diff --git a/webtools/bugzilla/template/en/default/account/prefs/permissions.html.tmpl b/webtools/bugzilla/template/en/default/account/prefs/permissions.html.tmpl index cd516e76999..0575bbad47e 100644 --- a/webtools/bugzilla/template/en/default/account/prefs/permissions.html.tmpl +++ b/webtools/bugzilla/template/en/default/account/prefs/permissions.html.tmpl @@ -21,20 +21,22 @@ [%# INTERFACE: # has_bits: array of hashes. May be empty. - # name => Names of the permissions the user has. - # desc => Descriptions of the permissions the user has. - # set_bits: array of hashes. May be empty. - # name => Names of the permissions the user can set for + # name => Names of the permissions the user has. + # desc => Descriptions of the permissions the user has. + # set_bits: array of hashes. May be empty. + # name => Names of the permissions the user can set for # other people. - # desc => Descriptions of the permissions the user can set for + # desc => Descriptions of the permissions the user can set for # other people. #%] - + +[% PROCESS global/variables.none.tmpl %] + - + [%# *** Comment URL Whiteboard Keywords *** %] - [% FOREACH field = [ - { name => "long_desc", description => "A Comment", + [% FOREACH field = [ + { name => "long_desc", description => "A Comment", accesskey => 'c' }, - { name => "bug_file_loc", description => "The URL", + { name => "bug_file_loc", description => "The URL", accesskey => 'u' }, - { name => "status_whiteboard", description => "Whiteboard", + { name => "status_whiteboard", description => "Whiteboard", accesskey => 'w' } ] %] [% UNLESS field.name == 'status_whiteboard' AND NOT Param('usestatuswhiteboard') %] @@ -454,10 +456,10 @@ function selectProduct(f) { - + [% END %] [% END %] @@ -476,7 +478,7 @@ function selectProduct(f) { [% END %] -
[% IF has_bits.size %] - You have the following permission bits set on your account: + You have the following permission [% terms.bits %] set on your account:


@@ -46,16 +48,16 @@ [% END %]
[% ELSE %] - There are no permission bits set on your account. + There are no permission [% terms.bits %] set on your account. [% END %] [% IF user.groups.editusers %]
- You have editusers privileges. You can turn on and off + You have editusers privileges. You can turn on and off all permissions for all users. [% ELSIF set_bits.size %]
- And you can turn on or off the following bits for + And you can turn on or off the following [% terms.bits %] for other users:

diff --git a/webtools/bugzilla/template/en/default/admin/flag-type/confirm-delete.html.tmpl b/webtools/bugzilla/template/en/default/admin/flag-type/confirm-delete.html.tmpl index 46522000b51..6bf1ca43f37 100644 --- a/webtools/bugzilla/template/en/default/admin/flag-type/confirm-delete.html.tmpl +++ b/webtools/bugzilla/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/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl b/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl index 157ad3592a7..a56c3bb65c0 100644 --- a/webtools/bugzilla/template/en/default/admin/flag-type/edit.html.tmpl +++ b/webtools/bugzilla/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/webtools/bugzilla/template/en/default/admin/flag-type/list.html.tmpl b/webtools/bugzilla/template/en/default/admin/flag-type/list.html.tmpl index 43fbf8d560d..0e3306d27f1 100644 --- a/webtools/bugzilla/template/en/default/admin/flag-type/list.html.tmpl +++ b/webtools/bugzilla/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/webtools/bugzilla/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl b/webtools/bugzilla/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl index cf8fcca9cf0..8dfb97230cf 100644 --- a/webtools/bugzilla/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl +++ b/webtools/bugzilla/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/webtools/bugzilla/template/en/default/admin/products/groupcontrol/edit.html.tmpl b/webtools/bugzilla/template/en/default/admin/products/groupcontrol/edit.html.tmpl index 11bb99de540..bc6ce11b494 100644 --- a/webtools/bugzilla/template/en/default/admin/products/groupcontrol/edit.html.tmpl +++ b/webtools/bugzilla/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 @@ - [% PROCESS select sel = { name => 'target_milestone', + [% PROCESS select sel = { name => 'target_milestone', size => 5, accesskey => 't' } %] @@ -437,15 +439,15 @@ function selectProduct(f) {
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 diff --git a/webtools/bugzilla/template/en/default/attachment/create.html.tmpl b/webtools/bugzilla/template/en/default/attachment/create.html.tmpl index 56bad7faece..c2e5378e16c 100644 --- a/webtools/bugzilla/template/en/default/attachment/create.html.tmpl +++ b/webtools/bugzilla/template/en/default/attachment/create.html.tmpl @@ -19,13 +19,15 @@ # Contributor(s): Myk Melez #%] +[% PROCESS global/variables.none.tmpl %] + [%# Define strings that will serve as the title and header of this page %] -[% title = BLOCK %]Create New Attachment for Bug #[% bugid %][% END %] +[% title = BLOCK %]Create New Attachment for [% terms.Bug %] #[% bugid %][% END %] [% h1 = BLOCK %]Create New Attachment for - [%+ GetBugLink(bugid, "Bug $bugid") %][% END %] + [%+ GetBugLink(bugid, "$terms.Bug $bugid") %][% END %] [% h2 = BLOCK %][% bugsummary FILTER html %][% END %] -[% PROCESS global/header.html.tmpl +[% PROCESS global/header.html.tmpl title = title h1 = h1 h2 = h2 @@ -48,7 +50,7 @@ - +
- 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.
@@ -74,15 +76,15 @@ [% END %] @@ -152,12 +154,12 @@ -[% query_variants = [ +[% query_variants = [ { value => "allwordssubstr", description => "contains all of the words/strings" }, { value => "anywordssubstr", description => "contains any of the words/strings" }, { value => "substring", description => "contains the string" }, @@ -342,7 +344,7 @@ function selectProduct(f) { [% FOREACH qv = query_variants %] - [% END %] + [% END %] - + [%# *** Product Component Version Target *** %] @@ -394,7 +396,7 @@ function selectProduct(f) { reserved word - we use 'component_' instead. %] - [% PROCESS select sel = { name => 'version', - size => 5, + [% PROCESS select sel = { name => 'version', + size => 5, accesskey => 'v' } %]
File: If the attachment is a patch, check the box below.
+ onchange="setContentTypeDisabledState();">

Otherwise, choose a method for determining the content type.
+ name="contenttypemethod" value="autodetect">
+ name="contenttypemethod" value="list">
Reassignment: - If you want to assign this bug to yourself, + If you want to assign this [% terms.bug %] to yourself, check the box below.
- - + +
Comment: - (optional) Add a comment about this attachment to the bug.
+ (optional) Add a comment about this attachment to the [% terms.bug %].
@@ -352,7 +354,7 @@ function selectProduct(f) {
@@ -426,7 +428,7 @@ function selectProduct(f) { 		Target:

+
@@ -507,7 +509,7 @@ function selectProduct(f) { Status: - [% PROCESS select sel = { name => 'bug_status', + [% PROCESS select sel = { name => 'bug_status', size => 7, accesskey => 'a' } %] @@ -521,7 +523,7 @@ function selectProduct(f) { - [% PROCESS select sel = { name => 'resolution', + [% PROCESS select sel = { name => 'resolution', size => 7, accesskey => 'r' } %] @@ -533,9 +535,9 @@ function selectProduct(f) { Severity: - [% PROCESS select sel = { name => 'bug_severity', + [% PROCESS select sel = { name => 'bug_severity', size => 7, - accesskey => 'e' } %] + accesskey => 'e' } %] @@ -545,9 +547,9 @@ function selectProduct(f) { Priority: - [% PROCESS select sel = { name => 'priority', - size => 7, - accesskey => 'i' } %] + [% PROCESS select sel = { name => 'priority', + size => 7, + accesskey => 'i' } %] @@ -557,7 +559,7 @@ function selectProduct(f) { Hardware: - [% PROCESS select sel = { name => 'rep_platform', + [% PROCESS select sel = { name => 'rep_platform', size => 7, accesskey => 'h' } %] @@ -569,8 +571,8 @@ function selectProduct(f) { OS: - [% PROCESS select sel = { name => 'op_sys', - size => 7, + [% PROCESS select sel = { name => 'op_sys', + size => 7, accesskey => 'o' } %] @@ -589,7 +591,7 @@ function selectProduct(f) { Email and Numbering - + @@ -607,17 +609,17 @@ function selectProduct(f) { - -