properly handle force_locale setting

Signed-off-by: Georg Ehrke <[email protected]>
oliverzhong · Jun 27, 2018 · 9157086 · 9157086
1 parent b3921c6
commit 9157086
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php
@@ -207,6 +207,11 @@ public function findLanguage($app = null) {
 	 * @return null|string
 	 */
 	public function findLocale($lang = null) {
+		$forceLocale = $this->config->getSystemValue('force_locale', false);
+		if (is_string($forceLocale) && $this->localeExists($forceLocale)) {
+			return $forceLocale;
+		}
+
 		if ($this->config->getSystemValue('installed', false)) {
 			$userId = null !== $this->userSession->getUser() ? $this->userSession->getUser()->getUID() :  null;
 			$userLocale = null;