Use user locale as default in the template

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

Author: skjnldsv

lib/private/TemplateLayout.php

@@ -139,9 +139,11 @@ public function __construct( $renderAs, $appId = '' ) {
 		}
 		// Send the language and the locale to our layouts
 		$lang = \OC::$server->getL10NFactory()->findLanguage();
+		$locale = $this->config->getUserValue(\OC_User::getUser(), 'core', 'locale', \OC::$server->getL10NFactory()->findLocale($lang));
 		$lang = str_replace('_', '-', $lang);
+		$locale = str_replace('_', '-', $locale);
 		$this->assign('language', $lang);
-		$this->assign('locale', \OC::$server->getL10NFactory()->findLocale($lang));
+		$this->assign('locale', $locale);
 
 		if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
 			if (empty(self::$versionHash)) {
@@ -159,7 +161,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'),
+					\OC::$server->getL10N('lib', $locale),
 					\OC::$server->query(Defaults::class),
 					\OC::$server->getAppManager(),
 					\OC::$server->getSession(),