From 9ad1dbd8ceb0fce9ab3df70e41f3fba7923f7854 Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Mon, 19 Oct 2015 08:10:37 -0500
Subject: [PATCH] Adjust mystic hourglass string to take in interpolation

---
 common/locales/en/settings.json               | 2 +-
 website/public/js/controllers/settingsCtrl.js | 7 ++++++-
 website/views/options/settings.jade           | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/locales/en/settings.json b/common/locales/en/settings.json
index 0f88414d96..85926e2308 100644
--- a/common/locales/en/settings.json
+++ b/common/locales/en/settings.json
@@ -131,7 +131,7 @@
     "webhookURL": "Webhook URL",
     "add": "Add",
     "buyGemsGoldCap": "Cap raised to <%= amount %>",
-    "mysticHourglass": "Mystic Hourglass",
+    "mysticHourglass": "<%= amount %> Mystic Hourglass",
     "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.",
     "purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)",
     "purchasedPlanExtraMonths": "You have <%= months %> months of subscription credit.",
diff --git a/website/public/js/controllers/settingsCtrl.js b/website/public/js/controllers/settingsCtrl.js
index dbfab8ca99..ed9ac730f1 100644
--- a/website/public/js/controllers/settingsCtrl.js
+++ b/website/public/js/controllers/settingsCtrl.js
@@ -213,7 +213,12 @@ habitrpg.controller('SettingsCtrl',
       var maxDropCap = 50;
 
       return [userTotalDropCap, maxDropCap];
-    }
+    };
+
+    $scope.numberOfMysticHourglasses = function(subscription) {
+      var numberOfHourglasses = Content.subscriptionBlocks[subscription.key].months / 3;
+      return Math.floor(numberOfHourglasses);
+    };
 
     function _calculateNextCron() {
       $scope.dayStart;
diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade
index 2127647b89..ebe96e9ae2 100644
--- a/website/views/options/settings.jade
+++ b/website/views/options/settings.jade
@@ -269,7 +269,7 @@ mixin subPerks()
       td
         span.hint(popover=env.t('mysteryItemText'),popover-trigger='mouseenter',popover-placement='right') #{env.t('mysteryItem')}&nbsp;
         div(ng-show='_subscription.key!="basic_earned"')
-          .badge.badge-success +{{Math.floor(Content.subscriptionBlocks[_subscription.key].months/3)}} #{env.t('mysticHourglass')}
+          .badge.badge-success=env.t('mysticHourglass', {amount: '+{{:: numberOfMysticHourglasses(_subscription)}}'})
           .small.muted=env.t('mysticHourglassText')
     tr
       td