sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-14 16:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clarify that "Leave" refers to guild/party; fix pluralisation in keep/remove challenge tasks (#9706)

Browse source 
* change "Keep/Remove It" to "Keep/Remove Them" when asking about all challenge tasks while leaving a challenge

* change "Leave" button on groups to "Leave Guild" or "Leave Party"

This is because the button is underneath the challenges so this
clarifies that it is referring to the group, not a challenge.

* change "Keep/Remove Them" to "Keep/Remove Tasks"
This commit is contained in:
Alys 2018-01-30 06:52:28 +10:00 committed by Sabe Jones
parent 12aa8a78c1
commit 70da5940a7
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
website/client/components/challenges/leaveChallengeModal.vue
View file

@ -3,8 +3,8 @@
.modal-body
h2 {{ $t('confirmKeepChallengeTasks') }}
div
button.btn.btn-primary(@click='leaveChallenge("keep")') {{ $t('keepIt') }}
button.btn.btn-danger(@click='leaveChallenge("remove-all")') {{ $t('removeIt') }}
button.btn.btn-primary(@click='leaveChallenge("keep")') {{ $t('keepThem') }}
button.btn.btn-danger(@click='leaveChallenge("remove-all")') {{ $t('removeThem') }}
</template>
<style scoped>

2
website/client/components/groups/group.vue
View file

@ -105,7 +105,7 @@
.section(v-if="sections.challenges")
group-challenges(:groupId='searchId')
div.text-center
button.btn.btn-danger(v-if='isMember', @click='clickLeave()') {{ $t('leave') }}
button.btn.btn-danger(v-if='isMember', @click='clickLeave()') {{ isParty ? $t('leaveParty') : $t('leaveGroup') }}
</template>
<style lang="scss" scoped>

4
website/common/locales/en/challenge.json
View file

@ -6,8 +6,8 @@
"keepIt": "Keep It",
"removeIt": "Remove It",
"brokenChallenge": "Broken Challenge Link: this task was part of a challenge, but the challenge (or group) has been deleted. What to do with the orphan tasks?",
"keepThem": "Keep Them",
"removeThem": "Remove Them",
"keepThem": "Keep Tasks",
"removeThem": "Remove Tasks",
"challengeCompleted": "This challenge has been completed, and the winner was <span class=\"badge\"><%= user %></span>! What to do with the orphan tasks?",
"unsubChallenge": "Broken Challenge Link: this task was part of a challenge, but you have unsubscribed from the challenge. What to do with the orphan tasks?",
"challengeWinner": "Was the winner in the following challenges",

6
website/common/locales/en/groups.json
View file

@ -117,9 +117,9 @@
"confirmGuild": "Create Guild for 4 Gems?",
"leaveGroupCha": "Leave Guild challenges and...",
"confirm": "Confirm",
"leaveGroup": "Leave Guild?",
"leavePartyCha": "Leave party challenges and...",
"leaveParty": "Leave party?",
"leaveGroup": "Leave Guild",
"leavePartyCha": "Leave Party challenges and...",
"leaveParty": "Leave Party",
"sendPM": "Send private message",
"send": "Send",
"messageSentAlert": "Message sent",