diff options
| -rw-r--r-- | apps/sharebymail/lib/ShareByMailProvider.php | 4 | ||||
| -rw-r--r-- | apps/sharebymail/tests/ShareByMailProviderTest.php | 24 | ||||
| -rw-r--r-- | lib/private/Share20/DefaultShareProvider.php | 19 |
3 files changed, 16 insertions, 31 deletions
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index 9efc0ec2513..a9e6add2359 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -333,7 +333,6 @@ class ShareByMailProvider extends DefaultShareProvider implements IShareProvider $emailTemplate->setSubject($this->l->t('%1$s shared %2$s with you', [$initiatorDisplayName, $filename])); $emailTemplate->addHeader(); $emailTemplate->addHeading($this->l->t('%1$s shared %2$s with you', [$initiatorDisplayName, $filename]), false); - $text = $this->l->t('%1$s shared %2$s with you.', [$initiatorDisplayName, $filename]); if ($note !== '') { $emailTemplate->addBodyListItem( @@ -354,8 +353,7 @@ class ShareByMailProvider extends DefaultShareProvider implements IShareProvider } $emailTemplate->addBodyText( - htmlspecialchars($text . ' ' . $this->l->t('Click the button below to open it.')), - $text + $this->l->t('Click the button below to open it.') ); $emailTemplate->addBodyButton( diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php index 9f5434dbe5a..f7325fc248a 100644 --- a/apps/sharebymail/tests/ShareByMailProviderTest.php +++ b/apps/sharebymail/tests/ShareByMailProviderTest.php @@ -1292,10 +1292,7 @@ class ShareByMailProviderTest extends TestCase { $template ->expects($this->once()) ->method('addBodyText') - ->with( - 'Mrs. Owner User shared file.txt with you. Click the button below to open it.', - 'Mrs. Owner User shared file.txt with you.' - ); + ->with('Click the button below to open it.'); $template ->expects($this->once()) ->method('addBodyButton') @@ -1405,7 +1402,7 @@ class ShareByMailProviderTest extends TestCase { $template ->expects($this->once()) ->method('addBodyText') - ->with('Mrs. Owner User shared file.txt with you. Click the button below to open it.', 'Mrs. Owner User shared file.txt with you.'); + ->with('Click the button below to open it.'); $this->urlGenerator->expects($this->once())->method('imagePath') ->with('core', 'caldav/description.png') @@ -1531,7 +1528,7 @@ class ShareByMailProviderTest extends TestCase { $template ->expects($this->once()) ->method('addBodyText') - ->with('Mrs. Owner User shared file.txt with you. Click the button below to open it.', 'Mrs. Owner User shared file.txt with you.'); + ->with('Click the button below to open it.'); $expiration = new DateTime('2001-01-01'); $this->l->expects($this->once()) @@ -1663,10 +1660,7 @@ class ShareByMailProviderTest extends TestCase { $template ->expects($this->once()) ->method('addBodyText') - ->with( - 'Mr. Initiator User shared file.txt with you. Click the button below to open it.', - 'Mr. Initiator User shared file.txt with you.' - ); + ->with('Click the button below to open it.'); $template ->expects($this->once()) ->method('addBodyButton') @@ -1767,10 +1761,7 @@ class ShareByMailProviderTest extends TestCase { $template ->expects($this->once()) ->method('addBodyText') - ->with( - 'Mrs. Owner User shared file.txt with you. Click the button below to open it.', - 'Mrs. Owner User shared file.txt with you.' - ); + ->with('Click the button below to open it.'); $template ->expects($this->once()) ->method('addBodyButton') @@ -1875,10 +1866,7 @@ class ShareByMailProviderTest extends TestCase { $template ->expects($this->once()) ->method('addBodyText') - ->with( - 'Mr. Initiator User shared file.txt with you. Click the button below to open it.', - 'Mr. Initiator User shared file.txt with you.' - ); + ->with('Click the button below to open it.'); $template ->expects($this->once()) ->method('addBodyButton') diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index 40fbae541ce..b39e5a71782 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -1512,21 +1512,20 @@ class DefaultShareProvider implements IShareProviderWithNotification, IShareProv 'shareWith' => $shareWith, ]); - $emailTemplate->setSubject($l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename])); + $emailTemplate->setSubject($l->t('%1$s shared %2$s with you', [$initiatorDisplayName, $filename])); $emailTemplate->addHeader(); - $emailTemplate->addHeading($l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]), false); - $text = $l->t('%1$s shared »%2$s« with you.', [$initiatorDisplayName, $filename]); + $emailTemplate->addHeading($l->t('%1$s shared %2$s with you', [$initiatorDisplayName, $filename]), false); if ($note !== '') { $emailTemplate->addBodyText(htmlspecialchars($note), $note); } $emailTemplate->addBodyText( - htmlspecialchars($text . ' ' . $l->t('Click the button below to open it.')), - $text + $l->t('Click the button below to open it.') ); + $emailTemplate->addBodyButton( - $l->t('Open »%s«', [$filename]), + $l->t('Open %s', [$filename]), $link ); @@ -1601,20 +1600,20 @@ class DefaultShareProvider implements IShareProviderWithNotification, IShareProv $initiatorUser = $this->userManager->get($initiator); $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator; $initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null; - $plainHeading = $l->t('%1$s shared »%2$s« with you and wants to add:', [$initiatorDisplayName, $filename]); - $htmlHeading = $l->t('%1$s shared »%2$s« with you and wants to add', [$initiatorDisplayName, $filename]); + $plainHeading = $l->t('%1$s shared %2$s with you and wants to add:', [$initiatorDisplayName, $filename]); + $htmlHeading = $l->t('%1$s shared %2$s with you and wants to add', [$initiatorDisplayName, $filename]); $message = $this->mailer->createMessage(); $emailTemplate = $this->mailer->createEMailTemplate('defaultShareProvider.sendNote'); - $emailTemplate->setSubject($l->t('»%s« added a note to a file shared with you', [$initiatorDisplayName])); + $emailTemplate->setSubject($l->t('%s added a note to a file shared with you', [$initiatorDisplayName])); $emailTemplate->addHeader(); $emailTemplate->addHeading($htmlHeading, $plainHeading); $emailTemplate->addBodyText(htmlspecialchars($note), $note); $link = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $share->getNode()->getId()]); $emailTemplate->addBodyButton( - $l->t('Open »%s«', [$filename]), + $l->t('Open %s', [$filename]), $link ); |