Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: rename circles to teams #11689

Merged
merged 1 commit into from
Feb 29, 2024
Merged

fix: rename circles to teams #11689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/components/LeftSidebar/LeftSidebar.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 () => {
Expand All @@ -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 () => {
Expand Down Expand Up @@ -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 () => {
Expand All @@ -582,7 +582,7 @@ describe('LeftSidebar.vue', () => {
circles_enabled: true,
start_conversations: true,
},
'Users and circles',
'Users and teams',
)
})
})
Expand Down
10 changes: 5 additions & 5 deletions src/components/LeftSidebar/LeftSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`"
Expand Down Expand Up @@ -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')
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
10 changes: 5 additions & 5 deletions ...ponents/RightSidebar/Participants/ParticipantsSearchResults/ParticipantsSearchResults.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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')
}
}
Expand Down
Loading