aboutsummaryrefslogtreecommitdiffstats
path: root/template/en/default/account
diff options
context:
space:
mode:
Diffstat (limited to 'template/en/default/account')
-rw-r--r--template/en/default/account/auth/ldap-error.html.tmpl6
-rw-r--r--template/en/default/account/auth/login.html.tmpl16
-rw-r--r--template/en/default/account/cancel-token.txt.tmpl15
-rw-r--r--template/en/default/account/create.html.tmpl17
-rw-r--r--template/en/default/account/email/change-new.txt.tmpl9
-rw-r--r--template/en/default/account/email/change-old.txt.tmpl11
-rw-r--r--template/en/default/account/exists.html.tmpl8
-rw-r--r--template/en/default/account/password/forgotten-password.txt.tmpl13
-rw-r--r--template/en/default/account/prefs/email.html.tmpl66
-rw-r--r--template/en/default/account/prefs/footer.html.tmpl36
-rw-r--r--template/en/default/account/prefs/permissions.html.tmpl22
11 files changed, 125 insertions, 94 deletions
diff --git a/template/en/default/account/auth/ldap-error.html.tmpl b/template/en/default/account/auth/ldap-error.html.tmpl
index 7615fb326..cc21ba277 100644
--- a/template/en/default/account/auth/ldap-error.html.tmpl
+++ b/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/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index f342b1791..a2587300e 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/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 %]
</tr>
</table>
-
+
[% PROCESS "global/hidden-fields.html.tmpl"
exclude="^Bugzilla_(login|password|restrictlogin)$" %]
<input type="submit" name="GoAheadAndLogIn" value="Login">
</form>
-[%# 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 %]
<hr>
[% IF Param("createemailregexp") %]
<p>
- If you don't have a Bugzilla account, you can
+ If you don't have a [% terms.Bugzilla %] account, you can
<a href="createaccount.cgi">create a new account</a>.
</p>
[% END %]
@@ -92,7 +94,7 @@
<form method="get" action="token.cgi">
<input type="hidden" name="a" value="reqpw">
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.<br>
<input size="35" name="loginname">
<input type="submit" value="Submit Request">
diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl
index be926d5e2..0554081f2 100644
--- a/template/en/default/account/cancel-token.txt.tmpl
+++ b/template/en/default/account/cancel-token.txt.tmpl
@@ -19,16 +19,19 @@
# Contributor(s): John Vandenberg <zeroj@null.net>
# Tobias Burnus <burnus@net-b.de>
#%]
+
+[% 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/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl
index da8979c91..ec3964e9f 100644
--- a/template/en/default/account/create.html.tmpl
+++ b/template/en/default/account/create.html.tmpl
@@ -19,14 +19,17 @@
# Contributor(s): Gervase Markham <gerv@gerv.net>
#%]
-[% 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 %]
<p>
- 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.
</p>
@@ -41,7 +44,7 @@
[% Param('emailsuffix') FILTER html %]
</td>
</tr>
-
+
<tr>
<td align="right">
<b>Real name:</b>
@@ -55,4 +58,4 @@
<input type="submit" value="Create Account">
</form>
-[% PROCESS global/footer.html.tmpl %]
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl
index b07be609c..5568acc0c 100644
--- a/template/en/default/account/email/change-new.txt.tmpl
+++ b/template/en/default/account/email/change-new.txt.tmpl
@@ -18,12 +18,15 @@
#
# Contributor(s): John Vandenberg <zeroj@null.net>
#%]
+
+[% 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/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl
index cd1334d3f..e5fa87e7f 100644
--- a/template/en/default/account/email/change-old.txt.tmpl
+++ b/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/template/en/default/account/exists.html.tmpl b/template/en/default/account/exists.html.tmpl
index 3516dc7cc..4b3de2209 100644
--- a/template/en/default/account/exists.html.tmpl
+++ b/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"
%]
<form method="get" action="token.cgi">
<input type="hidden" name="a" value="reqpw">
<input type="hidden" name="loginname" value="[% login FILTER html %]">
- A Bugzilla account for <tt>[% login FILTER html %]</tt> already exists. If you
- are the account holder and have forgotten your password,
+ A [% terms.Bugzilla %] account for <tt>[% login FILTER html %]</tt> already exists. If you
+ are the account holder and have forgotten your password,
<input type="submit" value="submit a request to change it">.
</form>
diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl
index bf3242c08..c6b04b35a 100644
--- a/template/en/default/account/password/forgotten-password.txt.tmpl
+++ b/template/en/default/account/password/forgotten-password.txt.tmpl
@@ -18,13 +18,16 @@
#
# Contributor(s): John Vandenberg <zeroj@null.net>
#%]
+
+[% 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 %]
+&nbsp;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/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl
index 8bbb62dfc..fa6295e72 100644
--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/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.
- # <rolename>: 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
+ # <rolename>: 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') %]
-
+
<table>
[% IF Param('supportwatchers') %]
<tr>
@@ -45,8 +47,8 @@
<tr>
<td colspan="4">
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.
</td>
@@ -64,7 +66,7 @@
<td colspan="2">
<p>
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.
</p>
</td>
@@ -138,7 +140,7 @@ document.write('<input type="button" value="Disable All Mail" onclick="SetCheckb
<table width="100%" border="1">
<tr>
<td colspan="[% useqacontact ? '5' : '4' %]" align="center" width="50%">
- <b>When my relationship to this bug is:</b>
+ <b>When my relationship to this [% terms.bug %] is:</b>
</td>
<td rowspan="2" width="50%">
<b>I want to receive mail when:</b>
@@ -165,28 +167,32 @@ document.write('<input type="button" value="Disable All Mail" onclick="SetCheckb
</td>
</tr>
- [% FOREACH reason = [
- { name = 'Removeme',
- description = 'I\'m added to or removed from this capacity' },
- { name = 'Comments',
- description = 'New Comments are added' },
- { name = 'Attachments',
- description = 'New Attachments are added' },
- { name = 'Status',
- description = 'Priority, status, severity, and/or milestone changes' },
- { name = 'Resolved',
- description = 'The bug is resolved or verified' },
- { name = 'Keywords',
- description = 'Keywords field changes' },
- { name = 'CC',
- description = 'CC field changes' },
- { name = 'Other',
- description = 'Any field not mentioned above changes' },
- { name = 'Unconfirmed',
- description = 'The bug is in the unconfirmed state' },
+[% bugLabelLower = BLOCK %]
+[% terms.bug %]
+[% END %]
+
+ [% FOREACH reason = [
+ { name = 'Removeme',
+ description = "I'm added to or removed from this capacity" },
+ { name = 'Comments',
+ description = "New Comments are added" },
+ { name = 'Attachments',
+ description = "New Attachments are added" },
+ { name = 'Status',
+ description = "Priority, status, severity, and/or milestone changes" },
+ { name = 'Resolved',
+ description = "The ${bugLabelLower} is resolved or verified" },
+ { name = 'Keywords',
+ description = "Keywords field changes" },
+ { name = 'CC',
+ description = "CC field changes" },
+ { name = 'Other',
+ description = "Any field not mentioned above changes" },
+ { name = 'Unconfirmed',
+ description = "The ${bugLabelLower} is in the unconfirmed state" },
] %]
<tr>
- [% FOREACH role = [ "Reporter", "Owner", "QAcontact", "CClist", "Voter" ]
+ [% FOREACH role = [ "Reporter", "Owner", "QAcontact", "CClist", "Voter" ]
%]
[% NEXT IF role == "QAcontact" AND NOT useqacontact %]
<td align="center">
@@ -199,6 +205,6 @@ document.write('<input type="button" value="Disable All Mail" onclick="SetCheckb
</td>
</tr>
[% END %]
-</table>
+</table>
<br>
diff --git a/template/en/default/account/prefs/footer.html.tmpl b/template/en/default/account/prefs/footer.html.tmpl
index 77ebd1e3a..87728b16a 100644
--- a/template/en/default/account/prefs/footer.html.tmpl
+++ b/template/en/default/account/prefs/footer.html.tmpl
@@ -20,25 +20,27 @@
#%]
[%# INTERFACE:
- # mybugslink: boolean. True if the user wishes the My Bugs link to appear.
+ # mybugslink: boolean. True if the user wishes the My Bugs link to appear.
# queries: array of hashes. May be empty. Each hash has two members:
# name: string. The name of the query.
# footer: boolean. True if the query appears in the footer.
#%]
-
+
+[% PROCESS global/variables.none.tmpl %]
+
<table>
<tr>
- <th align="right">The 'My bugs' link:</th>
+ <th align="right">The 'My [% terms.bugs %]' link:</th>
<td>
<select name="mybugslink">
- <option value="1">should appear on the footer of every page</option>
- <option value="0"
+ <option value="1">should appear on the footer of every page</option>
+ <option value="0"
[% " selected" IF NOT mybugslink %]>should not be displayed
- </option>
+ </option>
</select>
</td>
- </tr>
-
+ </tr>
+
<input type="hidden" name="numqueries" value="[% queries.size %]">
[% IF queries.size %]
[% FOREACH query = queries %]
@@ -46,31 +48,31 @@
<th align="right">Your query named '[% query.name FILTER html %]':</th>
<td>
<select name="query-[% loop.index %]">
- <option value="0">should only appear in the query page</option>
- <option value="1"
+ <option value="0">should only appear in the query page</option>
+ <option value="1"
[% " selected" IF query.footer %]>
should appear on the footer of every page
- </option>
+ </option>
</select>
</td>
</tr>
- <input type="hidden" name="name-[% loop.index %]"
+ <input type="hidden" name="name-[% loop.index %]"
value="[% query.name FILTER html %]">
[% END %]
[% ELSE %]
<tr>
<td colspan="4">
- <br>
- If you create remembered queries using the
+ <br>
+ If you create remembered queries using the
<a href="query.cgi">query page</a>,
- 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.
<br>
<br>
</td>
</tr>
[% END %]
-
+
</table>
diff --git a/template/en/default/account/prefs/permissions.html.tmpl b/template/en/default/account/prefs/permissions.html.tmpl
index cd516e769..0575bbad4 100644
--- a/template/en/default/account/prefs/permissions.html.tmpl
+++ b/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 %]
+
<table align="center">
<tr>
<td>
[% 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:
<p>
<br>
<table align="center">
@@ -46,16 +48,16 @@
[% END %]
</table>
[% 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 %]
<br>
- 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 %]
<br>
- And you can turn on or off the following bits for
+ And you can turn on or off the following [% terms.bits %] for
<a href="editusers.cgi">other users</a>:
<p>
<table align="center">