]> source.dussan.org Git - nextcloud-server.git/commitdiff
Fix missing placeholders in translations
authorJoas Schilling <coding@schilljs.com>
Mon, 3 Aug 2020 09:23:53 +0000 (11:23 +0200)
committerJoas Schilling <coding@schilljs.com>
Mon, 3 Aug 2020 09:23:53 +0000 (11:23 +0200)
Signed-off-by: Joas Schilling <coding@schilljs.com>
apps/federatedfilesharing/lib/Notifier.php

index 42a07abb38a8601f2d3edf5367c5460f7f68b7e7..0098d82d5c44abc84e74e8329e3ca99e178e244d 100644 (file)
@@ -102,13 +102,15 @@ class Notifier implements INotifier {
 
                                $params = $notification->getSubjectParameters();
                                if ($params[0] !== $params[1] && $params[1] !== null) {
+                                       $remoteInitiator = $this->createRemoteUser($params[0]);
+                                       $remoteOwner = $this->createRemoteUser($params[1]);
+                                       $params[3] = $remoteInitiator['name'] . '@' . $remoteInitiator['server'];
+                                       $params[4] = $remoteOwner['name'] . '@' . $remoteOwner['server'];
+
                                        $notification->setParsedSubject(
                                                $l->t('You received "%3$s" as a remote share from %4$s (%1$s) (on behalf of %5$s (%2$s))', $params)
                                        );
 
-                                       $initiator = $params[0];
-                                       $owner = $params[1];
-
                                        $notification->setRichSubject(
                                                $l->t('You received {share} as a remote share from {user} (on behalf of {behalf})'),
                                                [
@@ -117,16 +119,18 @@ class Notifier implements INotifier {
                                                                'id' => $notification->getObjectId(),
                                                                'name' => $params[2],
                                                        ],
-                                                       'user' => $this->createRemoteUser($initiator),
-                                                       'behalf' => $this->createRemoteUser($owner),
+                                                       'user' => $remoteInitiator,
+                                                       'behalf' => $remoteOwner,
                                                ]
                                        );
                                } else {
+                                       $remoteOwner = $this->createRemoteUser($params[0]);
+                                       $params[3] = $remoteOwner['name'] . '@' . $remoteOwner['server'];
+
                                        $notification->setParsedSubject(
                                                $l->t('You received "%3$s" as a remote share from %4$s (%1$s)', $params)
                                        );
 
-                                       $owner = $params[0];
 
                                        $notification->setRichSubject(
                                                $l->t('You received {share} as a remote share from {user}'),
@@ -136,7 +140,7 @@ class Notifier implements INotifier {
                                                                'id' => $notification->getObjectId(),
                                                                'name' => $params[2],
                                                        ],
-                                                       'user' => $this->createRemoteUser($owner),
+                                                       'user' => $remoteOwner,
                                                ]
                                        );
                                }