upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

fix(files): make sure to always have proper plural forms

Browse source 
counted words should always be translated using `n`.
We can still simply concat the segments with punctation, this always
works regardless of the language used (even with RTL / LTR languages).

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2025-04-19 00:36:04 +02:00
parent 2e65f43eb2
commit f699595748
No known key found for this signature in database
GPG key ID: 45FAE7268762B400
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
apps/files/src/utils/fileUtils.ts
View file

@ -3,15 +3,15 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import { FileType, type Node } from '@nextcloud/files'
import { translate as t, translatePlural as n } from '@nextcloud/l10n'
import { n } from '@nextcloud/l10n'
/**
* Extract dir and name from file path
*
* @param {string} path the full path
* @return {string[]} [dirPath, fileName]
* @param path - The full path
* @return [dirPath, fileName]
*/
export const extractFilePaths = function(path) {
export function extractFilePaths(path: string): [string, string] {
const pathSections = path.split('/')
const fileName = pathSections[pathSections.length - 1]
const dirPath = pathSections.slice(0, pathSections.length - 1).join('/')
@ -20,26 +20,28 @@ export const extractFilePaths = function(path) {
/**
* Generate a translated summary of an array of nodes
* @param {Node[]} nodes the nodes to summarize
* @return {string}
*
* @param nodes - The nodes to summarize
* @param hidden - The number of hidden nodes
*/
export const getSummaryFor = (nodes: Node[]): string => {
export function getSummaryFor(nodes: Node[], hidden = 0): string {
const fileCount = nodes.filter(node => node.type === FileType.File).length
const folderCount = nodes.filter(node => node.type === FileType.Folder).length
if (fileCount === 0) {
return n('files', '{folderCount} folder', '{folderCount} folders', folderCount, { folderCount })
} else if (folderCount === 0) {
return n('files', '{fileCount} file', '{fileCount} files', fileCount, { fileCount })
const summary: string[] = []
if (fileCount > 0 || folderCount === 0) {
const fileSummary = n('files', '%n file', '%n files', fileCount)
summary.push(fileSummary)
}
if (folderCount > 0) {
const folderSummary = n('files', '%n folder', '%n folders', folderCount)
summary.push(folderSummary)
}
if (hidden > 0) {
// TRANSLATORS: This is the number of hidden files or folders
const hiddenSummary = n('files', '%n hidden', '%n hidden', hidden)
summary.push(hiddenSummary)
}
if (fileCount === 1) {
return n('files', '1 file and {folderCount} folder', '1 file and {folderCount} folders', folderCount, { folderCount })
}
if (folderCount === 1) {
return n('files', '{fileCount} file and 1 folder', '{fileCount} files and 1 folder', fileCount, { fileCount })
}
return t('files', '{fileCount} files and {folderCount} folders', { fileCount, folderCount })
return summary.join(' · ')
}