aboutsummaryrefslogtreecommitdiffstats
path: root/apps/sharebymail
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-10-03 12:57:22 +0200
committerGitHub <noreply@github.com>2018-10-03 12:57:22 +0200
commit71072a0b569ca8c9a8df48f8e1ac056c4ee65c33 (patch)
treeb9dead93ca23713c3c12dac4c363f45cfdbbe048 /apps/sharebymail
parent213d43f0438ba82dd93885fb22b7d0768ed6fe79 (diff)
parenta3849e60ba24e2a3e5fd38b788a55fab33bb5788 (diff)
downloadnextcloud-server-71072a0b569ca8c9a8df48f8e1ac056c4ee65c33.tar.gz
nextcloud-server-71072a0b569ca8c9a8df48f8e1ac056c4ee65c33.zip
Merge pull request #11338 from rubo77/password-br
sharebymail: Add linebreak before password
Diffstat (limited to 'apps/sharebymail')
-rw-r--r--apps/sharebymail/lib/ShareByMailProvider.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index 6cc27957bbe..9ae26442ac4 100644
--- a/apps/sharebymail/lib/ShareByMailProvider.php
+++ b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -479,7 +479,8 @@ class ShareByMailProvider implements IShareProvider {
$emailTemplate->addHeader();
$emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false);
$emailTemplate->addBodyText(htmlspecialchars($htmlBodyPart), $plainBodyPart);
- $emailTemplate->addBodyText($this->l->t('It is protected with the following password: %s', [$password]));
+ $emailTemplate->addBodyText($this->l->t('It is protected with the following password:'));
+ $emailTemplate->addBodyText($password);
// The "From" contains the sharers name
$instanceName = $this->defaults->getName();
@@ -600,7 +601,8 @@ class ShareByMailProvider implements IShareProvider {
$emailTemplate->addHeader();
$emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false);
$emailTemplate->addBodyText($bodyPart);
- $emailTemplate->addBodyText($this->l->t('This is the password: %s', [$password]));
+ $emailTemplate->addBodyText($this->l->t('This is the password:'));
+ $emailTemplate->addBodyText($password);
$emailTemplate->addBodyText($this->l->t('You can choose a different password at any time in the share dialog.'));
$emailTemplate->addFooter();