Skip to content

[stable31] Replace "remove" wording with "delete" #53101

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

Merged
skjnldsv merged 3 commits into from
May 25, 2025
Merged

[stable31] Replace "remove" wording with "delete" #53101

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64a378e
refactor(settings): replace "remove" wording with "delete"
Jerome-Herbinet May 22, 2025
8b1beeb
ci(cypress): replace "remove group" with "delete group"
Jerome-Herbinet May 23, 2025
94564fa
chore(assets): Recompile assets
nextcloud-command May 24, 2025
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
6 changes: 3 additions & 3 deletions apps/settings/src/components/GroupListItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</h2>
<NcNoteCard type="warning"
show-alert>
{{ t('settings', 'You are about to remove the group "{group}". The accounts will NOT be deleted.', { group: name }) }}
{{ t('settings', 'You are about to delete the group "{group}". The accounts will NOT be deleted.', { group: name }) }}
</NcNoteCard>
<div class="modal__button-row">
<NcButton type="secondary"
Expand Down Expand Up @@ -62,7 +62,7 @@
<template #icon>
<Delete :size="20" />
</template>
{{ t('settings', 'Remove group') }}
{{ t('settings', 'Delete group') }}
</NcActionButton>
</template>
</NcAppNavigationItem>
Expand Down Expand Up @@ -179,7 +179,7 @@ export default {
await this.$store.dispatch('removeGroup', this.id)
this.showRemoveGroupModal = false
} catch (error) {
showError(t('settings', 'Failed to remove group "{group}"', { group: this.name }))
showError(t('settings', 'Failed to delete group "{group}"', { group: this.name }))
}
},
},
Expand Down
8 changes: 4 additions & 4 deletions cypress/e2e/settings/users_groups.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ describe('Settings: Delete an empty group', { testIsolation: false }, () => {
})

it('can delete the group', () => {
// The "Remove group" action in the actions menu is shown and clicked
cy.get('.action-item__popper button').contains('Remove group').should('exist').click({ force: true })
// The "Delete group" action in the actions menu is shown and clicked
cy.get('.action-item__popper button').contains('Delete group').should('exist').click({ force: true })
// And confirmation dialog accepted
cy.get('.modal-container button').contains('Confirm').click({ force: true })

Expand Down Expand Up @@ -190,8 +190,8 @@ describe('Settings: Delete a non empty group', () => {
.find('button.action-item__menutoggle')
.click({ force: true })

// The "Remove group" action in the actions menu is shown and clicked
cy.get('.action-item__popper button').contains('Remove group').should('exist').click({ force: true })
// The "Delete group" action in the actions menu is shown and clicked
cy.get('.action-item__popper button').contains('Delete group').should('exist').click({ force: true })
// And confirmation dialog accepted
cy.get('.modal-container button').contains('Confirm').click({ force: true })

Expand Down
Loading