diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 15fa20809..a1e60e112 100644 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -4271,14 +4271,22 @@ class InterestBar(Templated): class Goldvertisement(Templated): def __init__(self): - today = datetime.datetime.now(g.display_tz).date() + now = datetime.datetime.now(g.display_tz) + today = now.date() + tomorrow = today + datetime.timedelta(days=1) + end_time = datetime.datetime(tomorrow.year, + tomorrow.month, + tomorrow.day, + tzinfo=g.display_tz) revenue_today = gold_revenue_on(today) yesterday = today - datetime.timedelta(days=1) revenue_yesterday = gold_revenue_on(yesterday) revenue_goal = g.live_config["gold_revenue_goal"] + self.percent_filled = int((revenue_today / revenue_goal) * 100) self.percent_filled_yesterday = int((revenue_yesterday / revenue_goal) * 100) self.hours_paid = ServerSecondsBar.current_value_of_month() + self.time_left_today = timeuntil(end_time, precision=60) Templated.__init__(self) class LinkCommentsSettings(Templated): diff --git a/r2/r2/templates/goldvertisement.html b/r2/r2/templates/goldvertisement.html index 2ea0cfedb..cf6ae148d 100644 --- a/r2/r2/templates/goldvertisement.html +++ b/r2/r2/templates/goldvertisement.html @@ -53,7 +53,8 @@
This daily goal updates every 10 minutes and is reset at midnight MST.
+ href="http://en.wikipedia.org/wiki/Mountain_Standard_Time">MST + (${thing.time_left_today} from now).${_("Yesterday's reddit gold goal")}