diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-10-16 09:01:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-16 09:01:59 +0200 |
| commit | afaee648dd056d382adc2701dc487fc82fac49ea (patch) | |
| tree | bb6c042267cd050c44b69982a8349ec9cc9c7382 /apps/provisioning_api/lib | |
| parent | 5aaa8a8b5815a24245da6c7a91efb2564492c13f (diff) | |
| parent | cf266ee00491bc0e70fbbb7dc9720a9e2f8c3708 (diff) | |
| download | nextcloud-server-afaee648dd056d382adc2701dc487fc82fac49ea.tar.gz nextcloud-server-afaee648dd056d382adc2701dc487fc82fac49ea.zip | |
Merge pull request #11358 from Zulan/fix-welcome-l10n
Fix welcome l10n
Diffstat (limited to 'apps/provisioning_api/lib')
| -rw-r--r-- | apps/provisioning_api/lib/AppInfo/Application.php | 2 | ||||
| -rw-r--r-- | apps/provisioning_api/lib/Controller/UsersController.php | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/apps/provisioning_api/lib/AppInfo/Application.php b/apps/provisioning_api/lib/AppInfo/Application.php index b7a93d6fb13..7e9e04978fe 100644 --- a/apps/provisioning_api/lib/AppInfo/Application.php +++ b/apps/provisioning_api/lib/AppInfo/Application.php @@ -43,7 +43,7 @@ class Application extends App { return new NewUserMailHelper( $server->query(Defaults::class), $server->getURLGenerator(), - $server->getL10N('settings'), + $server->getL10NFactory(), $server->getMailer(), $server->getSecureRandom(), new TimeFactory(), diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 9aa32e1186a..27d66a83c81 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -894,16 +894,8 @@ class UsersController extends AUserData { if ($email === '' || $email === null) { throw new OCSException('Email address not available', 101); } - $username = $targetUser->getUID(); - $lang = $this->config->getUserValue($username, 'core', 'lang', 'en'); - if (!$this->l10nFactory->languageExists('settings', $lang)) { - $lang = 'en'; - } - - $l10n = $this->l10nFactory->get('settings', $lang); try { - $this->newUserMailHelper->setL10N($l10n); $emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false); $this->newUserMailHelper->sendMail($targetUser, $emailTemplate); } catch(\Exception $e) { |