[limb-svn] r5941 - 3.x/trunk/limb/datetime/src

[svn at limb-project.com]

Author: pachanga
Date: 2007-06-05 19:01:01 +0400 (Tue, 05 Jun 2007)
New Revision: 5941
URL: http://fisheye.limb-project.com/changelog/limb/?cs=5941

Modified:
   3.x/trunk/limb/datetime/src/lmbDate.class.php
   3.x/trunk/limb/datetime/src/lmbMonth.class.php
Log:
-- lmbDate :: set/getFirstDayOfWeek() => set/getWeekStartsAt()

Modified: 3.x/trunk/limb/datetime/src/lmbDate.class.php
===================================================================
--- 3.x/trunk/limb/datetime/src/lmbDate.class.php	2007-06-05 14:51:03 UTC (rev 5940)
+++ 3.x/trunk/limb/datetime/src/lmbDate.class.php	2007-06-05 15:01:01 UTC (rev 5941)
@@ -19,9 +19,9 @@
   /**
    * Defines what day starts the week.
    * Monday (1) is the international standard, Sunday (0) is used in US.
-   * @see setFirstDayOfWeek()
+   * @see setWeekStartsAt()
    */
-  static protected $first_day_week = 1;
+  static protected $week_starts_at = 1;
 
   protected $year = 0;
   protected $month = 0;
@@ -115,14 +115,14 @@
     return new lmbDate($century . $year, $month, $day);
   }
 
-  static function setFirstDayOfWeek($n)
+  static function setWeekStartsAt($n)
   {
-    self :: $first_day_week = $n;
+    self :: $week_starts_at = $n;
   }
 
-  static function getFirstDayOfWeek()
+  static function getWeekStartsAt()
   {
-    return self :: $first_day_week;
+    return self :: $week_starts_at;
   }
 
   static function stampToIso($stamp)
@@ -350,7 +350,7 @@
 
   function getDayOfWeek()
   {
-    return $this->_correctDayOfWeek($this->getPhpDayOfWeek(), self :: $first_day_week);
+    return $this->_correctDayOfWeek($this->getPhpDayOfWeek(), self :: $week_starts_at);
   }
 
   function getIntlDayOfWeek()
@@ -386,9 +386,9 @@
     return $day - 7 * floor($day / 7);
   }
 
-  protected function _correctDayOfWeek($dow, $first_day_week)
+  protected function _correctDayOfWeek($dow, $week_starts_at)
   {
-    if($first_day_week == 0)
+    if($week_starts_at == 0)
       return $dow;
 
     if($dow == 0)
@@ -409,14 +409,14 @@
   function getBeginOfWeek()
   {
     $this_weekday = $this->getPhpDayOfWeek();
-    $interval = (7 - self :: $first_day_week + $this_weekday) % 7;
+    $interval = (7 - self :: $week_starts_at + $this_weekday) % 7;
     return lmbDate :: createByDays($this->getDateDays() - $interval);
   }
 
   function getEndOfWeek()
   {
     $this_weekday = $this->getPhpDayOfWeek();
-    $interval = (6 + self :: $first_day_week - $this_weekday) % 7;
+    $interval = (6 + self :: $week_starts_at - $this_weekday) % 7;
     return lmbDate :: createByDays($this->getDateDays() + $interval);
   }
 

Modified: 3.x/trunk/limb/datetime/src/lmbMonth.class.php
===================================================================
--- 3.x/trunk/limb/datetime/src/lmbMonth.class.php	2007-06-05 14:51:03 UTC (rev 5940)
+++ 3.x/trunk/limb/datetime/src/lmbMonth.class.php	2007-06-05 15:01:01 UTC (rev 5941)
@@ -68,19 +68,19 @@
   {
     $dow = $this->start_date->getPhpDayOfWeek();
 
-    if(lmbDate :: getFirstDayOfWeek() == 1 && $dow == 0)
+    if(lmbDate :: getWeekStartsAt() == 1 && $dow == 0)
     {
-      $first_week_days = 7 - $dow + lmbDate :: getFirstDayOfWeek();
+      $first_week_days = 7 - $dow + lmbDate :: getWeekStartsAt();
       $weeks = 1;
     }
-    elseif(lmbDate :: getFirstDayOfWeek() == 0 && $dow == 6)
+    elseif(lmbDate :: getWeekStartsAt() == 0 && $dow == 6)
     {
-      $first_week_days = 7 - $dow + lmbDate :: getFirstDayOfWeek();
+      $first_week_days = 7 - $dow + lmbDate :: getWeekStartsAt();
       $weeks = 1;
     }
     else
     {
-      $first_week_days = lmbDate :: getFirstDayOfWeek() - $dow;
+      $first_week_days = lmbDate :: getWeekStartsAt() - $dow;
       $weeks = 0;
     }