Skip to content

[stable19] fix display of remote users in incoming share notifications #22131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 5 commits into from
Aug 13, 2020
Merged

[stable19] fix display of remote users in incoming share notifications #22131

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69a3829
fix check for Cloud ID, missing return statements, wrong param use
blizzz Jul 30, 2020
f13d5a3
coding style fixes
blizzz Jul 30, 2020
c6becac
effectively revert 17fae47bdba84ed520fee2cbf1a9485cc14fbbcb fixing i10n
blizzz Aug 3, 2020
f213617
Fix missing placeholders in translations
nickvergessen Aug 3, 2020
5728f23
Short php syntax
nickvergessen Aug 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix missing placeholders in translations 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @blizzz
nickvergessen authored and blizzz committed Aug 6, 2020
commit f21361770418cc7d5246ef4d380b3619f7725b9a
18 changes: 11 additions & 7 deletions apps/federatedfilesharing/lib/Notifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,15 @@ public function prepare(INotification $notification, string $languageCode): INot

$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})'),
[
Expand All @@ -117,16 +119,18 @@ public function prepare(INotification $notification, string $languageCode): INot
'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}'),
Expand All @@ -136,7 +140,7 @@ public function prepare(INotification $notification, string $languageCode): INot
'id' => $notification->getObjectId(),
'name' => $params[2],
],
'user' => $this->createRemoteUser($owner),
'user' => $remoteOwner,
]
);
}
Expand Down