Changeset 7382

Timestamp:

02/20/07 15:45:00 (23 months ago)

Author:

peller

Message:

Remove gregorianExtras.js files. Fixes #2328

Location:

trunk/src

Files:

• date/format.js (modified) (5 diffs)
• i18n/cldr/nls/gregorianExtras.js (deleted)
• i18n/cldr/nls/ja/gregorianExtras.js (deleted)
• widget/DatePicker.js (modified) (1 diff)

trunk/src/date/format.js

@@ -12 +12 @@
 // names and formats
 dojo.requireLocalization("dojo.i18n.cldr", "gregorian");
-dojo.requireLocalization("dojo.i18n.cldr", "gregorianExtras");
 
 //NOTE: Everything in this module assumes Gregorian calendars.
@@ -29 +28 @@
 //              formatting lengths may be chosen, with "full" used by default.
 //              Custom patterns may be used or registered with translations using
-//              the addCustomBundle method.
+//              the addCustomFormats method.
 //              Formatting patterns are implemented using the syntax described at
 //              http://www.unicode.org/reports/tr35/tr35-4.html#Date_Format_Patterns
@@ -216 +215 @@
         var str = [];
         var sauce = dojo.lang.curry(this, formatPattern, dateObject);
+        if(options.selector == "yearOnly"){
+                // Special case as this is not yet driven by CLDR data
+                var year = dateObject.getFullYear();
+                if(locale.match(/^zh|^ja/)){
+                        year += "\u5E74";
+                }
+                return year;
+        }
         if(options.selector != "timeOnly"){
                 var datePattern = options.datePattern || info["dateFormat-"+formatLength];
@@ -240 +247 @@
 //              formatting lengths may be chosen, with "full" used by default.
 //              Custom patterns may be used or registered with translations using
-//              the addCustomBundle method.
+//              the addCustomFormats method.
 //              Formatting patterns are implemented using the syntax described at
 //              http://www.unicode.org/reports/tr35/#Date_Format_Patterns
@@ -806 +813 @@
 
 dojo.date.addCustomFormats("dojo.i18n.cldr","gregorian");
-dojo.date.addCustomFormats("dojo.i18n.cldr","gregorianExtras");
 
 dojo.date.getNames = function(/*String*/item, /*String*/type, /*String?*/use, /*String?*/locale){

trunk/src/widget/DatePicker.js

@@ -415 +415 @@
                         function f(n){
                                 that[n+"YearLabelNode"].innerHTML =
-                                        dojo.date.format(new Date(y++, 0), {formatLength:'yearOnly', locale:that.lang});
+                                        dojo.date.format(new Date(y++, 0), {selector:'yearOnly', locale:that.lang});
                         }
                         f("previous");