Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2021-01-07 12:41:09 +0300
committerJulius Härtl <jus@bitgrid.net>2021-01-07 17:31:55 +0300
commit068e3b2c1e5293a1a19e78f60fd75e11d8e6d2de (patch)
treebf1d6bdd7e5206ce2e8c85f6d4b2bfaf837bd9e7 /apps
parent82947263b90bb350501024da58809e7223fc4087 (diff)
Set the user language when adding the footer
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps')
-rw-r--r--apps/settings/lib/Mailer/NewUserMailHelper.php2
-rw-r--r--apps/settings/tests/Mailer/NewUserMailHelperTest.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/settings/lib/Mailer/NewUserMailHelper.php b/apps/settings/lib/Mailer/NewUserMailHelper.php
index 5caa441a245..f8dfeec30ff 100644
--- a/apps/settings/lib/Mailer/NewUserMailHelper.php
+++ b/apps/settings/lib/Mailer/NewUserMailHelper.php
@@ -159,7 +159,7 @@ class NewUserMailHelper {
);
}
- $emailTemplate->addFooter();
+ $emailTemplate->addFooter('', $lang);
return $emailTemplate;
}
diff --git a/apps/settings/tests/Mailer/NewUserMailHelperTest.php b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
index 195ab3e7c5c..112aed997ce 100644
--- a/apps/settings/tests/Mailer/NewUserMailHelperTest.php
+++ b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
@@ -139,7 +139,7 @@ class NewUserMailHelperTest extends TestCase {
$this->timeFactory
->expects($this->once())
->method('getTime')
- ->willReturn('12345');
+ ->willReturn(12345);
/** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */
$user = $this->createMock(IUser::class);
$user
@@ -371,6 +371,7 @@ Welcome to your TestCloud account, you can add, protect, and share your data.
Your username is: john
+
Set your password: https://example.com/resetPassword/MySuperLongSecureRandomToken
Install Client: https://nextcloud.com/install/#install-clients