Merge pull request #24463 from nextcloud/backport/24460/stable19

[stable19] Use correct l10n source in files_sharing JS code
This commit is contained in:
Roeland Jago Douma 2020-12-01 08:47:58 +01:00 committed by GitHub
commit 2e1c583fbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -177,12 +177,12 @@
var shareType = parseInt(context.$file.data('share-types'), 10) var shareType = parseInt(context.$file.data('share-types'), 10)
var shareOwner = context.$file.data('share-owner-id') var shareOwner = context.$file.data('share-owner-id')
if (shareType >= 0 || shareOwner) { if (shareType >= 0 || shareOwner) {
return t('core', 'Shared') return t('files_sharing', 'Shared')
} }
} }
return t('core', 'Share') return t('files_sharing', 'Share')
}, },
altText: t('core', 'Share'), altText: t('files_sharing', 'Share'),
mime: 'all', mime: 'all',
order: -150, order: -150,
permissions: OC.PERMISSION_ALL, permissions: OC.PERMISSION_ALL,
@ -316,10 +316,10 @@
recipients = $tr.data('share-recipient-data') recipients = $tr.data('share-recipient-data')
action.addClass('shared-style') action.addClass('shared-style')
avatars = '<span>' + t('core', 'Shared') + '</span>' avatars = '<span>' + t('files_sharing', 'Shared') + '</span>'
// even if reshared, only show "Shared by" // even if reshared, only show "Shared by"
if (ownerId) { if (ownerId) {
message = t('core', 'Shared by') message = t('files_sharing', 'Shared by')
avatars = OCA.Sharing.Util._formatRemoteShare(ownerId, owner, message) avatars = OCA.Sharing.Util._formatRemoteShare(ownerId, owner, message)
} else if (recipients) { } else if (recipients) {
avatars = OCA.Sharing.Util._formatShareList(recipients) avatars = OCA.Sharing.Util._formatShareList(recipients)
@ -334,7 +334,7 @@
action.find('span[title]').tooltip({ placement: 'top' }) action.find('span[title]').tooltip({ placement: 'top' })
} }
} else { } else {
action.html('<span class="hidden-visually">' + t('core', 'Shared') + '</span>').prepend(icon) action.html('<span class="hidden-visually">' + t('files_sharing', 'Shared') + '</span>').prepend(icon)
} }
if (hasLink) { if (hasLink) {
iconClass = 'icon-public' iconClass = 'icon-public'
@ -395,7 +395,7 @@
return a.shareWithDisplayName.localeCompare(b.shareWithDisplayName) return a.shareWithDisplayName.localeCompare(b.shareWithDisplayName)
}) })
return $.map(recipients, function(recipient) { return $.map(recipients, function(recipient) {
return _parent._formatRemoteShare(recipient.shareWith, recipient.shareWithDisplayName, t('core', 'Shared with')) return _parent._formatRemoteShare(recipient.shareWith, recipient.shareWithDisplayName, t('files_sharing', 'Shared with'))
}) })
}, },
@ -451,10 +451,10 @@
recipients = $tr.data('share-recipient-data') recipients = $tr.data('share-recipient-data')
action.addClass('shared-style') action.addClass('shared-style')
avatars = '<span>' + t('core', 'Shared') + '</span>' avatars = '<span>' + t('files_sharing', 'Shared') + '</span>'
// even if reshared, only show "Shared by" // even if reshared, only show "Shared by"
if (ownerId) { if (ownerId) {
message = t('core', 'Shared by') message = t('files_sharing', 'Shared by')
avatars = this._formatRemoteShare(ownerId, owner, message) avatars = this._formatRemoteShare(ownerId, owner, message)
} else if (recipients) { } else if (recipients) {
avatars = this._formatShareList(recipients) avatars = this._formatShareList(recipients)
@ -469,7 +469,7 @@
action.find('span[title]').tooltip({ placement: 'top' }) action.find('span[title]').tooltip({ placement: 'top' })
} }
} else { } else {
action.html('<span class="hidden-visually">' + t('core', 'Shared') + '</span>').prepend(icon) action.html('<span class="hidden-visually">' + t('files_sharing', 'Shared') + '</span>').prepend(icon)
} }
if (hasLink) { if (hasLink) {
iconClass = 'icon-public' iconClass = 'icon-public'