diff options
Diffstat (limited to 'lib/private/L10N')
| -rw-r--r-- | lib/private/L10N/Factory.php | 12 | ||||
| -rw-r--r-- | lib/private/L10N/LanguageIterator.php | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php index 593af02bd1c..1082662933f 100644 --- a/lib/private/L10N/Factory.php +++ b/lib/private/L10N/Factory.php @@ -195,7 +195,7 @@ class Factory implements IFactory { * * @link https://github.com/owncloud/core/issues/21955 */ - if ($this->config->getSystemValue('installed', false)) { + if ($this->config->getSystemValueBool('installed', false)) { $userId = !is_null($this->userSession->getUser()) ? $this->userSession->getUser()->getUID() : null; if (!is_null($userId)) { $userLang = $this->config->getUserValue($userId, 'core', 'lang', null); @@ -247,7 +247,7 @@ class Factory implements IFactory { } // Step 3.1: Check if Nextcloud is already installed before we try to access user info - if (!$this->config->getSystemValue('installed', false)) { + if (!$this->config->getSystemValueBool('installed', false)) { return 'en'; } // Step 3.2: Check the current user (if any) for their preferred language @@ -282,7 +282,7 @@ class Factory implements IFactory { return $forceLocale; } - if ($this->config->getSystemValue('installed', false)) { + if ($this->config->getSystemValueBool('installed', false)) { $userId = null !== $this->userSession->getUser() ? $this->userSession->getUser()->getUID() : null; $userLocale = null; if (null !== $userId) { @@ -366,7 +366,7 @@ class Factory implements IFactory { } // merge with translations from theme - $theme = $this->config->getSystemValue('theme'); + $theme = $this->config->getSystemValueString('theme'); if (!empty($theme)) { $themeDir = $this->serverRoot . '/themes/' . $theme . substr($dir, strlen($this->serverRoot)); @@ -452,7 +452,7 @@ class Factory implements IFactory { } } - return $this->config->getSystemValue('default_language', 'en'); + return $this->config->getSystemValueString('default_language', 'en'); } /** @@ -576,7 +576,7 @@ class Factory implements IFactory { } // merge with translations from theme - $theme = $this->config->getSystemValue('theme'); + $theme = $this->config->getSystemValueString('theme'); if (!empty($theme)) { $transFile = $this->serverRoot . '/themes/' . $theme . substr($transFile, strlen($this->serverRoot)); if (file_exists($transFile)) { diff --git a/lib/private/L10N/LanguageIterator.php b/lib/private/L10N/LanguageIterator.php index b3549782d54..8b3aaf10210 100644 --- a/lib/private/L10N/LanguageIterator.php +++ b/lib/private/L10N/LanguageIterator.php @@ -93,10 +93,10 @@ class LanguageIterator implements ILanguageIterator { $this->next(); // no break case 4: - return $this->config->getSystemValue('default_language', 'en'); + return $this->config->getSystemValueString('default_language', 'en'); /** @noinspection PhpMissingBreakStatementInspection */ case 5: - $defaultLang = $this->config->getSystemValue('default_language', 'en'); + $defaultLang = $this->config->getSystemValueString('default_language', 'en'); if (($truncated = $this->getTruncatedLanguage($defaultLang)) !== $defaultLang) { return $truncated; } |