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

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

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

@@ -105,7 +105,7 @@
.section(v-if="sections.challenges") .section(v-if="sections.challenges")
group-challenges(:groupId='searchId') group-challenges(:groupId='searchId')
div.text-center 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> </template>
<style lang="scss" scoped> <style lang="scss" scoped>

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

@@ -6,8 +6,8 @@
"keepIt": "Keep It", "keepIt": "Keep It",
"removeIt": "Remove 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?", "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", "keepThem": "Keep Tasks",
"removeThem": "Remove Them", "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?", "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?", "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", "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?", "confirmGuild": "Create Guild for 4 Gems?",
"leaveGroupCha": "Leave Guild challenges and...", "leaveGroupCha": "Leave Guild challenges and...",
"confirm": "Confirm", "confirm": "Confirm",
"leaveGroup": "Leave Guild?", "leaveGroup": "Leave Guild",
"leavePartyCha": "Leave party challenges and...", "leavePartyCha": "Leave Party challenges and...",
"leaveParty": "Leave party?", "leaveParty": "Leave Party",
"sendPM": "Send private message", "sendPM": "Send private message",
"send": "Send", "send": "Send",
"messageSentAlert": "Message sent", "messageSentAlert": "Message sent",