Skip to content

Commit

Permalink
Merge pull request #45024 from nextcloud/man/backport/44839/stable28
Browse files Browse the repository at this point in the history
[stable28] fix(files_sharing): Add one string for every share type + fix(sharingDetails): Show correct share target
  • Loading branch information
blizzz authored Jun 14, 2024
2 parents 2bcf13f + deafcc4 commit 3187425
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 24 deletions.
44 changes: 27 additions & 17 deletions apps/files_sharing/src/views/SharingDetailsTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -305,24 +305,34 @@ export default {
computed: {
title() {
let title = t('files_sharing', 'Share with ')
if (this.share.type === this.SHARE_TYPES.SHARE_TYPE_USER) {
title = title + this.share.shareWithDisplayName
} else if (this.share.type === this.SHARE_TYPES.SHARE_TYPE_LINK) {
title = t('files_sharing', 'Share link')
} else if (this.share.type === this.SHARE_TYPES.SHARE_TYPE_GROUP) {
title += ` (${t('files_sharing', 'group')})`
} else if (this.share.type === this.SHARE_TYPES.SHARE_TYPE_ROOM) {
title += ` (${t('files_sharing', 'conversation')})`
} else if (this.share.type === this.SHARE_TYPES.SHARE_TYPE_REMOTE) {
title += ` (${t('files_sharing', 'remote')})`
} else if (this.share.type === this.SHARE_TYPES.SHARE_TYPE_REMOTE_GROUP) {
title += ` (${t('files_sharing', 'remote group')})`
} else if (this.share.type === this.SHARE_TYPES.SHARE_TYPE_GUEST) {
title += ` (${t('files_sharing', 'guest')})`
switch (this.share.type) {
case this.SHARE_TYPES.SHARE_TYPE_USER:
return t('files_sharing', 'Share with {userName}', { userName: this.share.shareWithDisplayName })
case this.SHARE_TYPES.SHARE_TYPE_EMAIL:
return t('files_sharing', 'Share with email {email}', { email: this.share.shareWith })
case this.SHARE_TYPES.SHARE_TYPE_LINK:
return t('files_sharing', 'Share link')
case this.SHARE_TYPES.SHARE_TYPE_GROUP:
return t('files_sharing', 'Share with group')
case this.SHARE_TYPES.SHARE_TYPE_ROOM:
return t('files_sharing', 'Share in conversation')
case this.SHARE_TYPES.SHARE_TYPE_REMOTE: {
const [user, server] = this.share.shareWith.split('@')
return t('files_sharing', 'Share with {user} on remote server {server}', { user, server })
}
case this.SHARE_TYPES.SHARE_TYPE_REMOTE_GROUP:
return t('files_sharing', 'Share with remote group')
case this.SHARE_TYPES.SHARE_TYPE_GUEST:
return t('files_sharing', 'Share with guest')
default: {
if (this.share.id) {
// Share already exists
return t('files_sharing', 'Update share')
} else {
return t('files_sharing', 'Create share')
}
}
}
return title
},
/**
* Can the sharee edit the shared file ?
Expand Down
3 changes: 3 additions & 0 deletions dist/5552-5552.js

Large diffs are not rendered by default.

File renamed without changes.
1 change: 1 addition & 0 deletions dist/5552-5552.js.map

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions dist/6797-6797.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/6797-6797.js.map

This file was deleted.

4 changes: 2 additions & 2 deletions dist/files_sharing-files_sharing_tab.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/files_sharing-files_sharing_tab.js.map

Large diffs are not rendered by default.

0 comments on commit 3187425

Please sign in to comment.