diff --git a/test/api/v3/integration/members/POST-transfer_gems.test.js b/test/api/v3/integration/members/POST-transfer_gems.test.js index 465bcad0b3..6862df5b95 100644 --- a/test/api/v3/integration/members/POST-transfer_gems.test.js +++ b/test/api/v3/integration/members/POST-transfer_gems.test.js @@ -127,11 +127,11 @@ describe('POST /members/transfer-gems', () => { let sendersMessageInReceiversInbox = findMessage(updatedReceiver.inbox.messages, userToSendMessage._id); let sendersMessageInSendersInbox = findMessage(updatedSender.inbox.messages, receiver._id); - let messageSentContent = t('privateMessageGiftIntro', { + let messageSentContent = t('privateMessageGiftGemsMessage', { receiverName: receiver.profile.name, senderName: userToSendMessage.profile.name, + gemAmount, }); - messageSentContent += t('privateMessageGiftGemsMessage', {gemAmount}); messageSentContent = `\`${messageSentContent}\` `; messageSentContent += message; @@ -156,11 +156,11 @@ describe('POST /members/transfer-gems', () => { let sendersMessageInReceiversInbox = findMessage(updatedReceiver.inbox.messages, userToSendMessage._id); let sendersMessageInSendersInbox = findMessage(updatedSender.inbox.messages, receiver._id); - let messageSentContent = t('privateMessageGiftIntro', { + let messageSentContent = t('privateMessageGiftGemsMessage', { receiverName: receiver.profile.name, senderName: userToSendMessage.profile.name, + gemAmount, }); - messageSentContent += t('privateMessageGiftGemsMessage', {gemAmount}); messageSentContent = `\`${messageSentContent}\` `; expect(sendersMessageInReceiversInbox).to.exist; @@ -191,11 +191,11 @@ describe('POST /members/transfer-gems', () => { let sendersMessageInSendersInbox = findMessage(updatedSender.inbox.messages, receiver._id); let [receieversMessageContent, sendersMessageContent] = ['es', 'cs'].map((lang) => { - let messageContent = t('privateMessageGiftIntro', { + let messageContent = t('privateMessageGiftGemsMessage', { receiverName: receiver.profile.name, senderName: userToSendMessage.profile.name, + gemAmount, }, lang); - messageContent += t('privateMessageGiftGemsMessage', {gemAmount}, lang); return `\`${messageContent}\` `; }); diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index f0c27c1cc5..962722a8e9 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -113,9 +113,7 @@ "toUserIDRequired": "A User ID is required", "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!", - "privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> months of subscription! ", + "privateMessageGiftGemsMessage": "Hello <%= receiverName %>, <%= senderName %> has sent you <%= gemAmount %> gems!", "cannotSendGemsToYourself": "Cannot send gems to yourself. Try a subscription instead.", "badAmountOfGemsToSend": "Amount must be within 1 and your current number of gems.", "abuseFlag": "Report violation of Community Guidelines", diff --git a/website/server/controllers/api-v3/members.js b/website/server/controllers/api-v3/members.js index 3cb628355b..df92bf671e 100644 --- a/website/server/controllers/api-v3/members.js +++ b/website/server/controllers/api-v3/members.js @@ -496,11 +496,11 @@ api.transferGems = { let receiverLang = receiver.preferences.language; let senderLang = sender.preferences.language; let [receiverMsg, senderMsg] = [receiverLang, senderLang].map((lang) => { - let messageContent = res.t('privateMessageGiftIntro', { + let messageContent = res.t('privateMessageGiftGemsMessage', { receiverName: receiver.profile.name, senderName: sender.profile.name, + gemAmount, }, lang); - messageContent += res.t('privateMessageGiftGemsMessage', {gemAmount}, lang); messageContent = `\`${messageContent}\` `; if (req.body.message) {