From: reed%reedloden.com <> Date: Mon, 26 Mar 2007 13:00:21 +0000 (+0000) Subject: Bug 366466 - "flag notification mail has canceled spelled incorrectly" [p=reed r... X-Git-Tag: bugzilla-3.0~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46b069dd21d62846504d25264d6f212aa32b3f01;p=thirdparty%2Fbugzilla.git Bug 366466 - "flag notification mail has canceled spelled incorrectly" [p=reed r=timeless a30=LpSolit] --- diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm index 0c2d42fe71..7db6b91651 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 93661f6155..dbfed056a8 100644 --- a/docs/xml/using.xml +++ b/docs/xml/using.xml @@ -72,7 +72,7 @@ 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. diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl index 4afada50c3..db54663a82 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. @@ -40,17 +40,17 @@ to [% maintainer %] if you suspect foul play. User: [% emailaddress %] Issue Date: [% issuedate %] Event Data: [% eventdata %] -Cancelled Because: [% PROCESS cancelactionmessage %] +Canceled 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 %] @@ -61,23 +61,23 @@ Cancelled Because: [% PROCESS cancelactionmessage %] [% ELSIF cancelaction == 'email_change_cancelled' %] 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' %] 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' %] 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' %] You have requested cancellation. [% ELSIF cancelaction == 'account_creation_cancelled' %] 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 6c7bdd05fe..45c12b8f55 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.

If you don't fill this form before [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %], - the creation of this account will be automatically cancelled. + the creation of this account will be automatically canceled.

diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index b0d92b3d11..5027585f68 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -44,9 +44,9 @@ [% END %] [% ELSIF message_tag == "account_creation_cancelled" %] - [% title = "User Account Creation Cancelled" %] + [% title = "User Account Creation Canceled" %] The creation of the user account [% account FILTER html %] has been - cancelled. + canceled. [% ELSIF message_tag == "account_updated" %] [% IF changed_fields.size @@ -189,19 +189,19 @@ [% ELSIF message_tag == "emailold_change_cancelled" %] [% 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" %] [% 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" %] [% 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" %] @@ -242,7 +242,7 @@ [% ELSIF message_tag == "password_change_cancelled" %] [% 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 01368f06dc..7452ab8d1a 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 76267e3a0e..a5fd17b883 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" %]