Update moment.js and add timezone in template

This commit is contained in:
Frederic Guillot
2015-02-08 17:37:13 -05:00
parent 92509c43c4
commit d634a53e9c
7 changed files with 42 additions and 13 deletions

View File

@@ -201,6 +201,21 @@ class Config extends Base
Translator::load($this->getCurrentLanguage());
}
/**
* Get current timezone
*
* @access public
* @return string
*/
public function getCurrentTimezone()
{
if ($this->userSession->isLogged() && ! empty($this->session['user']['timezone'])) {
return $this->session['user']['timezone'];
}
return $this->get('application_timezone', 'UTC');
}
/**
* Set timezone
*
@@ -208,12 +223,7 @@ class Config extends Base
*/
public function setupTimezone()
{
if ($this->userSession->isLogged() && ! empty($this->session['user']['timezone'])) {
date_default_timezone_set($this->session['user']['timezone']);
}
else {
date_default_timezone_set($this->get('application_timezone', 'UTC'));
}
date_default_timezone_set($this->getCurrentTimezone());
}
/**