Merge branch 'develop' into release

website/server/controllers/api-v3/chat.js

@@ -11,8 +11,8 @@ import {
 import { removeFromArray } from '../../libs/collectionManipulators';
 import { getUserInfo, getGroupUrl, sendTxn } from '../../libs/email';
 import slack from '../../libs/slack';
-import { getAuthorEmailFromMessage } from '../../libs/chat';
 import { chatReporterFactory } from '../../libs/chatReporting/chatReporterFactory';
+import { getAuthorEmailFromMessage} from '../../libs/chat';
 import nconf from 'nconf';
 import bannedWords from '../../libs/bannedWords';
 import guildsAllowingBannedWords from '../../libs/guildsAllowingBannedWords';
@@ -223,7 +223,7 @@ api.postChat = {
       });
     }
 
-    const newChatMessage = group.sendChat({message: req.body.message, user, flagCount, metaData: null, client});
+    const newChatMessage = group.sendChat({message: req.body.message, user, flagCount, metaData: null, client, translate: res.t});
     let toSave = [newChatMessage.save()];
 
     if (group.type === 'party') {

website/server/controllers/api-v3/quests.js

@@ -124,8 +124,8 @@ api.inviteToQuest = {
         sendPushNotification(
           member,
           {
-            title: res.t('questInvitationTitle', member.preferences.language),
-            message: res.t('questInvitationInfo', {quest: quest.text(member.preferences.language)}, member.preferences.language),
+            title: quest.text(member.preferences.language),
+            message: res.t('questInvitationNotificationInfo', member.preferences.language),
             identifier: 'questInvitation',
             category: 'questInvitation',
           }