From 70da5940a765cb200a88c62e156893efb3742b8b Mon Sep 17 00:00:00 2001
From: Alys <Alys@users.noreply.github.com>
Date: Tue, 30 Jan 2018 06:52:28 +1000
Subject: [PATCH] clarify that "Leave" refers to guild/party; fix pluralisation
 in keep/remove challenge tasks (#9706)

* 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"
---
 .../client/components/challenges/leaveChallengeModal.vue    | 4 ++--
 website/client/components/groups/group.vue                  | 2 +-
 website/common/locales/en/challenge.json                    | 4 ++--
 website/common/locales/en/groups.json                       | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/website/client/components/challenges/leaveChallengeModal.vue b/website/client/components/challenges/leaveChallengeModal.vue
index 0f889cf6d0..0925a4e1d0 100644
--- a/website/client/components/challenges/leaveChallengeModal.vue
+++ b/website/client/components/challenges/leaveChallengeModal.vue
@@ -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>
diff --git a/website/client/components/groups/group.vue b/website/client/components/groups/group.vue
index 3a51f7ee34..1070f90e35 100644
--- a/website/client/components/groups/group.vue
+++ b/website/client/components/groups/group.vue
@@ -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>
diff --git a/website/common/locales/en/challenge.json b/website/common/locales/en/challenge.json
index 93c688b9e1..a5ca557e4a 100644
--- a/website/common/locales/en/challenge.json
+++ b/website/common/locales/en/challenge.json
@@ -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",
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index cc87d71ee4..dc987475ee 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -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",