Bug 363894: Use a better date format in notifications about user account creation...

diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl
index 13162bf345f66147b5650e764d1b39793a442ac3..d3494e62aacf5cf400d215742860cc225c22f446 100644 (file)
--- 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 2035390a073744327fc578fa49ddbf65f9b467e7..b50cbfa1b000eba8c8a174c6e173c6b5771d37a2 100644 (file)
--- 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 0e9ab98e5aca84cdb33468b002d2713207269709..6c7bdd05fe0868788388e9a0674a3ccd5cc43232 100644 (file)
--- 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 7a0e10a15d3e968e178f3a9929458debfae5c97d..3fcdddfd17b2d33db16f86d0bac7eb05e91a82c9 100644 (file)
--- 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) %]).