projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed holidays from translation files.
[timetracker.git]
/
WEB-INF
/
lib
/
form
/
Calendar.class.php
diff --git
a/WEB-INF/lib/form/Calendar.class.php
b/WEB-INF/lib/form/Calendar.class.php
index
a8455a8
..
72da0e4
100644
(file)
--- a/
WEB-INF/lib/form/Calendar.class.php
+++ b/
WEB-INF/lib/form/Calendar.class.php
@@
-63,12
+63,6
@@
class Calendar extends FormElement {
$this->mMonthNames = $i18n->monthNames;
$this->mWeekDayShortNames = $i18n->weekdayShortNames;
$this->mMonthNames = $i18n->monthNames;
$this->mWeekDayShortNames = $i18n->weekdayShortNames;
- if (is_array($i18n->holidays)) {
- foreach ($i18n->holidays as $fday) {
- $date_a = explode("/",$fday); // format mm/dd
- $this->holidays[] = mktime(0,0,0, $date_a[0], $date_a[1], date("Y"));// + 7200;
- }
- }
$this->weekStartDay = $user->week_start;
}
$this->weekStartDay = $user->week_start;
}
@@
-171,15
+165,11
@@
class Calendar extends FormElement {
$stl_cell = ' class="CalendarDay"';
}
$stl_cell = ' class="CalendarDay"';
}
- // holidays
- global $user;
- if ($user->isOptionEnabled('show_holidays')) {
- foreach ($this->holidays as $day) {
- if($day == $date) {
- $stl_cell = ' class="CalendarDayHoliday"';
- $stl_link = ' class="CalendarLinkHoliday"';
- }
- }
+ // holidays
+ $date_to_check = ttTimeHelper::dateInDatabaseFormat($thisyear, $thismonth, $start_date+$j);
+ if (ttTimeHelper::isHoliday($date_to_check)) {
+ $stl_cell = ' class="CalendarDayHoliday"';
+ $stl_link = ' class="CalendarLinkHoliday"';
}
// selected day
}
// selected day