holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"- change cast to string to be more describtive: \"Wednesday, 2009-11-11 11:11:11 (Europe/Berlin)\"

Browse Source 
- check if translation class is available, before calling it"
This commit is contained in:
Ralf Becker 2009-11-12 09:30:37 +00:00
parent 014119f075
commit fc244efb1f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpgwapi/inc/class.egw_time.inc.php
View File

@ -243,13 +243,13 @@ class egw_time extends DateTime
} }
/** /**
* Cast object to a string * Cast object to string
* *
* @return string * @return string eg. "Wednesday, 2009-11-11 11:11:11 (Europe/Berlin)"
*/ */
public function __toString() public function __toString()
{ {
return $this->format(self::DATABASE); return $this->format('l, '.self::DATABASE).' ('.$this->getTimezone()->getName().')';
} }
/** /**
@ -488,7 +488,7 @@ class egw_time extends DateTime
unset($data); unset($data);
// if user lang or installed langs contain a european language --> move Europe to top of tz list // if user lang or installed langs contain a european language --> move Europe to top of tz list
$langs = translation::get_installed_langs(); $langs = class_exists('translation') ? translation::get_installed_langs() : array();
if (array_intersect(array($GLOBALS['egw_info']['user']['preferences']['common']['lang'])+array_keys($langs), if (array_intersect(array($GLOBALS['egw_info']['user']['preferences']['common']['lang'])+array_keys($langs),
array('de','fr','it','nl','bg','ca','cs','da','el','es-es','et','eu','fi','hr','hu','lt','no','pl','pt','sk','sl','sv','tr','uk'))) array('de','fr','it','nl','bg','ca','cs','da','el','es-es','et','eu','fi','hr','hu','lt','no','pl','pt','sk','sl','sv','tr','uk')))
{ {