diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-10-27 10:30:47 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-10-27 10:30:47 +0100 |
| commit | aee1edf6b5d12852b04e734486a42a5b042dfc65 (patch) | |
| tree | 13bf969a98e59d4a4050681fdc3f89f7ef598422 /lib/private/templatelayout.php | |
| parent | 5d391910c52309d7c538a2494927b3720dc06d0a (diff) | |
| parent | ca5abe57440e415b1a6b99d7461dacab21b67b71 (diff) | |
| download | nextcloud-server-aee1edf6b5d12852b04e734486a42a5b042dfc65.tar.gz nextcloud-server-aee1edf6b5d12852b04e734486a42a5b042dfc65.zip | |
Merge pull request #11708 from owncloud/fix-momentjs
Setting moment locale based on user selection
Diffstat (limited to 'lib/private/templatelayout.php')
| -rw-r--r-- | lib/private/templatelayout.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index cbaadd5768f..a93449f202f 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) { @@ -85,7 +84,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())); |