Browse Source

Merge pull request #44526 from nextcloud/bugfix/43947/delete-file-not-translated

pull/33397/merge
John Molakvoæ 1 month ago
parent
commit
e317ebdbad
No account linked to committer's email address
3 changed files with 19 additions and 7 deletions
  1. 16
    4
      apps/files/src/actions/deleteAction.ts
  2. 2
    2
      dist/files-init.js
  3. 1
    1
      dist/files-init.js.map

+ 16
- 4
apps/files/src/actions/deleteAction.ts View File

@@ -79,7 +79,10 @@ const displayName = (nodes: Node[], view: View) => {
* share, we can only unshare them.
*/
if (canUnshareOnly(nodes)) {
return n('files', 'Leave this share', 'Leave these shares', nodes.length)
if (nodes.length === 1) {
return t('files', 'Leave this share')
}
return t('files', 'Leave these shares')
}

/**
@@ -87,21 +90,30 @@ const displayName = (nodes: Node[], view: View) => {
* external storage, we can only disconnect it.
*/
if (canDisconnectOnly(nodes)) {
return n('files', 'Disconnect storage', 'Disconnect storages', nodes.length)
if (nodes.length === 1) {
return t('files', 'Disconnect storage')
}
return t('files', 'Disconnect storages')
}

/**
* If we're only selecting files, use proper wording
*/
if (isAllFiles(nodes)) {
return n('files', 'Delete file', 'Delete files', nodes.length)
if (nodes.length === 1) {
return t('files', 'Delete file')
}
return t('files', 'Delete files')
}

/**
* If we're only selecting folders, use proper wording
*/
if (isAllFolders(nodes)) {
return n('files', 'Delete folder', 'Delete folders', nodes.length)
if (nodes.length === 1) {
return t('files', 'Delete folder')
}
return t('files', 'Delete folders')
}

return t('files', 'Delete')

+ 2
- 2
dist/files-init.js
File diff suppressed because it is too large
View File


+ 1
- 1
dist/files-init.js.map
File diff suppressed because it is too large
View File


Loading…
Cancel
Save