Merge pull request #25019 from nextcloud/backport/24999/stable20

[stable20] Set the user language when adding the footer
nextcloud · Jan 11, 2021 · 08f6444 · 08f6444
2 parents 43ec70d + 3638808
commit 08f6444
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/apps/settings/lib/Mailer/NewUserMailHelper.php b/apps/settings/lib/Mailer/NewUserMailHelper.php
@@ -149,7 +149,7 @@ public function generateTemplate(IUser $user, $generatePasswordResetToken = fals
 			$l10n->t('Install Client'),
 			$this->config->getSystemValue('customclient_desktop', 'https://nextcloud.com/install/#install-clients')
 		);
-		$emailTemplate->addFooter();
+		$emailTemplate->addFooter('', $lang);
 
 		return $emailTemplate;
 	}

diff --git a/apps/settings/tests/Mailer/NewUserMailHelperTest.php b/apps/settings/tests/Mailer/NewUserMailHelperTest.php
@@ -139,7 +139,7 @@ public function testGenerateTemplateWithPasswordResetToken() {
 		$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 @@ public function testGenerateTemplateWithPasswordResetToken() {
 
 Your username is: john
 
+
 Set your password: https://example.com/resetPassword/MySuperLongSecureRandomToken
 Install Client: https://nextcloud.com/install/#install-clients