sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-04 04:59:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'checkin-complete-msg' of https://github.com/Yutsuten/habitica into Yutsuten-checkin-complete-msg

Browse source
This commit is contained in:
Matteo Pagliazzi 2017-04-11 17:08:43 +02:00
commit 17068875f4
4 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
website/client-old/js/services/notificationServices.js
View file

@ -147,6 +147,7 @@ angular.module("habitrpg").factory("Notification",
modalScope.data = rewardData; modalScope.data = rewardData;
var nextRewardKey = Shared.content.loginIncentives[user.loginIncentives].nextRewardAt; var nextRewardKey = Shared.content.loginIncentives[user.loginIncentives].nextRewardAt;
modalScope.nextReward = Shared.content.loginIncentives[nextRewardKey]; modalScope.nextReward = Shared.content.loginIncentives[nextRewardKey];
modalScope.MAX_INCENTIVES = Shared.constants.MAX_INCENTIVES;
modalScope.user = user; modalScope.user = user;
// modalScope.loadWidgets = Social.loadWidgets; // modalScope.loadWidgets = Social.loadWidgets;
modalScope.loadWidgets = loadWidgets; modalScope.loadWidgets = loadWidgets;

3
website/common/locales/en/loginIncentives.json
View file

@ -12,5 +12,6 @@
"totalCheckinsTitle": "Total Check-Ins", "totalCheckinsTitle": "Total Check-Ins",
"checkinProgressTitle": "Progress until next", "checkinProgressTitle": "Progress until next",
"incentiveBackgroundsUnlockedWithCheckins": "Locked Plain Backgrounds will unlock with Daily Check-Ins.", "incentiveBackgroundsUnlockedWithCheckins": "Locked Plain Backgrounds will unlock with Daily Check-Ins.",
"moreIncentivesComingSoon": "New check-in incentives will be added soon!" "moreIncentivesComingSoon": "New check-in incentives will be added soon!",
"checkinReceivedAllRewardsMessage" : "You have received all the Check-In prizes currently available! More will be added in the future."
} }

2
website/common/script/content/loginIncentives.js
View file

@ -225,6 +225,8 @@ module.exports = function getLoginIncentives (api) {
}, },
}, },
}; };
// When the final check-in prize is added here, change checkinReceivedAllRewardsMessage in website/common/locales/en/loginIncentives.json
// to say "You have received the final Check-In prize!". Confirm the message with Lemoness first.
// Add reference link to next reward and add filler days so we have a map to reference the next reward from any day // Add reference link to next reward and add filler days so we have a map to reference the next reward from any day
// We could also, use a list, but then we would be cloning each of the rewards. // We could also, use a list, but then we would be cloning each of the rewards.

2
website/views/shared/modals/login-incentives-reward-unlocked.jade
View file

@ -18,6 +18,8 @@ script(id='modals/login-incentives-reward-unlocked.html', type='text/ng-template
p {{env.t('earnedRewardForDevotion', {reward: data.rewardText})}} p {{env.t('earnedRewardForDevotion', {reward: data.rewardText})}}
.col-md-12.text-center(ng-show="data.nextRewardAt") .col-md-12.text-center(ng-show="data.nextRewardAt")
h4 {{env.t('nextRewardUnlocksIn', {numberOfCheckinsLeft: data.nextRewardAt - user.loginIncentives})}} h4 {{env.t('nextRewardUnlocksIn', {numberOfCheckinsLeft: data.nextRewardAt - user.loginIncentives})}}
.col-md-10.col-md-offset-1.text-center
h4(ng-if="user.loginIncentives === MAX_INCENTIVES")=env.t('checkinReceivedAllRewardsMessage')
.modal-footer .modal-footer
.row .row
a.btn.btn-primary.col-md-6.col-md-offset-3(ng-click='$close()')=env.t('awesome') a.btn.btn-primary.col-md-6.col-md-offset-3(ng-click='$close()')=env.t('awesome')