summaryrefslogtreecommitdiffstats
path: root/apps/settings
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-04-20 20:31:30 +0200
committerGitHub <noreply@github.com>2020-04-20 20:31:30 +0200
commitfc09807ae6e0837c936d382d0e2adced297eb301 (patch)
tree79eafc6c38868300bbeb5a84666b8a8825624a8e /apps/settings
parent1e29d6923deee1b4a848ae42be5ff250223ebe8d (diff)
parent7550043371db98433a2eecb0f0baa9a0640a52c7 (diff)
downloadnextcloud-server-fc09807ae6e0837c936d382d0e2adced297eb301.tar.gz
nextcloud-server-fc09807ae6e0837c936d382d0e2adced297eb301.zip
Merge pull request #20512 from nextcloud/backport/20246/stable18
[stable18] Provide the proper language to the mailer
Diffstat (limited to 'apps/settings')
-rw-r--r--apps/settings/tests/Mailer/NewUserMailHelperTest.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/settings/tests/Mailer/NewUserMailHelperTest.php b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
index a6371c37a92..d93ed6e9eae 100644
--- a/apps/settings/tests/Mailer/NewUserMailHelperTest.php
+++ b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
@@ -79,7 +79,7 @@ class NewUserMailHelperTest extends TestCase {
$template = new EMailTemplate(
$this->defaults,
$this->urlGenerator,
- $this->l10n,
+ $this->l10nFactory,
'test.TestTemplate',
[]
);
@@ -378,8 +378,8 @@ Set your password: https://example.com/resetPassword/MySuperLongSecureRandomToke
Install Client: https://nextcloud.com/install/#install-clients
---
-TestCloud -
+--
+TestCloud -
This is an automatically sent email, please do not reply.
EOF;