From a098f0b2434bb48e7bd3b693584579fabf52b5ac Mon Sep 17 00:00:00 2001
From: Jonas <jonas@freesources.org>
Date: Thu, 9 Nov 2023 17:39:09 +0100
Subject: [PATCH] fix(MemberPicker): Rename "users" to "accounts" and "people"
 to "members"

* Mention collective name in title: "Add members to <name>".
* Change "Create" button to "Create without members" if no members are
  picked.

Signed-off-by: Jonas <jonas@freesources.org>
---
 cypress/e2e/collective.spec.js                |  2 +-
 src/components/Member/MemberPicker.vue        |  4 ++--
 src/components/Member/MemberSearchResults.vue |  2 +-
 src/components/Nav/NewCollectiveModal.vue     | 12 +++++++++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/cypress/e2e/collective.spec.js b/cypress/e2e/collective.spec.js
index f00da6a12d..fd4369dfe6 100644
--- a/cypress/e2e/collective.spec.js
+++ b/cypress/e2e/collective.spec.js
@@ -84,7 +84,7 @@ describe('Collective', function() {
 				cy.get('button span.circles-icon').click()
 				// cy.get('.circle-selector ul').should('not.contain', 'Foreign')
 				cy.get('.circle-selector li [title*=History]').click()
-				cy.get('button').contains('Add people').click()
+				cy.get('button').contains('Add members').click()
 				cy.get('button').contains('Create').click()
 
 				cy.get('#titleform input').invoke('val').should('contain', 'History Club')
diff --git a/src/components/Member/MemberPicker.vue b/src/components/Member/MemberPicker.vue
index 82033397c8..3a9f4f04ec 100644
--- a/src/components/Member/MemberPicker.vue
+++ b/src/components/Member/MemberPicker.vue
@@ -5,7 +5,7 @@
 			:value.sync="searchQuery"
 			type="text"
 			:show-trailing-button="isSearching"
-			:label="t('collectives', 'Search users, groups, circles…')"
+			:label="t('collectives', 'Search accounts, groups, circles…')"
 			@trailing-button-click="clearSearch"
 			@input="onSearch">
 			<MagnifyIcon :size="16" />
@@ -35,7 +35,7 @@
 
 			<!-- No search results -->
 			<template v-else-if="currentUserIsAdmin && !showCurrentSkeleton">
-				<NcAppNavigationCaption class="member-picker-caption" :title="t('collectives', 'Add users, groups or circles…')" />
+				<NcAppNavigationCaption class="member-picker-caption" :title="t('collectives', 'Add accounts, groups or circles…')" />
 				<Hint v-if="!isSearching" :hint="t('collectives', 'Search for members to add.')" />
 				<Hint v-else-if="isSearchLoading" :hint="t('collectives', 'Loading…')" />
 				<Hint v-else :hint="t('collectives', 'No search results')" />
diff --git a/src/components/Member/MemberSearchResults.vue b/src/components/Member/MemberSearchResults.vue
index 435edd281a..fe0722e717 100644
--- a/src/components/Member/MemberSearchResults.vue
+++ b/src/components/Member/MemberSearchResults.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="member-search-results">
 		<template v-if="addableUsers.length !== 0">
-			<NcAppNavigationCaption :title="t('collectives', 'Add users')"
+			<NcAppNavigationCaption :title="t('collectives', 'Add accounts')"
 				class="member-picker-caption" />
 			<Member v-for="item in addableUsers"
 				:key="generateKey(item)"
diff --git a/src/components/Nav/NewCollectiveModal.vue b/src/components/Nav/NewCollectiveModal.vue
index 5e84c59439..743787b099 100644
--- a/src/components/Nav/NewCollectiveModal.vue
+++ b/src/components/Nav/NewCollectiveModal.vue
@@ -73,14 +73,14 @@
 						:disabled="!newCollectiveName || nameIsInvalid"
 						class="modal-buttons-right"
 						@click="advanceToMembers">
-						{{ t('collectives', 'Add people') }}
+						{{ t('collectives', 'Add members') }}
 					</NcButton>
 				</div>
 			</div>
 
 			<div v-else-if="state === 1" class="modal-collective-wrapper">
 				<h2 class="modal-collective-title">
-					{{ t('collectives', 'Add people') }}
+					{{ t('collectives', 'Add members to {name}', { name: newCollectiveName }) }}
 				</h2>
 
 				<div class="modal-collective-members">
@@ -99,7 +99,7 @@
 						:disabled="loading"
 						class="modal-buttons-right"
 						@click="onCreate">
-						{{ t('collectives', 'Create') }}
+						{{ createButtonString }}
 					</NcButton>
 				</div>
 			</div>
@@ -207,6 +207,12 @@ export default {
 		hasSelectedMembersWithoutSelf() {
 			return Object.keys(this.selectedMembersWithoutSelf).length !== 0
 		},
+
+		createButtonString() {
+			return this.hasSelectedMembersWithoutSelf
+				? t('collectives', 'Create')
+				: t('collectives', 'Create without members')
+		},
 	},
 
 	mounted() {