diff options
| author | Joas Schilling <coding@schilljs.com> | 2020-06-23 08:45:01 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2020-07-03 10:59:43 +0200 |
| commit | db8267db26e2e81ef4a39b424c5a8ea7bc124bfd (patch) | |
| tree | 0d63e8dd40150166639f84083bfaf37cd9c52077 /lib | |
| parent | b997edad105d38703351b89998444ab0828f7d05 (diff) | |
| download | nextcloud-server-db8267db26e2e81ef4a39b424c5a8ea7bc124bfd.tar.gz nextcloud-server-db8267db26e2e81ef4a39b424c5a8ea7bc124bfd.zip | |
Use the new method everywhere
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Share20/DefaultShareProvider.php | 5 | ||||
| -rw-r--r-- | lib/private/Share20/Manager.php | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index 202b11a6c3d..ecfe282dfbf 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -1401,10 +1401,7 @@ class DefaultShareProvider implements IShareProvider { /** @var IUser $recipient */ $email = $recipient->getEMailAddress(); if ($email) { - $language = $this->config->getSystemValue('force_language', false); - $language = \is_string($language) ? $language : $this->config->getUserValue($recipient->getUID(), 'core', 'lang', null); - $language = $language ?? $this->config->getSystemValue('default_language', 'en'); - + $language = $this->l10nFactory->getUserLanguage($recipient); if (!isset($toListByLanguage[$language])) { $toListByLanguage[$language] = []; } diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 289545f0a46..24aa54ea0d6 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -805,7 +805,7 @@ class Manager implements IManager { if ($user !== null) { $emailAddress = $user->getEMailAddress(); if ($emailAddress !== null && $emailAddress !== '') { - $userLang = $this->config->getUserValue($share->getSharedWith(), 'core', 'lang', null); + $userLang = $this->l10nFactory->getUserLanguage($user); $l = $this->l10nFactory->get('lib', $userLang); $this->sendMailNotification( $l, |