Merge pull request #53589 from nextcloud/backport/53567/stable31

[stable31] fix(files): add plural form for selected nodes

Author: susnux

apps/files/src/components/FilesListVirtual.vue

@@ -20,7 +20,9 @@
 		</template>
 
 		<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"
 				:selected-nodes="selectedNodes" />
 		</template>
@@ -65,8 +67,8 @@ import type { Location } from 'vue-router'
 import { showError } from '@nextcloud/dialogs'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { Folder, Permission, View, getFileActions, FileType } from '@nextcloud/files'
-import { t } from '@nextcloud/l10n'
-import { useHotKey } from '@nextcloud/vue/dist/Composables/useHotKey.js'
+import { n, t } from '@nextcloud/l10n'
+import { useHotKey } from '@nextcloud/vue/composables/useHotKey'
 import { defineComponent } from 'vue'
 
 import { action as sidebarAction } from '../actions/sidebarAction.ts'
@@ -134,6 +136,7 @@ export default defineComponent({
 			selectionStore,
 			userConfigStore,
 
+			n,
 			t,
 		}
 	},

cypress/e2e/files/files-selection.cy.ts

@@ -40,7 +40,7 @@ describe('files: Select all files', { testIsolation: true }, () => {
 
 		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')
 
 		deselectAllFiles()
@@ -59,7 +59,7 @@ describe('files: Select all files', { testIsolation: true }, () => {
 
 		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)
 	})
 
@@ -70,7 +70,7 @@ describe('files: Select all files', { testIsolation: true }, () => {
 		selectRowForFile('readme.md')
 		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)
 
 	})

cypress/e2e/files_trashbin/files.cy.ts

@@ -63,7 +63,7 @@ describe('files_trashbin: download files', { testIsolation: true }, () => {
 	it('does not offer bulk download', () => {
 		cy.get('[data-cy-files-list-row-checkbox]').should('have.length', 2)
 		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="download"]').should('not.exist')
 	})