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

fix merge issues

Browse Source
This commit is contained in:
negue
2018-09-30 15:37:14 +02:00
parent 92d68e5c6e
commit 60a6f6f2f6
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/common/errors/apiErrorMessages.js
View File

@@ -25,6 +25,4 @@ module.exports = {
missingCustomerId: 'Missing "req.query.customerId"',
missingPaypalBlock: 'Missing "req.session.paypalBlock"',
missingSubKey: 'Missing "req.query.sub"',
messageIdRequired: '\"messageId\" must be a valid UUID.",',
};

2
website/common/locales/en/messages.json
View File

@@ -71,6 +71,6 @@
"beginningOfConversation": "This is the beginning of your conversation with <%= userName %>. Remember to be kind, respectful, and follow the Community Guidelines!",
"messageDeletedUser": "Sorry, this user has deleted their account."
"messageDeletedUser": "Sorry, this user has deleted their account.",
"reportedMessage": "You have reported this message to moderators."
}