X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2Fform%2FDateField.class.php;h=9016dff0c1e091c8a37bafa0cd5ce74bfd4445c5;hb=75b65e92b21d45e2b09fb12daef169fb214a7acd;hp=3906db6c895e276d6c751a87b53edd4a3ab76791;hpb=61efd9d023ae34c1290ef2e1ae25829c509caaee;p=timetracker.git diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php index 3906db6c..9016dff0 100644 --- a/WEB-INF/lib/form/DateField.class.php +++ b/WEB-INF/lib/form/DateField.class.php @@ -33,31 +33,28 @@ class DateField extends TextField { var $mWeekStartDay = 0; var $mDateFormat = "d/m/Y"; var $lToday = "Today"; - var $mDateObj; - var $class = 'DateField'; var $lCalendarButtons = array('today'=>'Today', 'close'=>'Close'); function __construct($name) { - $this->name = $name; - $this->mDateObj = new DateAndTime(); - - if (isset($GLOBALS["I18N"])) { - $this->localize($GLOBALS["I18N"]); - } + $this->class = 'DateField'; + $this->name = $name; + $this->mDateObj = new DateAndTime(); + $this->localize(); } - function localize($i18n) { + function localize() { global $user; + global $i18n; $this->mDateObj->setFormat($user->date_format); $this->mMonthNames = $i18n->monthNames; $this->mWeekDayShortNames = $i18n->weekdayShortNames; - $this->lToday = $i18n->getKey('label.today'); - $this->lCalendarButtons['today'] = $i18n->getKey('label.today'); - $this->lCalendarButtons['close'] = $i18n->getKey('button.close'); + $this->lToday = $i18n->get('label.today'); + $this->lCalendarButtons['today'] = $i18n->get('label.today'); + $this->lCalendarButtons['close'] = $i18n->get('button.close'); $this->mDateFormat = $user->date_format; $this->mWeekStartDay = $user->week_start; @@ -81,6 +78,7 @@ class DateField extends TextField { } function getHtml() { + global $user; if (!$this->isEnabled()) { $html = htmlspecialchars($this->getValue()). @@ -297,9 +295,7 @@ class DateField extends TextField { function getDateString(dateVal) {\n"; - if (isset($GLOBALS['i18n'])) { - $html .= "dateVal.locale = \"".$GLOBALS['i18n']->lang."\";\n"; - } + $html .= "dateVal.locale = \"".$user->lang."\";\n"; $html .= "return dateVal.strftime(dateFormat); }