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

Fix missing placeholders in translations 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2020-08-03 11:23:53 +02:00 committed by Arthur Schiwon
parent c6becac993
commit f213617704
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/federatedfilesharing/lib/Notifier.php
View File

@ -102,13 +102,15 @@ class Notifier implements INotifier {
$params = $notification->getSubjectParameters(); $params = $notification->getSubjectParameters();
if ($params[0] !== $params[1] && $params[1] !== null) { 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( $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) $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( $notification->setRichSubject(
$l->t('You received {share} as a remote share from {user} (on behalf of {behalf})'), $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(), 'id' => $notification->getObjectId(),
'name' => $params[2], 'name' => $params[2],
], ],
'user' => $this->createRemoteUser($initiator), 'user' => $remoteInitiator,
'behalf' => $this->createRemoteUser($owner), 'behalf' => $remoteOwner,
] ]
); );
} else { } else {
$remoteOwner = $this->createRemoteUser($params[0]);
$params[3] = $remoteOwner['name'] . '@' . $remoteOwner['server'];
$notification->setParsedSubject( $notification->setParsedSubject(
$l->t('You received "%3$s" as a remote share from %4$s (%1$s)', $params) $l->t('You received "%3$s" as a remote share from %4$s (%1$s)', $params)
); );
$owner = $params[0];
$notification->setRichSubject( $notification->setRichSubject(
$l->t('You received {share} as a remote share from {user}'), $l->t('You received {share} as a remote share from {user}'),
@ -136,7 +140,7 @@ class Notifier implements INotifier {
'id' => $notification->getObjectId(), 'id' => $notification->getObjectId(),
'name' => $params[2], 'name' => $params[2],
], ],
'user' => $this->createRemoteUser($owner), 'user' => $remoteOwner,
] ]
); );
} }