wpi

jaesivsm · Apr 17, 2016 · b7840f9 · b7840f9
1 parent 368cc7f
commit b7840f9
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/web/views/home.py b/src/web/views/home.py
@@ -35,7 +35,7 @@ def home():
 @etag_match
 @jsonify
 def get_menu():
-    now = datetime.utcnow()
+    now = localize(datetime.utcnow())
     categories_order = [0]
     categories = {0: {'name': 'No category', 'id': 0}}
     for cat in CategoryController(current_user.id).read().order_by('name'):
@@ -47,12 +47,14 @@ 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():
+        created_date = localize(feed.created_date)
+        last_retrieved = localize(feed.last_retrieved)
         feed['created_rel'] = gettext("%(timedelta)s ago",
-                timedelta=format_timedelta(now - feed.created_date))
+                timedelta=format_timedelta(now - created_date))
         feed['last_rel'] = gettext("%(timedelta)s ago",
-                timedelta=format_timedelta(now - feed.last_retrieved))
-        feed['created_date'] = format_datetime(localize(feed.created_date))
-        feed['last_retrieved'] = format_datetime(localize(feed.last_retrieved))
+                timedelta=format_timedelta(now - last_retrieved))
+        feed['created_date'] = format_datetime(created_date)
+        feed['last_retrieved'] = format_datetime(last_retrieved)
         feed['category_id'] = feed.category_id or 0
         feed['unread'] = unread.get(feed.id, 0)
         if not feed.filters:
@@ -100,11 +102,12 @@ def _get_filters(in_dict):
 
 @jsonify
 def _articles_to_json(articles):
-    now = datetime.utcnow()
+    now = localize(datetime.utcnow())
     fd_hash = {feed.id: {'title': feed.title,
                          'icon_url': url_for('icon.icon', url=feed.icon_url)
                                      if feed.icon_url else None}
                for feed in FeedController(current_user.id).read()}
+
     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,