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 f160cfa..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;
-      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;
     }
 
@@ -171,16 +165,9 @@ class Calendar extends FormElement {
               $stl_cell = ' class="CalendarDay"';
             }
 
-            // Handle holidays.
-            // Prepare a date to check in DB_DATEFORMAT.
-            $date_to_check = "$thisyear-";
-            if (strlen($thismonth) == 1) $date_to_check .= '0';
-            $date_to_check .= "$thismonth-";
-            if (strlen($start_date+$j) == 1) $date_to_check .= '0';
-            $date_to_check .= $start_date+$j;
-
-            // Check if it falls on a holiday.
-            if (ttTimeHelper::isHoliday2($date_to_check)) {
+            // 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"';
             }