last test

jaesivsm · Apr 17, 2016 · f555904 · f555904
1 parent a1a33d1
commit f555904
Showing 1 changed file with 8 additions and 8 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, locale = localize(datetime.utcnow()), get_locale()
+    now, locale = datetime.now(), get_locale()
     categories_order = [0]
     categories = {0: {'name': 'No category', 'id': 0}}
     for cat in CategoryController(current_user.id).read().order_by('name'):
@@ -47,14 +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'] = format_timedelta(created_date - now,
+        feed['created_rel'] = format_timedelta(feed.created_date - now,
+                add_direction=True, locale=locale)
+        feed['last_rel'] = format_timedelta(feed.last_retrieved - now,
                 add_direction=True, locale=locale)
-        feed['last_rel'] = format_timedelta(last_retrieved - now,
-                locale=locale, add_direction=True)
-        feed['created_date'] = format_datetime(created_date, locale=locale)
-        feed['last_retrieved'] = format_datetime(last_retrieved, locale=locale)
+        feed['created_date'] = format_datetime(localize(feed.created_date),
+                                               locale=locale)
+        feed['last_retrieved'] = format_datetime(localize(feed.last_retrieved),
+                                                 locale=locale)
         feed['category_id'] = feed.category_id or 0
         feed['unread'] = unread.get(feed.id, 0)
         if not feed.filters: