Changeset 3186

Timestamp:

07/22/2008 12:39:15 AM (3 months ago)

Author:

Shadowhand

Message:

Follow up to r3185, week_start fixes

Files:

• trunk/system/libraries/Calendar.php (modified) (5 diffs)

trunk/system/libraries/Calendar.php

@@ -12 +12 @@
 class Calendar_Core extends Event_Subject {
 
+        // Start the calendar on Sunday by default
+        public static $start_monday = FALSE;
+
         // Month and year to use for calendaring
         protected $month;
         protected $year;
 
-        // Start the calendar on Sunday by default
-        public $week_start = 0;
+        // Week starts on Sunday
+        protected $week_start = 0;
 
         // Observed data
@@ -34 +37 @@
 
                 // Days of the week
-                $headings = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
+                $days = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
+
+                if (Calendar::$start_monday === TRUE)
+                {
+                        // Push Sunday to the end of the days
+                        array_push($days, array_shift($days));
+                }
 
                 if (strpos(Kohana::config('locale.language.0'), 'en') !== 0)
                 {
                         // This is a bit awkward, but it works properly and is reliable
-                        foreach ($headings as $i => $day)
+                        foreach ($days as $i => $day)
                         {
                                 // Convert the English names to i18n names
-                                $headings[$i] = strftime($format, strtotime($day));
+                                $days[$i] = strftime($format, strtotime($day));
                         }
                 }
                 elseif ($short == TRUE)
                 {
-                        foreach ($headings as $i => $day)
+                        foreach ($days as $i => $day)
                         {
                                 // Shorten the day names to 3 letters
-                                $headings[$i] = substr($day, 0, 3);
-                        }
-                }
-
-                return $headings;
+                                $days[$i] = substr($day, 0, 3);
+                        }
+                }
+
+                return $days;
         }
 
@@ -63 +72 @@
          * @param   integer  month number
          * @param   integer  year number
-         * @param   boolean  start weeks on monday
          * @return  object
          */
-        public static function factory($month = NULL, $year = NULL, $start_monday = NULL)
-        {
-                return new Calendar($month, $year, $start_monday);
+        public static function factory($month = NULL, $year = NULL)
+        {
+                return new Calendar($month, $year);
         }
 
@@ -77 +85 @@
          * @param   integer  month number
          * @param   integer  year number
-         * @param   boolean  start weeks on monday
          * @return  void
          */
-        public function __construct($month = NULL, $year = NULL, $start_monday = NULL)
+        public function __construct($month = NULL, $year = NULL)
         {
                 empty($month) and $month = date('n'); // Current month
@@ -89 +96 @@
                 $this->year  = (int) $year;
 
-                if ($start_monday === TRUE)
-                {
-                        // Some locales start the week on Monday, not Sunday.
+                if (Calendar::$start_monday === TRUE)
+                {
+                        // Week starts on Monday
                         $this->week_start = 1;
                 }