diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-07 16:19:21 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-07 16:19:21 +0100 |
| commit | 663f31b127f52149b4556294e209cfcc7c1688a4 (patch) | |
| tree | da07223b878d0ac5194131cf9663ba867058dcfe | |
| parent | 857030d13949e13da8b13797767c2f68b214c5ad (diff) | |
| parent | c6dbe8ac63eb4db135b045ca0dcec1dd5f3b4cbc (diff) | |
| download | nextcloud-server-663f31b127f52149b4556294e209cfcc7c1688a4.tar.gz nextcloud-server-663f31b127f52149b4556294e209cfcc7c1688a4.zip | |
Merge pull request #20993 from owncloud/issue-20666-language-always-overwritten
Do not overwrite the language when it's just missing for one app
| -rw-r--r-- | lib/private/l10n.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/private/l10n.php b/lib/private/l10n.php index 86335bce92f..7835285bd49 100644 --- a/lib/private/l10n.php +++ b/lib/private/l10n.php @@ -116,13 +116,17 @@ class OC_L10N implements \OCP\IL10N { $preferred_language = str_replace('-', '_', $preferred_language); foreach ($available as $available_language) { if ($preferred_language === strtolower($available_language)) { - self::$language = $available_language; + if (!self::$language) { + self::$language = $available_language; + } return $available_language; } } foreach ($available as $available_language) { if (substr($preferred_language, 0, 2) === $available_language) { - self::$language = $available_language; + if (!self::$language) { + self::$language = $available_language; + } return $available_language; } } @@ -407,7 +411,7 @@ class OC_L10N implements \OCP\IL10N { * If nothing works it returns 'en' */ public static function findLanguage($app = null) { - if(self::$language != '') { + if (self::$language != '' && self::languageExists($app, self::$language)) { return self::$language; } |