Fallback to $lang if no $locale match

Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>

Author: skjnldsv

lib/private/TemplateLayout.php

@@ -138,7 +138,7 @@ public function __construct( $renderAs, $appId = '' ) {
 
 		}
 		// Send the language and the locale to our layouts
-		$lang = \OC::$server->getL10NFactory()->findLanguage();
+		$c = \OC::$server->getL10NFactory()->findLanguage();
 		$locale = \OC::$server->getL10NFactory()->findLocale($lang);
 		$localeLang = \OC::$server->getL10NFactory()->findLanguageFromLocale('lib', $locale);
 
@@ -162,7 +162,7 @@ public function __construct( $renderAs, $appId = '' ) {
 		if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
 			if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
 				$jsConfigHelper = new JSConfigHelper(
-					\OC::$server->getL10N('lib', $localeLang),
+					\OC::$server->getL10N('lib', $localeLang ? $localeLang : $lang),
 					\OC::$server->query(Defaults::class),
 					\OC::$server->getAppManager(),
 					\OC::$server->getSession(),