krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(groups): display correct messages in two places

Browse Source
This commit is contained in:
Sabe Jones
2018-07-06 13:20:34 -05:00
parent 0f8e7416f8
commit d1f7e64156
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/client/components/groups/groupFormModal.vue
View File

@@ -15,7 +15,7 @@
#groupPrivateDescription1.icon(:title="$t('privateDescription')") #groupPrivateDescription1.icon(:title="$t('privateDescription')")
.svg-icon(v-html='icons.information') .svg-icon(v-html='icons.information')
b-tooltip( b-tooltip(
:title="$t('privateDescription')", :title="$t('onlyLeaderCreatesChallengesDetail')",
target="groupPrivateDescription1", target="groupPrivateDescription1",
) )

4
website/client/components/tasks/approvalHeader.vue
View File

@@ -27,9 +27,9 @@ export default {
let userIsRequesting = this.task.group.approvals && this.task.group.approvals.indexOf(this.user._id) !== -1; let userIsRequesting = this.task.group.approvals && this.task.group.approvals.indexOf(this.user._id) !== -1;
if (approvalsLength === 1 && !userIsRequesting) { 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) { } else if (approvalsLength > 1 && !userIsRequesting) {
return this.$t('youAreRequestingApproval', {userCount: approvalsLength}); return this.$t('userCountRequestsApproval', {userCount: approvalsLength});
} else if (approvalsLength === 1 && userIsRequesting) { } else if (approvalsLength === 1 && userIsRequesting) {
return this.$t('youAreRequestingApproval'); return this.$t('youAreRequestingApproval');
} }

3
website/common/locales/en/groups.json
View File

@@ -258,7 +258,7 @@
"confirmApproval": "Are you sure you want to approve this task?", "confirmApproval": "Are you sure you want to approve this task?",
"confirmNeedsWork": "Are you sure you want to mark this task as needing work?", "confirmNeedsWork": "Are you sure you want to mark this task as needing work?",
"userRequestsApproval": "<%= userName %> requests approval", "userRequestsApproval": "<%= userName %> requests approval",
"userCountRequestsApproval": "<%= userCount %> request approval", "userCountRequestsApproval": "<%= userCount %> members request approval",
"youAreRequestingApproval": "You are requesting approval", "youAreRequestingApproval": "You are requesting approval",
"chatPrivilegesRevoked": "You cannot do that because your chat privileges have been revoked.", "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.", "cannotCreatePublicGuildWhenMuted": "You cannot create a public guild because your chat privileges have been revoked.",
@@ -385,6 +385,7 @@
"bronzeTier": "Bronze Tier", "bronzeTier": "Bronze Tier",
"privacySettings": "Privacy Settings", "privacySettings": "Privacy Settings",
"onlyLeaderCreatesChallenges": "Only the Leader can create Challenges", "onlyLeaderCreatesChallenges": "Only the Leader can create Challenges",
"onlyLeaderCreatesChallengesDetail": "With this option selected, ordinary group members cannot create Challenges for the group.",
"privateGuild": "Private Guild", "privateGuild": "Private Guild",
"charactersRemaining": "<%= characters %> characters remaining", "charactersRemaining": "<%= characters %> characters remaining",
"guildSummary": "Summary", "guildSummary": "Summary",