From 0360326f41485c8a9514b586dc4d9e4ef30d587c Mon Sep 17 00:00:00 2001
From: Mateus Etto <mateus.etto@gmail.com>
Date: Wed, 15 May 2019 15:46:32 +0900
Subject: [PATCH] Change translateSystemMessages to be a class method

---
 website/server/models/group.js | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/website/server/models/group.js b/website/server/models/group.js
index 2dfe866828..038567d321 100644
--- a/website/server/models/group.js
+++ b/website/server/models/group.js
@@ -408,20 +408,6 @@ function _translateMessage (lang, info) {
   return msg;
 }
 
-function _translateSystemMessages (group, user) {
-  let lang = user.preferences.language;
-
-  group.chat.forEach((chat, i, chatArray) => {
-    if (!_.isEmpty(chat.info)) {
-      chatArray[i].text = _translateMessage(lang, chat.info);
-    }
-  });
-
-  return group;
-}
-
-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
@@ -433,7 +419,7 @@ schema.statics.toJSONCleanChat = async function groupToJSONCleanChat (group, use
     await getGroupChat(group);
   }
 
-  group = _translateSystemMessages(group, user);
+  group.translateSystemMessages(group, user);
 
   let toJSON = group.toJSON();
 
@@ -541,6 +527,16 @@ 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]);
 };