From 28468d54847481f7bc1d51b4850126e965ee3432 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Fri, 15 Dec 2006 20:30:02 +0000
Subject: Bug 363894: Use a better date format in notifications about user
 account creation and email address change (and include the timezone too) -
 Patch by Frédéric Buclin <LpSolit@gmail.com> r=timeless a=myk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/en/default/account/email/change-new.txt.tmpl   | 4 ++--
 template/en/default/account/email/change-old.txt.tmpl   | 6 +++---
 template/en/default/account/email/confirm-new.html.tmpl | 4 ++--
 template/en/default/account/email/request-new.txt.tmpl  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl
index 13162bf34..d3494e62a 100644
--- a/template/en/default/account/email/change-new.txt.tmpl
+++ b/template/en/default/account/email/change-new.txt.tmpl
@@ -39,5 +39,5 @@ this request, visit the following link:
 
 [%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cxlem
 
-If you do nothing, the request will lapse after [%+ max_token_age %] days 
-(at precisely [%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]).
+If you do nothing, the request will lapse after [%+ max_token_age %] days
+(on [%+ time2str("%B %o, %Y at %H:%M %Z", 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 2035390a0..b50cbfa1b 100644
--- a/template/en/default/account/email/change-old.txt.tmpl
+++ b/template/en/default/account/email/change-old.txt.tmpl
@@ -43,6 +43,6 @@ this request, visit the following link:
 
 [%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cxlem
 
-If you do nothing, and [%+ newemailaddress %] confirms this request, the
-change will be made permanent after [%+ max_token_age %] days (at precisely 
-[%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]).
+If you do nothing, and [%+ newemailaddress %] confirms this request,
+the change will be made permanent after [%+ max_token_age %] days
+(on [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]).
diff --git a/template/en/default/account/email/confirm-new.html.tmpl b/template/en/default/account/email/confirm-new.html.tmpl
index 0e9ab98e5..6c7bdd05f 100644
--- a/template/en/default/account/email/confirm-new.html.tmpl
+++ b/template/en/default/account/email/confirm-new.html.tmpl
@@ -30,8 +30,8 @@
   To complete the creation of your user account, you must choose a password in the
   form below. You can also enter your real name, which is optional.<p>
   If you don't fill this form before
-  <u>[%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]</u>, the creation
-  of this account will be automatically cancelled.
+  <u>[%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]</u>,
+  the creation of this account will be automatically cancelled.
 </div>
 
 <form id="confirm_account_form" method="post" action="token.cgi">
diff --git a/template/en/default/account/email/request-new.txt.tmpl b/template/en/default/account/email/request-new.txt.tmpl
index 7a0e10a15..3fcdddfd1 100644
--- a/template/en/default/account/email/request-new.txt.tmpl
+++ b/template/en/default/account/email/request-new.txt.tmpl
@@ -42,4 +42,4 @@ this request, visit the following link:
 [%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cancel_new_account
 
 If you do nothing, the request will lapse after [%+ constants.MAX_TOKEN_AGE %] days
-(at precisely [%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) %]).
+(on [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]).
-- 
cgit v1.2.3-24-g4f1b