From 2a21471c74dc5a5e5e9859000316b385007d4d56 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 9 May 2018 12:05:46 +0200 Subject: make sure force language is reflected in html lang attribute Signed-off-by: Georg Ehrke --- lib/private/L10N/Factory.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/private/L10N/Factory.php') diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php index a7ffb401b7b..74cea7aa843 100644 --- a/lib/private/L10N/Factory.php +++ b/lib/private/L10N/Factory.php @@ -130,6 +130,12 @@ class Factory implements IFactory { return $this->requestLanguage; } + $forceLang = $this->config->getSystemValue('force_language', false); + if (is_string($forceLang) && $this->languageExists($app, $forceLang)) { + $this->requestLanguage = $forceLang; + return $forceLang; + } + /** * At this point Nextcloud might not yet be installed and thus the lookup * in the preferences table might fail. For this reason we need to check -- cgit v1.2.3 From 4286e17777433caac06859c744ff3f3fbbf95e8b Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 23 May 2018 21:19:46 +0200 Subject: Always set the request language to the force language Signed-off-by: Roeland Jago Douma --- lib/private/L10N/Factory.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'lib/private/L10N/Factory.php') diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php index 74cea7aa843..4f63adce572 100644 --- a/lib/private/L10N/Factory.php +++ b/lib/private/L10N/Factory.php @@ -126,14 +126,13 @@ class Factory implements IFactory { * @return string language If nothing works it returns 'en' */ public function findLanguage($app = null) { - if ($this->requestLanguage !== '' && $this->languageExists($app, $this->requestLanguage)) { - return $this->requestLanguage; - } - $forceLang = $this->config->getSystemValue('force_language', false); - if (is_string($forceLang) && $this->languageExists($app, $forceLang)) { + if (is_string($forceLang)) { $this->requestLanguage = $forceLang; - return $forceLang; + } + + if ($this->requestLanguage !== '' && $this->languageExists($app, $this->requestLanguage)) { + return $this->requestLanguage; } /** -- cgit v1.2.3