summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Bugzilla/Token.pm6
-rw-r--r--docs/xml/using.xml2
-rw-r--r--template/en/default/account/cancel-token.txt.tmpl28
-rw-r--r--template/en/default/account/email/confirm-new.html.tmpl2
-rw-r--r--template/en/default/global/messages.html.tmpl20
-rw-r--r--template/en/default/global/user-error.html.tmpl2
-rw-r--r--template/en/default/request/email.txt.tmpl2
-rwxr-xr-xtoken.cgi10
8 files changed, 36 insertions, 36 deletions
diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index 0c2d42fe7..7db6b9165 100644
--- a/Bugzilla/Token.pm
+++ b/Bugzilla/Token.pm
@@ -216,7 +216,7 @@ sub Cancel {
my $template = Bugzilla->template;
$vars ||= {};
- # Get information about the token being cancelled.
+ # Get information about the token being canceled.
trick_taint($token);
my ($issuedate, $tokentype, $eventdata, $loginname) =
$dbh->selectrow_array('SELECT ' . $dbh->sql_date_format('issuedate') . ',
@@ -489,8 +489,8 @@ Bugzilla::Token - Provides different routines to manage tokens.
to the user to inform him about this action.
Params: $user_id: The user ID of the user account whose password tokens
- are cancelled.
- $reason: The reason why these tokens are cancelled.
+ are canceled.
+ $reason: The reason why these tokens are canceled.
Returns: Nothing.
diff --git a/docs/xml/using.xml b/docs/xml/using.xml
index 93661f615..dbfed056a 100644
--- a/docs/xml/using.xml
+++ b/docs/xml/using.xml
@@ -72,7 +72,7 @@
<para>
By default, you have 3 days to confirm your registration. Past this
timeframe, the token is invalidated and the registration is
- automatically cancelled. You can also cancel this registration sooner
+ automatically canceled. You can also cancel this registration sooner
by using the appropriate URL in the email you got.
</para>
</listitem>
diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl
index 4afada50c..ead400ce8 100644
--- a/template/en/default/account/cancel-token.txt.tmpl
+++ b/template/en/default/account/cancel-token.txt.tmpl
@@ -27,7 +27,7 @@ To: [% emailaddress %]
Subject: [% PROCESS subject %]
X-Bugzilla-Type: admin
-A request was cancelled from [% remoteaddress %].
+A request was canceled from [% remoteaddress %].
If you did not request this, it could be either an honest
mistake or someone attempting to break into your [% terms.Bugzilla %] account.
@@ -44,13 +44,13 @@ Cancelled Because: [% PROCESS cancelactionmessage %]
[% BLOCK subject %]
[% IF tokentype == 'new_account' %]
- User account creation request cancelled
+ User account creation request canceled
[% ELSIF tokentype == 'password' %]
- Password change request cancelled
+ Password change request canceled
[% ELSIF tokentype == 'emailnew' OR tokentype == 'emailold' %]
- Email change request cancelled
+ Email change request canceled
[% ELSE %]
- [% tokentype %] token cancelled
+ [% tokentype %] token canceled
[% END %]
[% END %]
@@ -58,26 +58,26 @@ Cancelled Because: [% PROCESS cancelactionmessage %]
[% IF cancelaction == 'account_exists' %]
Account [% email %] already exists.
- [% ELSIF cancelaction == 'email_change_cancelled' %]
+ [% ELSIF cancelaction == 'email_change_canceled' %]
The request to change the email address for
the [% old_email %] account to [% new_email %] has
- been cancelled.
+ been canceled.
- [% ELSIF cancelaction == 'email_change_cancelled_reinstated' %]
+ [% ELSIF cancelaction == 'email_change_canceled_reinstated' %]
The request to change the email address for your account
- to [% new_email %] has been cancelled. Your old account
+ to [% new_email %] has been canceled. Your old account
settings have been reinstated.
- [% ELSIF cancelaction == 'emailold_change_cancelled' %]
+ [% ELSIF cancelaction == 'emailold_change_canceled' %]
The request to change the email address for your account
- to [% new_email %] has been cancelled.
+ to [% new_email %] has been canceled.
- [% ELSIF cancelaction == 'password_change_cancelled' %]
+ [% ELSIF cancelaction == 'password_change_canceled' %]
You have requested cancellation.
- [% ELSIF cancelaction == 'account_creation_cancelled' %]
+ [% ELSIF cancelaction == 'account_creation_canceled' %]
The creation of the user account [% emailaddress %]
- has been cancelled.
+ has been canceled.
[% ELSIF cancelaction == 'user_logged_in' %]
You have logged in.
diff --git a/template/en/default/account/email/confirm-new.html.tmpl b/template/en/default/account/email/confirm-new.html.tmpl
index 6c7bdd05f..45c12b8f5 100644
--- a/template/en/default/account/email/confirm-new.html.tmpl
+++ b/template/en/default/account/email/confirm-new.html.tmpl
@@ -31,7 +31,7 @@
form below. You can also enter your real name, which is optional.<p>
If you don't fill this form before
<u>[%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]</u>,
- the creation of this account will be automatically cancelled.
+ the creation of this account will be automatically canceled.
</div>
<form id="confirm_account_form" method="post" action="token.cgi">
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 560ef2b33..a8eddac7a 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -43,10 +43,10 @@
this [% terms.Bugzilla %] installation.
[% END %]
- [% ELSIF message_tag == "account_creation_cancelled" %]
+ [% ELSIF message_tag == "account_creation_canceled" %]
[% title = "User Account Creation Cancelled" %]
The creation of the user account [% account FILTER html %] has been
- cancelled.
+ canceled.
[% ELSIF message_tag == "account_updated" %]
[% IF changed_fields.size
@@ -186,22 +186,22 @@
Properties of the '[% field.name FILTER html %]' field have been
successfully updated.
- [% ELSIF message_tag == "emailold_change_cancelled" %]
+ [% ELSIF message_tag == "emailold_change_canceled" %]
[% title = "Cancel Request to Change Email Address" %]
The request to change the email address for your account to
- [%+ new_email FILTER html %] has been cancelled.
+ [%+ new_email FILTER html %] has been canceled.
- [% ELSIF message_tag == "email_change_cancelled" %]
+ [% ELSIF message_tag == "email_change_canceled" %]
[% title = "Cancel Request to Change Email Address" %]
The request to change the email address for the
account [%+ old_email FILTER html %] to
- [%+ new_email FILTER html %] has been cancelled.
+ [%+ new_email FILTER html %] has been canceled.
- [% ELSIF message_tag == "email_change_cancelled_reinstated" %]
+ [% ELSIF message_tag == "email_change_canceled_reinstated" %]
[% title = "Cancel Request to Change Email Address" %]
The request to change the email address for the
account [%+ old_email FILTER html %] to
- [%+ new_email FILTER html %] has been cancelled.
+ [%+ new_email FILTER html %] has been canceled.
Your old account settings have been reinstated.
[% ELSIF message_tag == "flag_creation_failed" %]
@@ -303,9 +303,9 @@
clear the <em>shutdownhtml</em> field.
[% END%]
- [% ELSIF message_tag == "password_change_cancelled" %]
+ [% ELSIF message_tag == "password_change_canceled" %]
[% title = "Cancel Request to Change Password" %]
- Your request has been cancelled.
+ Your request has been canceled.
[% ELSIF message_tag == "password_change_request" %]
[% title = "Request to Change Password" %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 01368f06d..7452ab8d1 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1384,7 +1384,7 @@
[% ELSIF error == "token_inexistent" %]
[% title = "Token Does Not Exist" %]
The token you submitted does not exist, has expired, or has
- been cancelled.
+ been canceled.
[% ELSIF error == "too_soon_for_new_token" %]
[% title = "Too Soon For New Token" %]
diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl
index 76267e3a0..a5fd17b88 100644
--- a/template/en/default/request/email.txt.tmpl
+++ b/template/en/default/request/email.txt.tmpl
@@ -25,7 +25,7 @@
[% bugidsummary = bug.bug_id _ ': ' _ bug.short_desc %]
[% attidsummary = attachment.id _ ': ' _ attachment.description %]
-[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "cancelled" ,
+[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "canceled" ,
'?' => "asked" } %]
[% IF flag.status == '?' %]
[% to_identity = flag.addressee.identity _ " for" %]
diff --git a/token.cgi b/token.cgi
index e45f49fba..66ce2c052 100755
--- a/token.cgi
+++ b/token.cgi
@@ -194,7 +194,7 @@ sub confirmChangePassword {
}
sub cancelChangePassword {
- $vars->{'message'} = "password_change_cancelled";
+ $vars->{'message'} = "password_change_canceled";
Bugzilla::Token::Cancel($::token, $vars->{'message'});
print $cgi->header();
@@ -300,7 +300,7 @@ sub cancelChangeEmail {
my ($old_email, $new_email) = split(/:/,$eventdata);
if($tokentype eq "emailold") {
- $vars->{'message'} = "emailold_change_cancelled";
+ $vars->{'message'} = "emailold_change_canceled";
my $actualemail = $dbh->selectrow_array(
q{SELECT login_name FROM profiles
@@ -324,11 +324,11 @@ sub cancelChangeEmail {
my $user = new Bugzilla::User($userid);
$user->derive_regexp_groups;
- $vars->{'message'} = "email_change_cancelled_reinstated";
+ $vars->{'message'} = "email_change_canceled_reinstated";
}
}
else {
- $vars->{'message'} = 'email_change_cancelled'
+ $vars->{'message'} = 'email_change_canceled'
}
$vars->{'old_email'} = $old_email;
@@ -394,7 +394,7 @@ sub confirm_create_account {
sub cancel_create_account {
my (undef, undef, $login_name) = Bugzilla::Token::GetTokenData($::token);
- $vars->{'message'} = 'account_creation_cancelled';
+ $vars->{'message'} = 'account_creation_canceled';
$vars->{'account'} = $login_name;
Bugzilla::Token::Cancel($::token, $vars->{'message'});
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-24 19:13:32 +0100