handling date formating server side

1 files changed, 13 insertions, 4 deletions

diff --git a/src/web/views/home.py b/src/web/views/home.py
index 5a8312b4..88fb7594 100644
--- a/src/web/views/home.py
+++ b/src/web/views/home.py
@@ -1,10 +1,12 @@
+import pytz
 import logging
-from calendar import timegm
+from datetime import datetime
 
 from flask import current_app, render_template, \
         request, flash, url_for, redirect
 from flask.ext.login import login_required, current_user
 from flask.ext.babel import gettext
+from babel.dates import format_datetime, format_timedelta
 
 import conf
 from web.lib.utils import redirect_url
@@ -16,6 +18,7 @@ from web.views.common import jsonify
 from web.controllers import FeedController, \
                             ArticleController, CategoryController
 
+localize = pytz.utc.localize
 logger = logging.getLogger(__name__)
 
 
@@ -31,6 +34,7 @@ def home():
 @etag_match
 @jsonify
 def get_menu():
+    now = datetime.utcnow()
     categories_order = [0]
     categories = {0: {'name': 'No category', 'id': 0}}
     for cat in CategoryController(current_user.id).read().order_by('name'):
@@ -42,8 +46,10 @@ def get_menu():
         categories[cat_id]['feeds'] = []
     feeds = {feed.id: feed for feed in FeedController(current_user.id).read()}
     for feed_id, feed in feeds.items():
-        feed['created_stamp'] = timegm(feed.created_date.timetuple()) * 1000
-        feed['last_stamp'] = timegm(feed.last_retrieved.timetuple()) * 1000
+        feed['created_rel'] = format_timedelta(now - feed.created_date)
+        feed['last_rel'] = format_timedelta(now - feed.last_retrieved)
+        feed['created_date'] = format_datetime(localize(feed.created_date))
+        feed['last_retrieved'] = format_datetime(localize(feed.last_retrieved))
         feed['category_id'] = feed.category_id or 0
         feed['unread'] = unread.get(feed.id, 0)
         if not feed.filters:
@@ -87,12 +93,14 @@ def _get_filters(in_dict):
 
 @jsonify
 def _articles_to_json(articles, fd_hash=None):
+    now = datetime.utcnow()
     return {'articles': [{'title': art.title, 'liked': art.like,
             'read': art.readed, 'article_id': art.id, 'selected': False,
             'feed_id': art.feed_id, 'category_id': art.category_id or 0,
             'feed_title': fd_hash[art.feed_id]['title'] if fd_hash else None,
             'icon_url': fd_hash[art.feed_id]['icon_url'] if fd_hash else None,
-            'date': art.date, 'timestamp': timegm(art.date.timetuple()) * 1000}
+            'date': format_datetime(localize(art.date)),
+            'rel_date': format_timedelta(now - art.date)}
             for art in articles.limit(1000)]}
 
 
@@ -125,6 +133,7 @@ def get_article(article_id, parse=False):
     feed = FeedController(current_user.id).get(id=article.feed_id)
     article['icon_url'] = url_for('icon.icon', url=feed.icon_url) \
             if feed.icon_url else None
+    article['date'] = format_datetime(localize(article.date))
     return article