diff --git a/r2/r2/lib/pages/trafficpages.py b/r2/r2/lib/pages/trafficpages.py index 526ad2541..e4f9bb508 100644 --- a/r2/r2/lib/pages/trafficpages.py +++ b/r2/r2/lib/pages/trafficpages.py @@ -23,11 +23,13 @@ import collections import datetime +import pytz import urllib from pylons.i18n import _ from pylons import g, c, request import babel.core +from babel.dates import format_datetime from r2.lib import promote from r2.lib.menus import menu @@ -526,7 +528,15 @@ class PromotedLinkTraffic(RedditTraffic): self.total_impressions += imps self.total_clicks += clicks - computed_history.append((date, data + (u_ctr, ctr))) + + date = date.replace(tzinfo=pytz.utc) + datestr = format_datetime( + date, + tzinfo=pytz.timezone("US/Eastern"), + locale=c.locale, + format="yyyy-MM-dd HH:mm zzz", + ) + computed_history.append((date, datestr, data + (u_ctr, ctr))) self.history = computed_history diff --git a/r2/r2/templates/promolinktrafficsummary.html b/r2/r2/templates/promolinktrafficsummary.html index 55f9bdc50..c1f3a0a0b 100644 --- a/r2/r2/templates/promolinktrafficsummary.html +++ b/r2/r2/templates/promolinktrafficsummary.html @@ -84,9 +84,9 @@
- % for date, data in thing.history: + % for date, datestr, data in thing.history: