From ca5abe57440e415b1a6b99d7461dacab21b67b71 Mon Sep 17 00:00:00 2001 From: Clark Tomlinson Date: Wed, 22 Oct 2014 10:38:17 -0400 Subject: Setting moment locale based on user selection --- lib/private/templatelayout.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/private') diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index f5f079c8b2a..b294cef55e7 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -33,7 +33,6 @@ class OC_TemplateLayout extends OC_Template { $this->config = \OC::$server->getConfig(); // Decide which page we show - if( $renderAs == 'user' ) { parent::__construct( 'core', 'layout.user' ); if(in_array(OC_APP::getCurrentApp(), array('settings','admin', 'help'))!==false) { @@ -84,7 +83,11 @@ class OC_TemplateLayout extends OC_Template { $this->assign('bodyid', 'body-login'); } else { parent::__construct('core', 'layout.base'); + } + // Send the language to our layouts + $this->assign('language', OC_L10N::findLanguage()); + if(empty(self::$versionHash)) { self::$versionHash = md5(implode(',', OC_App::getAppVersions())); -- cgit v1.2.3