Setting moment locale based on user selectiontags/v8.0.0alpha1
@@ -966,6 +966,12 @@ function object(o) { | |||
*/ | |||
function initCore() { | |||
/** | |||
* Set users local to moment.js as soon as possible | |||
*/ | |||
moment.locale($('html').prop('lang')); | |||
/** | |||
* Calls the server periodically to ensure that session doesn't | |||
* time out |
@@ -1,10 +1,10 @@ | |||
<!DOCTYPE html> | |||
<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]--> | |||
<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]--> | |||
<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false"><![endif]--> | |||
<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false"><![endif]--> | |||
<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false"><![endif]--> | |||
<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false"><!--<![endif]--> | |||
<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>"><![endif]--> | |||
<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> | |||
<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> | |||
<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> | |||
<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> | |||
<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]--> | |||
<head> | |||
<title> |
@@ -1,10 +1,10 @@ | |||
<!DOCTYPE html> | |||
<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]--> | |||
<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]--> | |||
<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false"><![endif]--> | |||
<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false"><![endif]--> | |||
<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false"><![endif]--> | |||
<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false"><!--<![endif]--> | |||
<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>"><![endif]--> | |||
<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> | |||
<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> | |||
<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> | |||
<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> | |||
<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]--> | |||
<head data-requesttoken="<?php p($_['requesttoken']); ?>"> | |||
<title> |
@@ -1,10 +1,10 @@ | |||
<!DOCTYPE html> | |||
<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]--> | |||
<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]--> | |||
<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false"><![endif]--> | |||
<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false"><![endif]--> | |||
<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false"><![endif]--> | |||
<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false"><!--<![endif]--> | |||
<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>"><![endif]--> | |||
<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> | |||
<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> | |||
<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> | |||
<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]--> | |||
<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]--> | |||
<head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>"> | |||
<title> |
@@ -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())); |