sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-20 20:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding ticks back into gifted gems receive message #7540 (#7671)

Browse source 
* Adding ticks back into gifted gems receive message #7540

* Removing raw string concatenation and fixing tests
This commit is contained in:
Travis 2016-06-15 20:29:04 -07:00 committed by Blade Barringer
parent 3d7d41c517
commit 1de2c839c8
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/locales/en/groups.json
View file

@ -105,7 +105,7 @@
"gemAmountRequired": "A number of gems is required",
"notAuthorizedToSendMessageToThisUser": "Can't send message to this user.",
"privateMessageGiftIntro": "Hello <%= receiverName %>, <%= senderName %> has sent you ",
"privateMessageGiftGemsMessage": "<%= gemAmount %> gems! ",
"privateMessageGiftGemsMessage": "<%= gemAmount %> gems!",
"privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> months of subscription! ",
"cannotSendGemsToYourself": "Cannot send gems to yourself. Try a subscription instead.",
"badAmountOfGemsToSend": "Amount must be within 1 and your current number of gems.",

2
test/api/v3/integration/members/POST-transfer_gems.test.js
View file

@ -129,6 +129,7 @@ describe('POST /members/transfer-gems', () => {
senderName: userToSendMessage.profile.name,
});
messageSentContent += t('privateMessageGiftGemsMessage', {gemAmount});
messageSentContent = `\`${messageSentContent}\` `;
messageSentContent += message;
expect(sendersMessageInReceiversInbox).to.exist;
@ -162,6 +163,7 @@ describe('POST /members/transfer-gems', () => {
senderName: userToSendMessage.profile.name,
});
messageSentContent += t('privateMessageGiftGemsMessage', {gemAmount});
messageSentContent = `\`${messageSentContent}\` `;
expect(sendersMessageInReceiversInbox).to.exist;
expect(sendersMessageInReceiversInbox.text).to.equal(messageSentContent);

1
website/server/controllers/api-v3/members.js
View file

@ -356,6 +356,7 @@ api.transferGems = {
senderName: sender.profile.name,
});
message += res.t('privateMessageGiftGemsMessage', {gemAmount});
message = `\`${message}\` `;
if (req.body.message) {
message += req.body.message;