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

Fixed text of check-in prize when it is a set of backgrounds (#8599)

Browse Source 
* Fixed text of check-in prize when it is a set of backgrounds

* Use existing i18n string for BGs name

* Added user.preferences.language as second parameter
This commit is contained in:
Mateus Etto
2017-04-17 01:39:05 -03:00
committed by Alys
parent bd6f901ccf
commit d9f48dcbb0
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
website/common/script/content/loginIncentives.js
View File

@@ -15,6 +15,7 @@ module.exports = function getLoginIncentives (api) {
2: { 2: {
rewardKey: ['background_purple'], rewardKey: ['background_purple'],
reward: [api.backgrounds.incentiveBackgrounds], reward: [api.backgrounds.incentiveBackgrounds],
rewardName: 'incentiveBackgrounds', // i18n string
assignReward: function assignReward (user) { assignReward: function assignReward (user) {
user.purchased.background.blue = true; user.purchased.background.blue = true;
user.purchased.background.green = true; user.purchased.background.green = true;

7
website/server/libs/cron.js
View File

@@ -157,7 +157,7 @@ function awardLoginIncentives (user) {
notificationData.rewardText = i18n.t('potion', {potionType: notificationData.rewardText}, user.preferences.language); notificationData.rewardText = i18n.t('potion', {potionType: notificationData.rewardText}, user.preferences.language);
} }
} else if (loginIncentive.rewardKey[0] === 'background_blue') { } else if (loginIncentive.rewardKey[0] === 'background_blue') {
notificationData.rewardText = i18n.t('incentiveBackgrounds'); notificationData.rewardText = i18n.t('incentiveBackgrounds', user.preferences.language);
} }
if (loginIncentive.reward.length > 0 && count < loginIncentive.reward.length - 1) notificationData.rewardText += ', '; if (loginIncentive.reward.length > 0 && count < loginIncentive.reward.length - 1) notificationData.rewardText += ', ';
@@ -165,6 +165,11 @@ function awardLoginIncentives (user) {
count += 1; count += 1;
} }
// Overwrite notificationData.rewardText if rewardName was explicitly declared
if (loginIncentive.rewardName) {
notificationData.rewardText = i18n.t(loginIncentive.rewardName, user.preferences.language);
}
notificationData.rewardKey = loginIncentive.rewardKey; notificationData.rewardKey = loginIncentive.rewardKey;
notificationData.message = i18n.t('unlockedCheckInReward', user.preferences.language); notificationData.message = i18n.t('unlockedCheckInReward', user.preferences.language);
} }