added comments, added DESTDIR variable for dh_* packaging scripts

[iserv-mod-room-reservation.git] / includes / mod_roomReservationConfig.inc

diff --git a/includes/mod_roomReservationConfig.inc b/includes/mod_roomReservationConfig.inc
old mode 100644 (file)
new mode 100755 (executable)
index 1aca132..9a2bf9c
--- a/includes/mod_roomReservationConfig.inc
+++ b/includes/mod_roomReservationConfig.inc
@@ -203,7 +203,7 @@ class mod_roomReservationConfig {
     $aot = $this->getTimeslices();
     $aRet = array();
     foreach($aot as $ao) {
     $aot = $this->getTimeslices();
     $aRet = array();
     foreach($aot as $ao) {

-      $aRet[] = $bFormat ? _date("%#I:%M %p", $ao->getBegin()) : 
+      $aRet[] = $bFormat ? gmstrftime(_("%#I:%M %p"), $ao->getBegin()) : 

         $ao->getBegin();
     }
     return $aRet;
         $ao->getBegin();
     }
     return $aRet;


@@ -220,7 +220,8 @@ class mod_roomReservationConfig {
     $aot = $this->getTimeslices();
     $aRet = array();
     foreach($aot as $ao) {
     $aot = $this->getTimeslices();
     $aRet = array();
     foreach($aot as $ao) {

-      $aRet[] = $bFormat ? _date("%#I:%M %p", $ao->getEnd()) : $ao->getEnd();
+      $aRet[] = $bFormat ? gmstrftime(_("%#I:%M %p"), $ao->getEnd()) :
+        $ao->getEnd();

     }
     return $aRet;
   }
     }
     return $aRet;
   }