diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2013-02-04 10:11:47 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2013-02-04 10:11:47 +0000 |
| commit | 744fdc93d5b7364c91b8bd4dcc41a5ed12cf7036 (patch) | |
| tree | c465e46ad85255e28cc8a14869b162edfc443c80 | |
| parent | 1e240b0d33293183cad3254fb0795687ea706829 (diff) | |
Try just using strftime in admin.
| -rw-r--r-- | templates/web/default/admin/report_blocks.html | 3 | ||||
| -rw-r--r-- | templates/web/default/admin/timeline.html | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/templates/web/default/admin/report_blocks.html b/templates/web/default/admin/report_blocks.html index dbfb8160f..13b6c3521 100644 --- a/templates/web/default/admin/report_blocks.html +++ b/templates/web/default/admin/report_blocks.html @@ -17,9 +17,8 @@ [%- END %] [%# note: date format here (i.e., dd.mm.YYYY) currently used by Zurich %] -[%- USE date_format = DateTime::Format('DateTime::Format::Strptime', { pattern => "%d.%m.%Y" }) %] [% BLOCK format_date -%] [%- IF this_date %] - [% date_format.format(this_date) %] + [% this_date.strftime('%d.%m.%y') %] [% ELSE %][% no_time || ' ' %][% END %][% no_time = '' %] [%- END %] diff --git a/templates/web/default/admin/timeline.html b/templates/web/default/admin/timeline.html index db6ff83ef..4058f7f06 100644 --- a/templates/web/default/admin/timeline.html +++ b/templates/web/default/admin/timeline.html @@ -1,6 +1,4 @@ [% INCLUDE 'admin/header.html' title=loc('Timeline') %] -[%- USE f = DateTime::Format('DateTime::Format::Strptime', { pattern => "%A, %e %B %Y" }) %] -[%- USE alert_format = DateTime::Format('DateTime::Format::Strptime', { pattern => "%H:%M:%S %e %B %Y" }) %] [%- BLOCK problem_name %] [%- tprintf(loc('by %s'), problem.name) | html %] <[% problem.user.email | html %]>, '[% problem.title | html %]' @@ -8,7 +6,7 @@ [%- date = '' %] [% FOREACH moment IN time.keys.sort.reverse %] - [%- curdate = f.format(time.$moment.0.date) -%] + [%- curdate = time.$moment.0.date.strftime('%A, %e %B %Y') -%] [%- IF date != curdate %] [% '</dl>' IF date %] <h2>[% curdate %]</h2> @@ -36,7 +34,7 @@ [% CASE 'alertSub' %] [% tprintf(loc("Alert %d created for %s, type %s, parameters %s / %s"), item.obj.id, item.obj.user.email, item.obj.alert_type.ref, item.obj.parameter, item.obj.parameter2) | html %] [% CASE 'alertDel' %] - [% tprintf(loc("Alert %d disabled (created %s)"), item.obj.id, alert_format.format( item.obj.whensubscribed_local ) ) %] + [% tprintf(loc("Alert %d disabled (created %s)"), item.obj.id, item.obj.whensubscribed_local.strftime('%H:%M:%S %e %B %Y') ) %] [%- END %] <br /> [%- END %] |