improve mail text

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
nextcloud · Apr 19, 2017 · 5eb0cda · 5eb0cda
1 parent 20c3df8
commit 5eb0cda
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -485,15 +485,14 @@ protected function sendPasswordToOwner(IShare $share, $password) {
 		}
 
 		$subject = (string)$this->l->t('Password to access »%s« shared with %s', [$filename, $shareWith]);
-		$plainBodyPart = $this->l->t("You just shared »%s« with %s.\nThe share was already send to the recipient. Due to the security policies\neach share needs to be protected by password and it is not allowed to send the\npassword directly by mail to the recipient. Therefore you need to forward\nthe password manually to the recipient.", [$filename, $shareWith]);
-		$htmlBodyPart = $this->l->t('You just shared »%s« with %s. The share was already send to the recipient. Due to the security policies each share needs to be protected by password and it is not allowed to send the password directly by mail to the recipient. Therefore you need to forward the password manually to the recipient.', [$filename, $shareWith]);
+		$bodyPart = $this->l->t("You just shared »%s« with %s. The share was already send to the recipient. Due to the security policies defined by the administrator of %s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.", [$filename, $shareWith, $this->defaults->getName()]);
 
 		$message = $this->mailer->createMessage();
 		$emailTemplate = $this->mailer->createEMailTemplate();
 
 		$emailTemplate->addHeader();
 		$emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false);
-		$emailTemplate->addBodyText($htmlBodyPart, $plainBodyPart);
+		$emailTemplate->addBodyText($bodyPart);
 		$emailTemplate->addBodyText($this->l->t('This is the password: %s', [$password]));
 		$emailTemplate->addBodyText($this->l->t('You can chose a different password at any time in the share dialog.'));
 		$emailTemplate->addFooter();