From 28468d54847481f7bc1d51b4850126e965ee3432 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Fri, 15 Dec 2006 20:30:02 +0000
Subject: =?UTF-8?q?Bug=20363894:=20Use=20a=20better=20date=20format=20in?=
=?UTF-8?q?=20notifications=20about=20user=20account=20creation=20and=20em?=
=?UTF-8?q?ail=20address=20change=20(and=20include=20the=20timezone=20too)?=
=?UTF-8?q?=20-=20Patch=20by=20Fr=C3=83=C2=A9d=C3=83=C2=A9ric=20Buclin=20=20r=3Dtimeless=20a=3Dmyk?=
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(-)
(limited to 'template/en/default/account')
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.
If you don't fill this form before
- [%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) %], the creation
- of this account will be automatically cancelled.
+ [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %],
+ the creation of this account will be automatically cancelled.