Changeset 3185

Timestamp:

07/21/2008 11:45:16 PM (4 months ago)

Author:

Shadowhand

Message:

Follow up to r3184, comments and fixes for short English names.

Location:

trunk/system/libraries

Files:

• Calendar.php (modified) (3 diffs)
• Image.php (modified) (1 diff)

trunk/system/libraries/Calendar.php

@@ -22 +22 @@
         protected $observed_data;
 
+        /**
+         * Returns an array of the names of the days, using the current locale.
+         *
+         * @param   boolean  return short names
+         * @return  array
+         */
         public static function days($short = FALSE)
         {
@@ -30 +36 @@
                 $headings = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
 
-                if (strpos(Kohana::config('locale.lang.0'), 'en') === FALSE)
+                if (strpos(Kohana::config('locale.language.0'), 'en') !== 0)
                 {
                         // This is a bit awkward, but it works properly and is reliable
@@ -37 +43 @@
                                 // Convert the English names to i18n names
                                 $headings[$i] = strftime($format, strtotime($day));
+                        }
+                }
+                elseif ($short == TRUE)
+                {
+                        foreach ($headings as $i => $day)
+                        {
+                                // Shorten the day names to 3 letters
+                                $headings[$i] = substr($day, 0, 3);
                         }
                 }

trunk/system/libraries/Image.php

@@ -131 +131 @@
                 if (isset($this->image[$property]))
                 {
-                        return $this->image[$property]; 
-                }               
+                        return $this->image[$property];
+                }
                 else
                 {
                         throw new Kohana_Exception('core.invalid_property', $column, get_class($this));
-                }                       
-        }
-        
+                }
+        }
+
         /**
          * Resize an image to a specific width and height. By default, Kohana will