Skip to content

Commit

Permalink
Merge pull request #11171 from nextcloud/bugfix/noid/shared-by-info-f…
Browse files Browse the repository at this point in the history
…or-room-shares-without-names

Better shared-by info for conversations without names
  • Loading branch information
nickvergessen authored Sep 19, 2018
2 parents b75dde0 + 7f0de11 commit dda0dfd
Showing 1 changed file with 22 additions and 10 deletions.
32 changes: 22 additions & 10 deletions core/js/sharedialogresharerinfoview.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit dda0dfd

Please sign in to comment.