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

Translate messages only after serialization

Browse Source
This commit is contained in:
Mateus Etto
2019-05-15 21:23:26 +09:00
parent 0824af05b7
commit ab0dae8df3
2 changed files with 62 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
website/server/models/group.js
View File

@@ -333,6 +333,19 @@ schema.statics.getGroups = async function getGroups (options = {}) {
return groupsArray;
};
function _translateSystemMessages (toJSON, user) {
let lang = user.preferences ? user.preferences.language : 'en';
toJSON.chat.map(chat => {
if (!_.isEmpty(chat.info)) {
chat.text = translateMessage(lang, chat.info);
}
return chat;
});
}
schema.statics.translateSystemMessages = _translateSystemMessages;
// When converting to json remove chat messages with more than 1 flag and remove all flags info
// unless the user is an admin or said chat is posted by that user
// Not putting into toJSON because there we can't access user
@@ -344,9 +357,8 @@ schema.statics.toJSONCleanChat = async function groupToJSONCleanChat (group, use
await getGroupChat(group);
}
group.translateSystemMessages(user);
let toJSON = group.toJSON();
_translateSystemMessages(toJSON, user);
if (!user.contributor.admin) {
_.remove(toJSON.chat, chatMsg => {
@@ -452,16 +464,6 @@ schema.statics.validateInvitations = async function getInvitationError (invites,
}
};
schema.methods.translateSystemMessages = function translateSystemMessages (user) {
let lang = user.preferences ? user.preferences.language : 'en';
this.chat.forEach((chat, i, chatArray) => {
if (!_.isEmpty(chat.info)) {
chatArray[i].text = translateMessage(lang, chat.info);
}
});
};
schema.methods.getParticipatingQuestMembers = function getParticipatingQuestMembers () {
return Object.keys(this.quest.members).filter(member => this.quest.members[member]);
};