Skip to content

Commit abc5c53

Browse files
committed
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>
1 parent 98871fe commit abc5c53

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

apps/files/src/components/FilesListVirtual.vue

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
</template>
2222

2323
<template v-if="!isNoneSelected" #header-overlay>
24-
<span class="files-list__selected">{{ t('files', '{count} selected', { count: selectedNodes.length }) }}</span>
24+
<span class="files-list__selected">
25+
{{ n('files', '{count} selected', '{count} selected', selectedNodes.length, { count: selectedNodes.length }) }}
26+
</span>
2527
<FilesListTableHeaderActions :current-view="currentView"
2628
:selected-nodes="selectedNodes" />
2729
</template>
@@ -68,7 +70,7 @@ import type { Location } from 'vue-router'
6870
import { Folder, Permission, View, getFileActions, FileType } from '@nextcloud/files'
6971
import { showError } from '@nextcloud/dialogs'
7072
import { subscribe, unsubscribe } from '@nextcloud/event-bus'
71-
import { translate as t } from '@nextcloud/l10n'
73+
import { n, t } from '@nextcloud/l10n'
7274
import { useHotKey } from '@nextcloud/vue/composables/useHotKey'
7375
import { defineComponent } from 'vue'
7476
@@ -140,6 +142,7 @@ export default defineComponent({
140142
selectionStore,
141143
userConfigStore,
142144
145+
n,
143146
t,
144147
}
145148
},

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ describe('files: Select all files', { testIsolation: true }, () => {
4040

4141
selectAllFiles()
4242

43-
cy.get('.files-list__selected').should('have.text', '7 selected')
43+
cy.get('.files-list__selected').should('contain.text', '7 selected')
4444
cy.get('[data-cy-files-list-row-checkbox]').findByRole('checkbox').should('be.checked')
4545

4646
deselectAllFiles()
@@ -59,7 +59,7 @@ describe('files: Select all files', { testIsolation: true }, () => {
5959

6060
randomFiles.forEach(name => selectRowForFile(name))
6161

62-
cy.get('.files-list__selected').should('have.text', `${randomFiles.length} selected`)
62+
cy.get('.files-list__selected').should('contain.text', `${randomFiles.length} selected`)
6363
cy.get('[data-cy-files-list-row-checkbox] input[type="checkbox"]:checked').should('have.length', randomFiles.length)
6464
})
6565

@@ -70,7 +70,7 @@ describe('files: Select all files', { testIsolation: true }, () => {
7070
selectRowForFile('readme.md')
7171
cy.window().trigger('keyup', { key: 'ShiftLeft', shiftKey: true })
7272

73-
cy.get('.files-list__selected').should('have.text', '4 selected')
73+
cy.get('.files-list__selected').should('contain.text', '4 selected')
7474
cy.get('[data-cy-files-list-row-checkbox] input[type="checkbox"]:checked').should('have.length', 4)
7575

7676
})

0 commit comments

Comments
 (0)