sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(files): add plural form for selected nodes 

Reported at Transifex:
> This string needs pluralization feature, because in some languages translation of "selected" differs between singular and plural.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
pull/53589/head
Ferdinand Thiessen 2025-06-18 10:20:36 +07:00
parent 60b4a3d712
commit 4cbf85494c
No known key found for this signature in database
GPG Key ID: 45FAE7268762B400
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/files/src/components/FilesListVirtual.vue
Unescape Escape View File

@ -20,7 +20,9 @@
</template> </template>
<template v-if="!isNoneSelected" #header-overlay> <template v-if="!isNoneSelected" #header-overlay>
<span class="files-list__selected">{{ t('files', '{count} selected', { count: selectedNodes.length }) }}</span> <span class="files-list__selected">
{{ n('files', '{count} selected', '{count} selected', selectedNodes.length, { count: selectedNodes.length }) }}
</span>
<FilesListTableHeaderActions :current-view="currentView" <FilesListTableHeaderActions :current-view="currentView"
:selected-nodes="selectedNodes" /> :selected-nodes="selectedNodes" />
</template> </template>
@ -65,8 +67,8 @@ import type { Location } from 'vue-router'
import { showError } from '@nextcloud/dialogs' import { showError } from '@nextcloud/dialogs'
import { subscribe, unsubscribe } from '@nextcloud/event-bus' import { subscribe, unsubscribe } from '@nextcloud/event-bus'
import { Folder, Permission, View, getFileActions, FileType } from '@nextcloud/files' import { Folder, Permission, View, getFileActions, FileType } from '@nextcloud/files'
import { t } from '@nextcloud/l10n' import { n, t } from '@nextcloud/l10n'
import { useHotKey } from '@nextcloud/vue/dist/Composables/useHotKey.js' import { useHotKey } from '@nextcloud/vue/composables/useHotKey'
import { defineComponent } from 'vue' import { defineComponent } from 'vue'
import { action as sidebarAction } from '../actions/sidebarAction.ts' import { action as sidebarAction } from '../actions/sidebarAction.ts'
@ -134,6 +136,7 @@ export default defineComponent({
selectionStore, selectionStore,
userConfigStore, userConfigStore,
n,
t, t,
} }
}, },

6
cypress/e2e/files/files-selection.cy.ts
Unescape Escape View File

@ -40,7 +40,7 @@ describe('files: Select all files', { testIsolation: true }, () => {
selectAllFiles() selectAllFiles()
cy.get('.files-list__selected').should('have.text', '7 selected') cy.get('.files-list__selected').should('contain.text', '7 selected')
cy.get('[data-cy-files-list-row-checkbox]').findByRole('checkbox').should('be.checked') cy.get('[data-cy-files-list-row-checkbox]').findByRole('checkbox').should('be.checked')
deselectAllFiles() deselectAllFiles()
@ -59,7 +59,7 @@ describe('files: Select all files', { testIsolation: true }, () => {
randomFiles.forEach(name => selectRowForFile(name)) randomFiles.forEach(name => selectRowForFile(name))
cy.get('.files-list__selected').should('have.text', `${randomFiles.length} selected`) cy.get('.files-list__selected').should('contain.text', `${randomFiles.length} selected`)
cy.get('[data-cy-files-list-row-checkbox] input[type="checkbox"]:checked').should('have.length', randomFiles.length) cy.get('[data-cy-files-list-row-checkbox] input[type="checkbox"]:checked').should('have.length', randomFiles.length)
}) })
@ -70,7 +70,7 @@ describe('files: Select all files', { testIsolation: true }, () => {
selectRowForFile('readme.md') selectRowForFile('readme.md')
cy.window().trigger('keyup', { key: 'ShiftLeft', shiftKey: true }) cy.window().trigger('keyup', { key: 'ShiftLeft', shiftKey: true })
cy.get('.files-list__selected').should('have.text', '4 selected') cy.get('.files-list__selected').should('contain.text', '4 selected')
cy.get('[data-cy-files-list-row-checkbox] input[type="checkbox"]:checked').should('have.length', 4) cy.get('[data-cy-files-list-row-checkbox] input[type="checkbox"]:checked').should('have.length', 4)
}) })

2
cypress/e2e/files_trashbin/files.cy.ts
Unescape Escape View File

@ -63,7 +63,7 @@ describe('files_trashbin: download files', { testIsolation: true }, () => {
it('does not offer bulk download', () => { it('does not offer bulk download', () => {
cy.get('[data-cy-files-list-row-checkbox]').should('have.length', 2) cy.get('[data-cy-files-list-row-checkbox]').should('have.length', 2)
selectAllFiles() selectAllFiles()
cy.get('.files-list__selected').should('have.text', '2 selected') cy.get('.files-list__selected').should('contain.text', '2 selected')
cy.get('[data-cy-files-list-selection-action="restore"]').should('be.visible') cy.get('[data-cy-files-list-selection-action="restore"]').should('be.visible')
cy.get('[data-cy-files-list-selection-action="download"]').should('not.exist') cy.get('[data-cy-files-list-selection-action="download"]').should('not.exist')
}) })