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

Group plan fixes (#9518)

Browse Source 
* Fixed group plan editing

* Added translations

* Abstracted query for group or challenge tasks
This commit is contained in:
Keith Holliday
2017-11-17 20:31:39 +11:00
committed by GitHub
parent 0c713ab368
commit 67564317fb
6 changed files with 54 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,11 +27,11 @@ export default {
let userIsRequesting = this.task.group.approvals && this.task.group.approvals.indexOf(this.user._id) !== -1;
if (approvalsLength === 1 && !userIsRequesting) {
return `${approvals[0].userId.profile.name} requests approval`;
return this.$t('youAreRequestingApproval', {userName: approvals[0].userId.profile.name});
} else if (approvalsLength > 1 && !userIsRequesting) {
return `${approvalsLength} request approval`;
return this.$t('youAreRequestingApproval', {userCount: approvalsLength});
} else if (approvalsLength === 1 && userIsRequesting) {
return 'You are requesting approval';
return this.$t('youAreRequestingApproval');
}
},
userIsAdmin () {