Better shared-by info for conversations without names

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index 06e18fef3f2f650708d4c56b5f3e8aa334c0a437..b2d5a093990a571d156f476342ddc94c108ecd35 100644 (file)
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -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',