darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-07 18:18:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1216 from alphagov/88mph

Browse Source 
Fix future ‘last edited’ date
This commit is contained in:
Chris Hill-Scott
2017-04-06 16:02:39 +01:00
committed by GitHub
parent e0738ec869 8df01f7f3f
commit 7bbb99c461
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/__init__.py
View File

@@ -279,12 +279,15 @@ def format_date_short(date):
def format_delta(date): def format_delta(date):
delta = (
datetime.now(timezone.utc)
) - (
gmt_timezones(date)
)
if delta < timedelta(seconds=30):
return "just now"
return ago.human( return ago.human(
( delta,
datetime.now(timezone.utc)
) - (
dateutil.parser.parse(date)
),
future_tense='{} from now', # No-one should ever see this future_tense='{} from now', # No-one should ever see this
past_tense='{} ago', past_tense='{} ago',
precision=1 precision=1

2
app/templates/views/templates/template.html
View File

@@ -24,7 +24,7 @@
{% if template._template.updated_at %} {% if template._template.updated_at %}
<div class="bottom-gutter-2"> <div class="bottom-gutter-2">
<h2 class="heading-small">Last edited {{ template._template.updated_at|format_datetime_relative }}</h2> <h2 class="heading-small">Last edited {{ template._template.updated_at|format_delta }}</h2>
<p> <p>
<a href="{{ url_for('.view_template_versions', service_id=current_service.id, template_id=template.id) }}">See previous versions</a> <a href="{{ url_for('.view_template_versions', service_id=current_service.id, template_id=template.id) }}">See previous versions</a>
</p> </p>