wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #18212 from nextcloud/bugfix/noid/subject-message-mixed-up

Browse source 
Fix mixed up message and subject on notifications for file transfer
This commit is contained in:
Roeland Jago Douma 2019-12-04 09:09:34 +01:00 committed by GitHub
commit 99ed3b2d52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/files/lib/Notification/Notifier.php
View file

@ -119,7 +119,7 @@ class Notifier implements INotifier {
$notification->addParsedAction($approveAction) $notification->addParsedAction($approveAction)
->addParsedAction($disapproveAction) ->addParsedAction($disapproveAction)
->setRichSubject( ->setRichSubject(
$l->t('Incomming file transfer from {user}'), $l->t('Incoming file transfer from {user}'),
[ [
'user' => [ 'user' => [
'type' => 'user', 'type' => 'user',
@ -127,7 +127,7 @@ class Notifier implements INotifier {
'name' => $param['sourceUser'], 'name' => $param['sourceUser'],
], ],
]) ])
->setParsedSubject(str_replace('{user}', $param['sourceUser'], $l->t('Incomming file transfer from {user}'))) ->setParsedSubject(str_replace('{user}', $param['sourceUser'], $l->t('Incoming file transfer from {user}')))
->setRichMessage( ->setRichMessage(
$l->t('Do you want to accept {path}?'), $l->t('Do you want to accept {path}?'),
[ [
@ -147,7 +147,8 @@ class Notifier implements INotifier {
$param = $notification->getSubjectParameters(); $param = $notification->getSubjectParameters();
$notification->setRichSubject($l->t('File transfer failed')) $notification->setRichSubject($l->t('File transfer failed'))
->setParsedSubject(str_replace(['{path}', '{user}'], [$param['nodeName'], $param['targetUser']], $l->t('Your transfer of {path} to {user} failed.'))) ->setParsedSubject($l->t('File transfer failed'))
->setRichMessage( ->setRichMessage(
$l->t('Your transfer of {path} to {user} failed.'), $l->t('Your transfer of {path} to {user} failed.'),
[ [
@ -162,7 +163,7 @@ class Notifier implements INotifier {
'name' => $param['targetUser'], 'name' => $param['targetUser'],
], ],
]) ])
->setParsedMessage($l->t('File transfer failed')); ->setParsedMessage(str_replace(['{path}', '{user}'], [$param['nodeName'], $param['targetUser']], $l->t('Your transfer of {path} to {user} failed.')));
return $notification; return $notification;
} }
@ -171,7 +172,8 @@ class Notifier implements INotifier {
$param = $notification->getSubjectParameters(); $param = $notification->getSubjectParameters();
$notification->setRichSubject($l->t('File transfer failed')) $notification->setRichSubject($l->t('File transfer failed'))
->setParsedSubject(str_replace(['{path}', '{user}'], [$param['nodeName'], $param['sourceUser']], $l->t('The transfer of {path} from {user} failed.'))) ->setParsedSubject($l->t('File transfer failed'))
->setRichMessage( ->setRichMessage(
$l->t('The transfer of {path} from {user} failed.'), $l->t('The transfer of {path} from {user} failed.'),
[ [
@ -186,7 +188,7 @@ class Notifier implements INotifier {
'name' => $param['sourceUser'], 'name' => $param['sourceUser'],
], ],
]) ])
->setParsedMessage($l->t('File transfer failed')); ->setParsedMessage(str_replace(['{path}', '{user}'], [$param['nodeName'], $param['sourceUser']], $l->t('The transfer of {path} from {user} failed.')));
return $notification; return $notification;
} }
@ -196,7 +198,8 @@ class Notifier implements INotifier {
$param = $notification->getSubjectParameters(); $param = $notification->getSubjectParameters();
$notification->setRichSubject($l->t('File transfer done')) $notification->setRichSubject($l->t('File transfer done'))
->setParsedSubject(str_replace(['{path}', '{user}'], [$param['nodeName'], $param['targetUser']], $l->t('Your transfer of {path} to {user} has completed.'))) ->setParsedSubject($l->t('File transfer done'))
->setRichMessage( ->setRichMessage(
$l->t('Your transfer of {path} to {user} has completed.'), $l->t('Your transfer of {path} to {user} has completed.'),
[ [
@ -211,7 +214,7 @@ class Notifier implements INotifier {
'name' => $param['targetUser'], 'name' => $param['targetUser'],
], ],
]) ])
->setParsedMessage($l->t('File transfer done')); ->setParsedMessage(str_replace(['{path}', '{user}'], [$param['nodeName'], $param['targetUser']], $l->t('Your transfer of {path} to {user} has completed.')));
return $notification; return $notification;
} }
@ -221,7 +224,8 @@ class Notifier implements INotifier {
$param = $notification->getSubjectParameters(); $param = $notification->getSubjectParameters();
$notification->setRichSubject($l->t('File transfer done')) $notification->setRichSubject($l->t('File transfer done'))
->setParsedSubject(str_replace(['{path}', '{user}'], [$param['nodeName'], $param['sourceUser']], $l->t('The transfer of {path} from {user} has completed.'))) ->setParsedSubject($l->t('File transfer done'))
->setRichMessage( ->setRichMessage(
$l->t('The transfer of {path} from {user} has completed.'), $l->t('The transfer of {path} from {user} has completed.'),
[ [
@ -236,7 +240,7 @@ class Notifier implements INotifier {
'name' => $param['sourceUser'], 'name' => $param['sourceUser'],
], ],
]) ])
->setParsedMessage($l->t('File transfer done')); ->setParsedMessage(str_replace(['{path}', '{user}'], [$param['nodeName'], $param['sourceUser']], $l->t('The transfer of {path} from {user} has completed.')));
return $notification; return $notification;
} }