mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11171 from nextcloud/bugfix/noid/shared-by-info-for-room-shares-without-names 

Better shared-by info for conversations without names
This commit is contained in:
Joas Schilling 2018-09-19 13:45:31 +02:00 committed by GitHub
parent b75dde0c9a 7f0de11bd5
commit dda0dfd5f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/js/sharedialogresharerinfoview.js
View File

@ -100,16 +100,28 @@
{escape: false}
);
} else if (this.model.getReshareType() === OC.Share.SHARE_TYPE_ROOM) {
sharedByText = t(
'core',
'Shared with you and the conversation {conversation} by {owner}',
{
conversation: this.model.getReshareWithDisplayName(),
owner: ownerDisplayName
},
undefined,
{escape: false}
);
if (this.model.get('reshare').share_with_displayname) {
sharedByText = t(
'core',
'Shared with you and the conversation {conversation} by {owner}',
{
conversation: this.model.getReshareWithDisplayName(),
owner: ownerDisplayName
},
undefined,
{escape: false}
);
} else {
sharedByText = t(
'core',
'Shared with you in a conversation by {owner}',
{
owner: ownerDisplayName
},
undefined,
{escape: false}
);
}
} else {
sharedByText = t(
'core',