Merge pull request #8090 from carlobeltrame/leaving-camp-label

Use different wording when leaving the camp oneself

Author: carlobeltrame

frontend/src/components/collaborator/CollaboratorEdit.vue

@@ -94,7 +94,7 @@
                         : onDialog
                     "
                   >
-                    {{ $tc('components.collaborator.collaboratorEdit.deactivate') }}
+                    {{ deactivateLabel }}
                   </IconButton>
                 </template>
               </PromptCollaboratorDeactivate>
@@ -179,6 +179,11 @@ export default {
     name() {
       return campCollaborationDisplayName(this.collaborator, this.$tc.bind(this), false)
     },
+    deactivateLabel() {
+      return this.isOwnCampCollaboration
+        ? this.$tc('components.collaborator.collaboratorEdit.leaveCamp')
+        : this.$tc('components.collaborator.collaboratorEdit.deactivate')
+    },
   },
   watch: {
     showDialog: function (showDialog) {

frontend/src/components/collaborator/PromptCollaboratorDeactivate.vue

@@ -5,7 +5,7 @@
     :error="error"
     :submit-action="deactivateUser"
     :submit-enabled="!$slots.error"
-    :submit-label="$tc('components.collaborator.promptCollaboratorDeactivate.deactivate')"
+    :submit-label="submitLabel"
     submit-color="error"
     submit-icon="mdi-cancel"
     cancel-icon=""
@@ -16,11 +16,7 @@
       <slot name="activator" v-bind="scope" />
     </template>
     <slot>
-      {{
-        $tc('components.collaborator.promptCollaboratorDeactivate.warningText', 1, {
-          name: displayName,
-        })
-      }}
+      {{ warningText }}
     </slot>
     <template v-if="$slots.error || error" #error>
       <slot name="error">
@@ -36,6 +32,7 @@ import campCollaborationDisplayName from '@/common/helpers/campCollaborationDisp
 import { errorToMultiLineToast } from '@/components/toast/toasts'
 import PopoverPrompt from '@/components/prompt/PopoverPrompt.vue'
 import isOwnCampCollaboration from './isOwnCampCollaboration.js'
+import campShortTitle from '@/common/helpers/campShortTitle.js'
 
 export default {
   name: 'PromptCollaboratorDeactivate',
@@ -51,6 +48,20 @@ export default {
     displayName() {
       return campCollaborationDisplayName(this.entity, this.$tc.bind(this))
     },
+    submitLabel() {
+      return this.isOwnCampCollaboration
+        ? this.$tc('components.collaborator.promptCollaboratorDeactivate.leaveCamp')
+        : this.$tc('components.collaborator.promptCollaboratorDeactivate.deactivate')
+    },
+    warningText() {
+      const key = this.isOwnCampCollaboration
+        ? 'components.collaborator.promptCollaboratorDeactivate.warningTextLeaveCamp'
+        : 'components.collaborator.promptCollaboratorDeactivate.warningText'
+      return this.$tc(key, 1, {
+        name: this.displayName,
+        camp: campShortTitle(this.entity.camp()),
+      })
+    },
   },
   created() {
     this.entityUri = this.entity._meta.self

frontend/src/locales/de.json

@@ -246,6 +246,7 @@
         "cannotRemoveLastManager": "Du kannst die letzte Person mit administrativen Rechten nicht deaktivieren",
         "deactivate": "Deaktivieren",
         "delete": "Möchtest du die Person '{name}' wirklich entfernen?",
+        "leaveCamp": "Lager verlassen",
         "inviteAgain": "Erneut einladen",
         "resendEmail": "E-Mail erneut senden",
         "resentEmail": "Einladung gesendet",
@@ -257,7 +258,9 @@
       },
       "promptCollaboratorDeactivate": {
         "deactivate": "Deaktivieren",
-        "warningText": "Möchtest du '{name}' wirklich deaktivieren?"
+        "leaveCamp": "Lager verlassen",
+        "warningText": "Möchtest du '{name}' wirklich deaktivieren?",
+        "warningTextLeaveCamp": "Möchtest du das Lager '{camp}' wirklich verlassen?"
       }
     },
     "dashboard": {

frontend/src/locales/en.json

@@ -247,6 +247,7 @@
         "deactivate": "Deactivate",
         "delete": "Do you really want to remove collaborator '{name}'?",
         "inviteAgain": "Invite again",
+        "leaveCamp": "Leave camp",
         "resendEmail": "Resend invite",
         "resentEmail": "Invitation sent",
         "title": "Edit {user}"
@@ -257,7 +258,9 @@
       },
       "promptCollaboratorDeactivate": {
         "deactivate": "Deactivate",
-        "warningText": "Do you want to deactivate '{name}'?"
+        "leaveCamp": "Leave camp",
+        "warningText": "Do you want to deactivate '{name}'?",
+        "warningTextLeaveCamp": "Do you want to leave the camp '{camp}'?"
       }
     },
     "dashboard": {