upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-12 05:33:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

fix(files): correctly handle plural translation forms

Browse source 
Co-authored-by: Caitlin Jordan <jordan.cait17@gmail.com>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Caitlin Jordan 2025-02-25 10:08:53 -08:00 committed by skjnldsv
parent 6663676ca5
commit ee013b4789
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/files/src/actions/convertUtils.ts
View file

@ -8,7 +8,7 @@ import type { OCSResponse } from '@nextcloud/typings/ocs'
import { emit } from '@nextcloud/event-bus'
import { generateOcsUrl } from '@nextcloud/router'
import { showError, showLoading, showSuccess } from '@nextcloud/dialogs'
import { t } from '@nextcloud/l10n'
import { n, t } from '@nextcloud/l10n'
import axios, { isAxiosError } from '@nextcloud/axios'
import PQueue from 'p-queue'
@ -21,8 +21,8 @@ type ConversionResponse = {
}
interface PromiseRejectedResult<T> {
status: 'rejected'
reason: T
status: 'rejected'
reason: T
}
type PromiseSettledResult<T, E> = PromiseFulfilledResult<T> | PromiseRejectedResult<E>;
@ -62,23 +62,16 @@ export const convertFiles = async function(fileIds: number[], targetMimeType: st
return
}
// A single file failed
if (failed.length === 1) {
// If we have a message for the failed file, show it
if (messages[0]) {
showError(t('files', 'One file could not be converted: {message}', { message: messages[0] }))
return
}
// Otherwise, show a generic error
showError(t('files', 'One file could not be converted'))
// A single file failed and if we have a message for the failed file, show it
if (failed.length === 1 && messages[0]) {
showError(t('files', 'One file could not be converted: {message}', { message: messages[0] }))
return
}
// We already check above when all files failed
// if we're here, we have a mix of failed and successful files
showError(t('files', '{count} files could not be converted', { count: failed.length }))
showSuccess(t('files', '{count} files successfully converted', { count: fileIds.length - failed.length }))
showError(n('files', 'One file could not be converted', '%n files could not be converted', failed.length))
showSuccess(n('files', 'One file successfully converted', '%n files successfully converted', fileIds.length - failed.length))
return
}