projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More improvements in Italian translation.
[timetracker.git]
/
WEB-INF
/
lib
/
form
/
DateField.class.php
diff --git
a/WEB-INF/lib/form/DateField.class.php
b/WEB-INF/lib/form/DateField.class.php
index
49c2354
..
f8eef8c
100644
(file)
--- a/
WEB-INF/lib/form/DateField.class.php
+++ b/
WEB-INF/lib/form/DateField.class.php
@@
-33,25
+33,21
@@
class DateField extends TextField {
var $mWeekStartDay = 0;
var $mDateFormat = "d/m/Y";
var $lToday = "Today";
var $mWeekStartDay = 0;
var $mDateFormat = "d/m/Y";
var $lToday = "Today";
-
var $mDateObj;
var $mDateObj;
- var $cClassName = "DateField";
var $lCalendarButtons = array('today'=>'Today', 'close'=>'Close');
function __construct($name) {
var $lCalendarButtons = array('today'=>'Today', 'close'=>'Close');
function __construct($name) {
- $this->name = $name;
- $this->mDateObj = new DateAndTime();
-
- if (isset($GLOBALS["I18N"])) {
- $this->setLocalization($GLOBALS["I18N"]);
- }
+ $this->class = 'DateField';
+ $this->name = $name;
+ $this->mDateObj = new DateAndTime();
+ $this->localize();
}
}
- function setLocalization($i18n) {
- global $user;
+ function localize() {
+ global $user;
+ global $i18n;
- FormElement::setLocalization($i18n);
$this->mDateObj->setFormat($user->date_format);
$this->mMonthNames = $i18n->monthNames;
$this->mDateObj->setFormat($user->date_format);
$this->mMonthNames = $i18n->monthNames;
@@
-81,7
+77,8
@@
class DateField extends TextField {
}
}
}
}
- function toStringControl() {
+ function getHtml() {
+ global $user;
if (!$this->isEnabled()) {
$html = htmlspecialchars($this->getValue()).
if (!$this->isEnabled()) {
$html = htmlspecialchars($this->getValue()).
@@
-298,9
+295,7
@@
class DateField extends TextField {
function getDateString(dateVal) {\n";
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);
}
$html .= "return dateVal.strftime(dateFormat);
}