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

Adjust mystic hourglass string to take in interpolation

Browse Source
This commit is contained in:
Blade Barringer
2015-10-19 08:10:37 -05:00
parent d9de32f2dc
commit 9ad1dbd8ce
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,7 +131,7 @@
"webhookURL": "Webhook URL", "webhookURL": "Webhook URL",
"add": "Add", "add": "Add",
"buyGemsGoldCap": "Cap raised to <%= amount %>", "buyGemsGoldCap": "Cap raised to <%= amount %>",
"mysticHourglass": "Mystic Hourglass", "mysticHourglass": "<%= amount %> Mystic Hourglass",
"mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.", "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.",
"purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)", "purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)",
"purchasedPlanExtraMonths": "You have <%= months %> months of subscription credit.", "purchasedPlanExtraMonths": "You have <%= months %> months of subscription credit.",

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

@@ -213,7 +213,12 @@ habitrpg.controller('SettingsCtrl',
var maxDropCap = 50; var maxDropCap = 50;
return [userTotalDropCap, maxDropCap]; return [userTotalDropCap, maxDropCap];
} };
$scope.numberOfMysticHourglasses = function(subscription) {
var numberOfHourglasses = Content.subscriptionBlocks[subscription.key].months / 3;
return Math.floor(numberOfHourglasses);
};
function _calculateNextCron() { function _calculateNextCron() {
$scope.dayStart; $scope.dayStart;

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

@@ -269,7 +269,7 @@ mixin subPerks()
td td
span.hint(popover=env.t('mysteryItemText'),popover-trigger='mouseenter',popover-placement='right') #{env.t('mysteryItem')}&nbsp; span.hint(popover=env.t('mysteryItemText'),popover-trigger='mouseenter',popover-placement='right') #{env.t('mysteryItem')}&nbsp;
div(ng-show='_subscription.key!="basic_earned"') 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') .small.muted=env.t('mysticHourglassText')
tr tr
td td