I missed two from my patch in bug 366466. s/Cancelled/Canceled/ [p=reed r=mkanat...

diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl
index ead400ce880b38673743e509f13141863ac52f24..c4f6951a894d7c72d9e823bacfa1bb21d0eb99c5 100644 (file)
--- a/template/en/default/account/cancel-token.txt.tmpl
+++ b/template/en/default/account/cancel-token.txt.tmpl
@@ -40,7 +40,7 @@ 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' %]

diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index a8eddac7a09bff8e2a4813ba5b854911fda527ef..2b14b3876b559717824a7fdd00fe92c8f1fb53eb 100644 (file)
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -44,7 +44,7 @@
     [% END %]
 
   [% ELSIF message_tag == "account_creation_canceled" %]
-    [% title = "User Account Creation Cancelled" %]
+    [% title = "User Account Creation Canceled" %]
     The creation of the user account [% account FILTER html %] has been
     canceled.