darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-16 20:49:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1291 from alphagov/two-way

Browse Source 
Add page to show two-way conversation
This commit is contained in:
Chris Hill-Scott
2017-06-14 16:42:46 +01:00
committed by GitHub
parent a2e3dbaca5 fd3f6f920f
commit c60917d0e4
12 changed files with 359 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/__init__.py
View File

@@ -257,13 +257,20 @@ def format_datetime_relative(date):
def get_human_day(time):
# Add 1 hour to get ‘midnight today’ instead of ‘midnight tomorrow’
time = (gmt_timezones(time) - timedelta(hours=1)).strftime('%A')
if time == datetime.utcnow().strftime('%A'):
return 'today'
if time == (datetime.utcnow() + timedelta(days=1)).strftime('%A'):
time_as_day = (gmt_timezones(time) - timedelta(hours=1)).strftime('%A')
six_days_ago = gmt_timezones((datetime.utcnow() + timedelta(days=-6)).isoformat())
if gmt_timezones(time) < six_days_ago:
return format_date_short(time)
if time_as_day == (datetime.utcnow() + timedelta(days=1)).strftime('%A'):
return 'tomorrow'
return time
if time_as_day == datetime.utcnow().strftime('%A'):
return 'today'
if time_as_day == (datetime.utcnow() + timedelta(days=-1)).strftime('%A'):
return 'yesterday'
return format_date_short(time)
def format_time(date):