Merge pull request #24999 from nextcloud/bugfix/noid/email-footer-lan…

…guage Set the user language when adding the footer
nextcloud · Jan 7, 2021 · 5020c73 · 5020c73
2 parents 8294726 + 068e3b2
commit 5020c73
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
@@ -159,7 +159,7 @@ public function generateTemplate(IUser $user, $generatePasswordResetToken = fals
 			);
 		}
 
-		$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
-Original file line number
+Diff line change
@@ Expand Up @@
     			);
     		}
-    		$emailTemplate->addFooter();
+    		$emailTemplate->addFooter('', $lang);
     		return $emailTemplate;
     	}
@@ Expand Down @@