Changeset 7461

Timestamp:

02/27/07 11:49:54 (21 months ago)

Author:

peller

Message:

Fixes #2269

Location:

trunk/src/date

Files:

• common.js (modified) (5 diffs)
• supplemental.js (modified) (2 diffs)

trunk/src/date/common.js

@@ -1 +1 @@
 dojo.provide("dojo.date.common");
-
-
-/* Supplementary Date Functions
- *******************************/
 
 dojo.date.setDayOfYear = function(/*Date*/dateObject, /*Number*/dayOfYear){
@@ -68 +64 @@
         // summary: Return a date object representing the first day of the given
         //   date's week.
-        var date = new Date(dateObject.getFullYear(), dateObject.getMonth(), 
-                dateObject.getDate());
         if(isNaN(firstDay)){
                 firstDay = dojo.date.getFirstDayOfWeek ? dojo.date.getFirstDayOfWeek() : 0;
@@ -79 +73 @@
                 offset -= (7 - dateObject.getDay());
         }
+        var date = new Date(dateObject);
+        date.setHours(0, 0, 0, 0);
         return dojo.date.add(date, dojo.date.dateParts.DAY, offset); // Date
 }
@@ -129 +125 @@
         var month = dateObject.getMonth();
         var days = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
-        if (month == 1 && dojo.date.isLeapYear(dateObject)) { return 29; } // Number
-        else { return days[month]; } // Number
+        if (month == 1 && dojo.date.isLeapYear(dateObject)){ return 29; } // Number
+        return days[month]; // Number
 }
 
@@ -144 +140 @@
 
         var year = dateObject.getFullYear();
-        return (year%400 == 0) ? true : (year%100 == 0) ? false : (year%4 == 0) ? true : false; // Boolean
+        return !(year%400) || (!(year%4) && !!(year%100)); // Boolean
 }
 

trunk/src/date/supplemental.js

@@ -19 +19 @@
         };
 
-        locale = dojo.hostenv.normalizeLocale(locale);
-        var country = locale.split("-")[1];
+        var country = dojo.date._region(locale);
         var dow = firstDay[country];
         return (typeof dow == 'undefined') ? 1 : dow; /*Number*/
 };
+
+dojo.date._region = function(/*String?*/locale){
+        locale = dojo.hostenv.normalizeLocale(locale);
+        var tags = locale.split('-');
+        var region = tags[1];
+        if(!region){
+                // IE often gives language only (#2269)
+                // Arbitrary mappings of language-only locales to a country:
+        region = {de:"de", en:"us", es:"es", fi:"fi", fr:"fr", hu:"hu", it:"it",
+        ja:"jp", ko:"kr", nl:"nl", pt:"br", sv:"se", zh:"cn"}[tags[0]];
+        }else if(region.length == 4){
+                // The ISO 3166 country code is usually in the second position, unless a
+                // 4-letter script is given. See http://www.ietf.org/rfc/rfc4646.txt
+                region = tags[2];
+        }
+        return region;
+}
 
 dojo.date.getWeekend = function(/*String?*/locale){
@@ -44 +60 @@
         };
 
-        locale = dojo.hostenv.normalizeLocale(locale);
-        var country = locale.split("-")[1];
+        var country = dojo.date._region(locale);
         var start = weekendStart[country];
         var end = weekendEnd[country];