From d1f7e64156c4c61bb1025b1c1a2d47b4dc322483 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 6 Jul 2018 13:20:34 -0500 Subject: [PATCH] fix(groups): display correct messages in two places --- website/client/components/groups/groupFormModal.vue | 2 +- website/client/components/tasks/approvalHeader.vue | 4 ++-- website/common/locales/en/groups.json | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/website/client/components/groups/groupFormModal.vue b/website/client/components/groups/groupFormModal.vue index 2718f32e32..55b52da07a 100644 --- a/website/client/components/groups/groupFormModal.vue +++ b/website/client/components/groups/groupFormModal.vue @@ -15,7 +15,7 @@ #groupPrivateDescription1.icon(:title="$t('privateDescription')") .svg-icon(v-html='icons.information') b-tooltip( - :title="$t('privateDescription')", + :title="$t('onlyLeaderCreatesChallengesDetail')", target="groupPrivateDescription1", ) diff --git a/website/client/components/tasks/approvalHeader.vue b/website/client/components/tasks/approvalHeader.vue index b2a0c33fbc..f7db7c8259 100644 --- a/website/client/components/tasks/approvalHeader.vue +++ b/website/client/components/tasks/approvalHeader.vue @@ -27,9 +27,9 @@ export default { let userIsRequesting = this.task.group.approvals && this.task.group.approvals.indexOf(this.user._id) !== -1; if (approvalsLength === 1 && !userIsRequesting) { - return this.$t('youAreRequestingApproval', {userName: approvals[0].userId.profile.name}); + return this.$t('userRequestsApproval', {userName: approvals[0].userId.profile.name}); } else if (approvalsLength > 1 && !userIsRequesting) { - return this.$t('youAreRequestingApproval', {userCount: approvalsLength}); + return this.$t('userCountRequestsApproval', {userCount: approvalsLength}); } else if (approvalsLength === 1 && userIsRequesting) { return this.$t('youAreRequestingApproval'); } diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index 0f74cebc3b..59d1ced5a2 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -258,7 +258,7 @@ "confirmApproval": "Are you sure you want to approve this task?", "confirmNeedsWork": "Are you sure you want to mark this task as needing work?", "userRequestsApproval": "<%= userName %> requests approval", - "userCountRequestsApproval": "<%= userCount %> request approval", + "userCountRequestsApproval": "<%= userCount %> members request approval", "youAreRequestingApproval": "You are requesting approval", "chatPrivilegesRevoked": "You cannot do that because your chat privileges have been revoked.", "cannotCreatePublicGuildWhenMuted": "You cannot create a public guild because your chat privileges have been revoked.", @@ -385,6 +385,7 @@ "bronzeTier": "Bronze Tier", "privacySettings": "Privacy Settings", "onlyLeaderCreatesChallenges": "Only the Leader can create Challenges", + "onlyLeaderCreatesChallengesDetail": "With this option selected, ordinary group members cannot create Challenges for the group.", "privateGuild": "Private Guild", "charactersRemaining": "<%= characters %> characters remaining", "guildSummary": "Summary",