Merge pull request #11689 from nextcloud/chore/11607/rename-circles-t…

…o-teams fix: rename circles to teams
nextcloud · Feb 29, 2024 · d8f5965 · d8f5965
2 parents 3448a4c + 056d4b1
commit d8f5965
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/src/components/LeftSidebar/LeftSidebar.spec.js b/src/components/LeftSidebar/LeftSidebar.spec.js
@@ -343,7 +343,7 @@ describe('LeftSidebar.vue', () => {
 				)
 
 				// Check all captions
-				const captionList = ['Conversations', 'Open conversations', 'Users', 'Groups', 'Circles']
+				const captionList = ['Conversations', 'Open conversations', 'Users', 'Groups', 'Teams']
 				const captionListItems = wrapper.findAllComponents({ name: 'NcAppNavigationCaption' })
 				expect(captionListItems.exists()).toBeTruthy()
 				expect(captionListItems).toHaveLength(captionList.length)
@@ -498,7 +498,7 @@ describe('LeftSidebar.vue', () => {
 						circles_enabled: true,
 						start_conversations: true,
 					},
-					'Users, groups and circles',
+					'Users, groups and teams',
 				)
 			})
 			test('displays all types in caption when only listed conversations were found', async () => {
@@ -510,7 +510,7 @@ describe('LeftSidebar.vue', () => {
 						circles_enabled: true,
 						start_conversations: true,
 					},
-					'Users, groups and circles',
+					'Users, groups and teams',
 				)
 			})
 			test('displays all types minus circles when nothing was found but circles is disabled', async () => {
@@ -570,7 +570,7 @@ describe('LeftSidebar.vue', () => {
 						circles_enabled: true,
 						start_conversations: true,
 					},
-					'Groups and circles',
+					'Groups and teams',
 				)
 			})
 			test('displays caption for users and circles not found', async () => {
@@ -582,7 +582,7 @@ describe('LeftSidebar.vue', () => {
 						circles_enabled: true,
 						start_conversations: true,
 					},
-					'Users and circles',
+					'Users and teams',
 				)
 			})
 		})

diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
@@ -246,7 +246,7 @@
 
 						<!-- New conversations: Circles -->
 						<template v-if="searchResultsCircles.length !== 0">
-							<NcAppNavigationCaption :name="t('spreed', 'Circles')" />
+							<NcAppNavigationCaption :name="t('spreed', 'Teams')" />
 							<NcListItem v-for="item of searchResultsCircles"
 								:key="`circle_${item.id}`"
 								:data-nav-id="`circle_${item.id}`"
@@ -535,21 +535,21 @@ export default {
 			if (hasNoResultsUsers) {
 				if (hasNoResultsGroups) {
 					return (hasNoResultsCircles)
-						? t('spreed', 'Users, groups and circles')
+						? t('spreed', 'Users, groups and teams')
 						: t('spreed', 'Users and groups')
 				} else {
 					return (hasNoResultsCircles)
-						? t('spreed', 'Users and circles')
+						? t('spreed', 'Users and teams')
 						: t('spreed', 'Users')
 				}
 			} else {
 				if (hasNoResultsGroups) {
 					return (hasNoResultsCircles)
-						? t('spreed', 'Groups and circles')
+						? t('spreed', 'Groups and teams')
 						: t('spreed', 'Groups')
 				} else {
 					return (hasNoResultsCircles)
-						? t('spreed', 'Circles')
+						? t('spreed', 'Teams')
 						: t('spreed', 'Other sources')
 				}
 			}

diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
@@ -777,7 +777,7 @@ export default {
 			case ATTENDEE.ACTOR_TYPE.GROUPS:
 				return t('spreed', 'Remove group and members')
 			case ATTENDEE.ACTOR_TYPE.CIRCLES:
-				return t('spreed', 'Remove circle and members')
+				return t('spreed', 'Remove team and members')
 			case ATTENDEE.ACTOR_TYPE.USERS:
 			default:
 				return t('spreed', 'Remove participant')

diff --git a/...ponents/RightSidebar/Participants/ParticipantsSearchResults/ParticipantsSearchResults.vue b/...ponents/RightSidebar/Participants/ParticipantsSearchResults/ParticipantsSearchResults.vue
@@ -40,7 +40,7 @@
 		</template>
 
 		<template v-if="addableCircles.length !== 0">
-			<NcAppNavigationCaption :name="t('spreed', 'Add circles')" />
+			<NcAppNavigationCaption :name="t('spreed', 'Add teams')" />
 			<ParticipantsList :items="addableCircles"
 				@click="handleClickParticipant" />
 		</template>
@@ -187,21 +187,21 @@ export default {
 			if (!this.addableUsers.length) {
 				if (!this.addableGroups.length) {
 					return this.circlesWithoutResults
-						? t('spreed', 'Add users, groups or circles')
+						? t('spreed', 'Add users, groups or teams')
 						: t('spreed', 'Add users or groups')
 				} else {
 					return this.circlesWithoutResults
-						? t('spreed', 'Add users or circles')
+						? t('spreed', 'Add users or teams')
 						: t('spreed', 'Add users')
 				}
 			} else {
 				if (!this.addableGroups.length) {
 					return this.circlesWithoutResults
-						? t('spreed', 'Add groups or circles')
+						? t('spreed', 'Add groups or teams')
 						: t('spreed', 'Add groups')
 				} else {
 					return this.circlesWithoutResults
-						? t('spreed', 'Add circles')
+						? t('spreed', 'Add teams')
 						: t('spreed', 'Add other sources')
 				}
 			}