From 320d8cac5fa47e287d53199684ddfe16ec1f0ea9 Mon Sep 17 00:00:00 2001 From: Alys Date: Fri, 26 Aug 2016 07:57:16 -0700 Subject: [PATCH] replace "Tavern Talk" with "Tavern Chat" above Tavern's chat box - fixes https://github.com/HabitRPG/habitrpg/issues/6813 --- common/locales/en/groups.json | 1 - website/views/options/social/tavern.jade | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json index 00c1b86d1d..535ec483ec 100644 --- a/common/locales/en/groups.json +++ b/common/locales/en/groups.json @@ -14,7 +14,6 @@ "dataTool": "Data Display Tool", "resources": "Resources", "askQuestionNewbiesGuild": "Ask a Question (Newbies Guild)", - "tavernTalk": "Tavern Talk", "tavernAlert1": "To report a bug, visit", "tavernAlert2": "the Report a Bug Guild", "moderatorIntro1": "Tavern and guild moderators are: ", diff --git a/website/views/options/social/tavern.jade b/website/views/options/social/tavern.jade index c03503256a..cc06b77ed9 100644 --- a/website/views/options/social/tavern.jade +++ b/website/views/options/social/tavern.jade @@ -145,7 +145,7 @@ include ./challenge-box .col-md-8.tavern(ng-controller='ChatCtrl') - h3=env.t('tavernTalk') + h3=env.t('tavern') include ./chat-box .alert.alert-info.alert-sm != ' ' + env.t('tavernAlert1') + ' ' + env.t('tavernAlert2') + '!
' + env.t('moderatorIntro1')