mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

[stable20] Set the user language when adding the footer
This commit is contained in:
Morris Jobke 2021-01-11 10:24:17 +01:00 committed by GitHub
parent 43ec70d43b 36388085f6
commit 08f6444474
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/settings/lib/Mailer/NewUserMailHelper.php
View File

@ -149,7 +149,7 @@ class NewUserMailHelper {
$l10n->t('Install Client'), $l10n->t('Install Client'),
$this->config->getSystemValue('customclient_desktop', 'https://nextcloud.com/install/#install-clients') $this->config->getSystemValue('customclient_desktop', 'https://nextcloud.com/install/#install-clients')
); );
$emailTemplate->addFooter(); $emailTemplate->addFooter('', $lang);
return $emailTemplate; return $emailTemplate;
} }

3
apps/settings/tests/Mailer/NewUserMailHelperTest.php
View File

@ -139,7 +139,7 @@ class NewUserMailHelperTest extends TestCase {
$this->timeFactory $this->timeFactory
->expects($this->once()) ->expects($this->once())
->method('getTime') ->method('getTime')
->willReturn('12345'); ->willReturn(12345);
/** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */ /** @var IUser|\PHPUnit\Framework\MockObject\MockObject $user */
$user = $this->createMock(IUser::class); $user = $this->createMock(IUser::class);
$user $user
@ -371,6 +371,7 @@ Welcome to your TestCloud account, you can add, protect, and share your data.
Your username is: john Your username is: john
Set your password: https://example.com/resetPassword/MySuperLongSecureRandomToken Set your password: https://example.com/resetPassword/MySuperLongSecureRandomToken
Install Client: https://nextcloud.com/install/#install-clients Install Client: https://nextcloud.com/install/#install-clients