krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjsut string to take in interpolation

Browse Source
This commit is contained in:
Blade Barringer
2015-10-19 08:03:27 -05:00
parent 931d688637
commit 1a2510e4da
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/locales/en/settings.json
View File

@@ -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 %>)",

12
website/public/js/controllers/settingsCtrl.js
View File

@@ -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;

2
website/views/options/settings.jade
View File

@@ -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')