moved update-iserv1-iserv2.pl to maint/

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

diff --git a/includes/mod_roomReservationConfig.inc b/includes/mod_roomReservationConfig.inc
old mode 100755 (executable)
new mode 100644 (file)
index 9c02e3e..9a2bf9c
--- a/includes/mod_roomReservationConfig.inc
+++ b/includes/mod_roomReservationConfig.inc
@@ -93,7 +93,6 @@ class mod_roomReservationConfig {
   /** (bool) Determine if the weekend is shown */
   protected $bShowWeekend;
   /** (bool) Determine if the strings "1. lesson", "2. lesson" etc are shown */
-  // FIXME needed?
   protected $bShowLessons;
   /** (array of strings) error messages */
   protected $asMessages;
@@ -204,7 +203,7 @@ class mod_roomReservationConfig {
     $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;
@@ -221,7 +220,8 @@ class mod_roomReservationConfig {
     $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;
   }
@@ -242,7 +242,6 @@ class mod_roomReservationConfig {
   /**
    * Determine if the lesson strings in the booking table are shown
    * @return bool
-   * FIXME needed?
    */
   public function isShowLessons() { return ($this->bShowLessons == true); }