diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2020-03-31 14:02:39 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2020-04-16 09:04:13 +0200 |
| commit | bb4dedb0156727ebd88a3f922fedc78436d7b701 (patch) | |
| tree | e1975ad11d4d3903c6c1520f93a1a398f80ac1b6 /apps | |
| parent | 078ac97939747eec246ed105830d4643b81d994c (diff) | |
| download | nextcloud-server-bb4dedb0156727ebd88a3f922fedc78436d7b701.tar.gz nextcloud-server-bb4dedb0156727ebd88a3f922fedc78436d7b701.zip | |
Provide the proper language to the mailer
Else we can't properly translate the footer in the recipients e-mail
language.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings/tests/Mailer/NewUserMailHelperTest.php | 6 | ||||
| -rw-r--r-- | apps/theming/lib/ThemingDefaults.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/settings/tests/Mailer/NewUserMailHelperTest.php b/apps/settings/tests/Mailer/NewUserMailHelperTest.php index c32bb601f31..e2ceec67d22 100644 --- a/apps/settings/tests/Mailer/NewUserMailHelperTest.php +++ b/apps/settings/tests/Mailer/NewUserMailHelperTest.php @@ -78,7 +78,7 @@ class NewUserMailHelperTest extends TestCase { $template = new EMailTemplate( $this->defaults, $this->urlGenerator, - $this->l10n, + $this->l10nFactory, 'test.TestTemplate', [] ); @@ -377,8 +377,8 @@ Set your password: https://example.com/resetPassword/MySuperLongSecureRandomToke Install Client: https://nextcloud.com/install/#install-clients --- -TestCloud - +-- +TestCloud - This is an automatically sent email, please do not reply. EOF; diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index 059dc55cb99..f0af45ba889 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -145,8 +145,8 @@ class ThemingDefaults extends \OC_Defaults { return $this->config->getAppValue('theming', 'url', $this->url); } - public function getSlogan() { - return \OCP\Util::sanitizeHTML($this->config->getAppValue('theming', 'slogan', parent::getSlogan())); + public function getSlogan(?string $lang = null) { + return \OCP\Util::sanitizeHTML($this->config->getAppValue('theming', 'slogan', parent::getSlogan($lang))); } public function getImprintUrl() { |