jeena/woodwind
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

add push_expiry to the feed details

Browse source
This commit is contained in:
Kyle Mahan 2015-02-27 08:31:49 -08:00
parent d7beee9843
commit a9bb8e4835
2 changed files with 37 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
woodwind/templates/feeds.jinja2
View file

@ -51,6 +51,7 @@
<li>PuSH topic: {{feed.push_topic}}</li>
<li>PuSH verified: {{feed.push_verified}}</li>
<li>PuSH last ping: {{feed.last_pinged | relative_time}}</li>
<li>PuSH expiry: {{feed.push_expiry | relative_time}}</li>
</ul>
</div>
</article>

51
woodwind/views.py
View file

@ -376,22 +376,43 @@ def relative_time(dt):
hours = diff.seconds // 60 // 60
minutes = diff.seconds // 60
if years > 1:
pretty = str(years) + ' years ago'
elif diff.days == 1:
pretty = 'A day ago'
elif diff.days > 1:
pretty = str(diff.days) + ' days ago'
elif hours == 1:
pretty = 'An hour ago'
elif hours > 1:
pretty = str(hours) + ' hours ago'
elif minutes == 1:
pretty = 'A minute ago'
elif minutes > 1:
pretty = str(minutes) + ' minutes ago'
if diff == 0:
pretty = 'Right now'
if diff > 0:
if years > 1:
pretty = str(years) + ' years ago'
elif diff.days == 1:
pretty = 'A day ago'
elif diff.days > 1:
pretty = str(diff.days) + ' days ago'
elif hours == 1:
pretty = 'An hour ago'
elif hours > 1:
pretty = str(hours) + ' hours ago'
elif minutes == 1:
pretty = 'A minute ago'
elif minutes > 1:
pretty = str(minutes) + ' minutes ago'
else:
pretty = str(diff.seconds) + ' seconds ago'
else:
pretty = str(diff.seconds) + ' seconds ago'
if years < -1:
pretty = str(-years) + ' years from now'
elif diff.days == -1:
pretty = 'A day from now'
elif diff.days < -1:
pretty = str(-diff.days) + ' days from now'
elif hours == -1:
pretty = 'An hour from now'
elif hours < -1:
pretty = str(-hours) + ' hours from now'
elif minutes == -1:
pretty = 'A minute from now'
elif minutes < -1:
pretty = str(-minutes) + ' minutes from now'
else:
pretty = str(-diff.seconds) + ' seconds from now'
return '<time datetime="{}">{}</time>'.format(dt.isoformat(), pretty)