Skip to content

Commit 5020c73

Browse files
authored
Merge pull request #24999 from nextcloud/bugfix/noid/email-footer-language
Set the user language when adding the footer
2 parents 8294726 + 068e3b2 commit 5020c73

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

apps/settings/lib/Mailer/NewUserMailHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public function generateTemplate(IUser $user, $generatePasswordResetToken = fals
159159
);
160160
}
161161

162-
$emailTemplate->addFooter();
162+
$emailTemplate->addFooter('', $lang);
163163

164164
return $emailTemplate;
165165
}

apps/settings/tests/Mailer/NewUserMailHelperTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function testGenerateTemplateWithPasswordResetToken() {
139139
$this->timeFactory
140140
->expects($this->once())
141141
->method('getTime')
142-
->willReturn('12345');
142+
->willReturn(12345);
143143
/** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */
144144
$user = $this->createMock(IUser::class);
145145
$user
@@ -371,6 +371,7 @@ public function testGenerateTemplateWithPasswordResetToken() {
371371
372372
Your username is: john
373373
374+
374375
Set your password: https://example.com/resetPassword/MySuperLongSecureRandomToken
375376
Install Client: https://nextcloud.com/install/#install-clients
376377

0 commit comments

Comments
 (0)