Skip to content

fix(files): use getSummaryFor for better files summary translations #42716

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 2 commits into from
Jan 12, 2024
Merged

fix(files): use getSummaryFor for better files summary translations #42716

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14da405
fix(files): use `getSummaryFor` for better files summary translations
skjnldsv Jan 11, 2024
fb8b42f
chore(assets): Recompile assets
skjnldsv Jan 12, 2024
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
Next Next commit
fix(files): use getSummaryFor for better files summary translations 
Signed-off-by: John Molakvoæ <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Jan 12, 2024
commit 14da405f928a59b9f388c9fe8d89f9deeeee173c
18 changes: 4 additions & 14 deletions apps/files/src/components/FilesListVirtual.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,9 @@ import { translate as t, translatePlural as n } from '@nextcloud/l10n'
import { defineComponent } from 'vue'
import { action as sidebarAction } from '../actions/sidebarAction.ts'
import { useUserConfigStore } from '../store/userconfig.ts'
import { getSummaryFor } from '../utils/fileUtils'
import { useSelectionStore } from '../store/selection.js'
import { useUserConfigStore } from '../store/userconfig.ts'
import FileEntry from './FileEntry.vue'
import FileEntryGrid from './FileEntryGrid.vue'
Expand Down Expand Up @@ -146,25 +147,14 @@ export default defineComponent({
return this.userConfigStore.userConfig
},
files() {
return this.nodes.filter(node => node.type === 'file')
},
fileId() {
return parseInt(this.$route.params.fileid) || null
},
summaryFile() {
const count = this.files.length
return n('files', '{count} file', '{count} files', count, { count })
},
summaryFolder() {
const count = this.nodes.length - this.files.length
return n('files', '{count} folder', '{count} folders', count, { count })
},
summary() {
return t('files', '{summaryFile} and {summaryFolder}', this)
return getSummaryFor(this.nodes)
},
isMtimeAvailable() {
// Hide mtime column on narrow screens
if (this.filesListWidth < 768) {
Expand Down