From c8466eec986c6683c536b7422f03d7fb07d8fd53 Mon Sep 17 00:00:00 2001
From: Scens <rafalbrzez@gmail.com>
Date: Thu, 15 Aug 2019 17:10:24 +0200
Subject: [PATCH] =?UTF-8?q?Only=20includes=20backticks=20if=20they=20haven?=
 =?UTF-8?q?'t=20been=20already=20included.=20Fixes=20=E2=80=A6=20(#11250)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Only includes backticks if they haven't been already included. Fixes the problem.

* Small adjustments
---
 website/server/libs/chat/group-chat.js | 35 ++++++++++++++------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/website/server/libs/chat/group-chat.js b/website/server/libs/chat/group-chat.js
index 92123b6cf2..d79b9b74c8 100644
--- a/website/server/libs/chat/group-chat.js
+++ b/website/server/libs/chat/group-chat.js
@@ -35,23 +35,23 @@ export function translateMessage (lang, info) {
 
   switch (info.type) {
     case 'quest_start':
-      msg = `\`${shared.i18n.t('chatQuestStarted', {questName: questScrolls[info.quest].text(lang)}, lang)}\``;
+      msg = shared.i18n.t('chatQuestStarted', {questName: questScrolls[info.quest].text(lang)}, lang);
       break;
 
     case 'boss_damage':
-      msg = `\`${shared.i18n.t('chatBossDamage', {username: info.user, bossName: questScrolls[info.quest].boss.name(lang), userDamage: info.userDamage, bossDamage: info.bossDamage}, lang)}\``;
+      msg = shared.i18n.t('chatBossDamage', {username: info.user, bossName: questScrolls[info.quest].boss.name(lang), userDamage: info.userDamage, bossDamage: info.bossDamage}, lang);
       break;
 
     case 'boss_dont_attack':
-      msg = `\`${shared.i18n.t('chatBossDontAttack', {username: info.user, bossName: questScrolls[info.quest].boss.name(lang), userDamage: info.userDamage}, lang)}\``;
+      msg = shared.i18n.t('chatBossDontAttack', {username: info.user, bossName: questScrolls[info.quest].boss.name(lang), userDamage: info.userDamage}, lang);
       break;
 
     case 'boss_rage':
-      msg = `\`${questScrolls[info.quest].boss.rage.effect(lang)}\``;
+      msg = questScrolls[info.quest].boss.rage.effect(lang);
       break;
 
     case 'boss_defeated':
-      msg = `\`${shared.i18n.t('chatBossDefeated', {bossName: questScrolls[info.quest].boss.name(lang)}, lang)}\``;
+      msg = shared.i18n.t('chatBossDefeated', {bossName: questScrolls[info.quest].boss.name(lang)}, lang);
       break;
 
     case 'user_found_items':
@@ -59,49 +59,52 @@ export function translateMessage (lang, info) {
         m.push(`${v} ${questScrolls[info.quest].collect[k].text(lang)}`);
         return m;
       }, []).join(', ');
-      msg = `\`${shared.i18n.t('chatFindItems', {username: info.user, items: foundText}, lang)}\``;
+      msg = shared.i18n.t('chatFindItems', {username: info.user, items: foundText}, lang);
       break;
 
     case 'all_items_found':
-      msg = `\`${shared.i18n.t('chatItemQuestFinish', lang)}\``;
+      msg = shared.i18n.t('chatItemQuestFinish', lang);
       break;
 
     case 'spell_cast_party':
-      msg = `\`${shared.i18n.t('chatCastSpellParty', {username: info.user, spell: spells[info.class][info.spell].text(lang)}, lang)}\``;
+      msg = shared.i18n.t('chatCastSpellParty', {username: info.user, spell: spells[info.class][info.spell].text(lang)}, lang);
       break;
 
     case 'spell_cast_user':
-      msg = `\`${shared.i18n.t('chatCastSpellUser', {username: info.user, spell: spells[info.class][info.spell].text(lang), target: info.target}, lang)}\``;
+      msg = shared.i18n.t('chatCastSpellUser', {username: info.user, spell: spells[info.class][info.spell].text(lang), target: info.target}, lang);
       break;
 
     case 'quest_cancel':
-      msg = `\`${shared.i18n.t('chatQuestCancelled', {username: info.user, questName: questScrolls[info.quest].text(lang)}, lang)}\``;
+      msg = shared.i18n.t('chatQuestCancelled', {username: info.user, questName: questScrolls[info.quest].text(lang)}, lang);
       break;
 
     case 'quest_abort':
-      msg = `\`${shared.i18n.t('chatQuestAborted', {username: info.user, questName: questScrolls[info.quest].text(lang)}, lang)}\``;
+      msg = shared.i18n.t('chatQuestAborted', {username: info.user, questName: questScrolls[info.quest].text(lang)}, lang);
       break;
 
     case 'tavern_quest_completed':
-      msg = `\`${quests[info.quest].completionChat(lang)}\``;
+      msg = quests[info.quest].completionChat(lang);
       break;
 
     case 'tavern_boss_rage_tired':
-      msg = `\`${shared.i18n.t('tavernBossTired', {rageName: quests[info.quest].boss.rage.title(lang), bossName: quests[info.quest].boss.name(lang)}, lang)}\``;
+      msg = shared.i18n.t('tavernBossTired', {rageName: quests[info.quest].boss.rage.title(lang), bossName: quests[info.quest].boss.name(lang)}, lang);
       break;
 
     case 'tavern_boss_rage':
-      msg = `\`${quests[info.quest].boss.rage[info.scene](lang)}\``;
+      msg = quests[info.quest].boss.rage[info.scene](lang);
       break;
 
     case 'tavern_boss_desperation':
-      msg = `\`${quests[info.quest].boss.desperation.text(lang)}\``;
+      msg = quests[info.quest].boss.desperation.text(lang);
       break;
 
     case 'claim_task':
-      msg = `${shared.i18n.t('userIsClamingTask', {username: info.user, task: info.task}, lang)}`;
+      msg = shared.i18n.t('userIsClamingTask', {username: info.user, task: info.task}, lang);
       break;
   }
 
+  if (!msg.includes('`')) {
+    msg = `\`${msg}\``;
+  }
   return msg;
 }