From 1a2510e4daf73dcee3595edc7762f80d246197e1 Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Mon, 19 Oct 2015 08:03:27 -0500
Subject: [PATCH] Adjsut string to take in interpolation

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

diff --git a/common/locales/en/settings.json b/common/locales/en/settings.json
index 368ebe2c2e..0f88414d96 100644
--- a/common/locales/en/settings.json
+++ b/common/locales/en/settings.json
@@ -130,7 +130,7 @@
     "enabled": "Enabled",
     "webhookURL": "Webhook URL",
     "add": "Add",
-    "buyGemsGoldCap": "Cap raised to",
+    "buyGemsGoldCap": "Cap raised to <%= amount %>",
     "mysticHourglass": "Mystic Hourglass",
     "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.",
     "purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)",
diff --git a/website/public/js/controllers/settingsCtrl.js b/website/public/js/controllers/settingsCtrl.js
index 499b88c707..3459004aeb 100644
--- a/website/public/js/controllers/settingsCtrl.js
+++ b/website/public/js/controllers/settingsCtrl.js
@@ -202,6 +202,18 @@ habitrpg.controller('SettingsCtrl',
       });
     }
 
+    $scope.gemGoldCap = function(subscription) {
+      var baseCap = 25;
+      var gemCapExtra = User.user.purchased.plan.consecutive.gemCapExtra;
+      var blocks = Content.subscriptionBlocks[subscription.key].months / 3 * 5;
+      var flooredBlocks = Math.floor(blocks);
+
+      var userTotalDropCap = baseCap + gemCapExtra + flooredBlocks;
+      var maxDropCap = 50;
+
+      return [userTotalDropCap, maxDropCap];
+    }
+
     function _calculateNextCron() {
       $scope.dayStart;
 
diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade
index 31a88db8fe..2127647b89 100644
--- a/website/views/options/settings.jade
+++ b/website/views/options/settings.jade
@@ -258,7 +258,7 @@ mixin subPerks()
     tr
       td
         span.hint(popover=env.t('buyGemsGoldText', {gemCost: "{{Shared.planGemLimits.convRate}}", gemLimit: "{{Shared.planGemLimits.convCap}}"}),popover-trigger='mouseenter',popover-placement='right') #{env.t('buyGemsGold')}&nbsp;
-        span.badge.badge-success(ng-show='_subscription.key!="basic_earned"') #{env.t('buyGemsGoldCap')} {{ [25 + user.purchased.plan.consecutive.gemCapExtra + Math.floor(Content.subscriptionBlocks[_subscription.key].months/3*5), 50]  | min }}
+        span.badge.badge-success(ng-show='_subscription.key!="basic_earned"')=env.t('buyGemsGoldCap', {amount: '{{:: gemGoldCap(_subscription)  | min }}'})
     tr
       td
         span.hint(popover=env.t('retainHistoryText'),popover-trigger='mouseenter',popover-placement='right')=env.t('retainHistory')