Change timeType and dateType in i18n date format API into timeStyle and dateStyle to match the pr...

src/extensions/experimental/i18n.js

 // Copyright 2006-2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 127 matching lines @@
 v8Locale.prototype.createCollator = function(settings) {
   return new v8Locale.Collator(this, settings);
 };
 
 /**
  * DateTimeFormat class implements locale-aware date and time formatting.
  * Constructor is not part of public API.
  * @param {Object} locale - locale object to pass to formatter.
  * @param {Object} settings - formatting flags:
  *   - skeleton
- *   - dateType
- *   - timeType
- *   - calendar
+ *   - dateStyle
+ *   - timeStyle
  * @private
  * @constructor
  */
 v8Locale.__DateTimeFormat = function(locale, settings) {
   native function NativeJSDateTimeFormat();
 
   settings = v8Locale.__createSettingsOrDefault(settings, {});
 
   var cleanSettings = {};
   if (settings.hasOwnProperty('skeleton')) {
     cleanSettings['skeleton'] = settings['skeleton'];
   } else {
     cleanSettings = {};
-    if (settings.hasOwnProperty('dateType')) {
+    if (settings.hasOwnProperty('dateStyle')) {
+      var ds = settings['dateStyle'];
+      if (!/^(short|medium|long|full)$/.test(ds)) ds = 'short';
+      cleanSettings['dateStyle'] = ds;
+    } else if (settings.hasOwnProperty('dateType')) {
+      // Obsolete. New spec requires dateStyle, but we'll keep this around
+      // for current users.
+      // TODO(cira): Remove when all internal users switch to dateStyle.
       var dt = settings['dateType'];
-      if (!/^short|medium|long|full$/.test(dt)) dt = 'short';
-      cleanSettings['dateType'] = dt;
+      if (!/^(short|medium|long|full)$/.test(dt)) dt = 'short';
+      cleanSettings['dateStyle'] = dt;
     }
 
-    if (settings.hasOwnProperty('timeType')) {
+    if (settings.hasOwnProperty('timeStyle')) {
+      var ts = settings['timeStyle'];
+      if (!/^(short|medium|long|full)$/.test(ts)) ts = 'short';
+      cleanSettings['timeStyle'] = ts;
+    } else if (settings.hasOwnProperty('timeType')) {
+      // TODO(cira): Remove when all internal users switch to timeStyle.
       var tt = settings['timeType'];
-      if (!/^short|medium|long|full$/.test(tt)) tt = 'short';
-      cleanSettings['timeType'] = tt;
+      if (!/^(short|medium|long|full)$/.test(tt)) tt = 'short';
+      cleanSettings['timeStyle'] = tt;

[jungshik at Google, 2011/06/24 16:33:47]

given that this will go away later, I wouldn't say you have to refactor what's
inside if-block and else-if-block :-) If you like, you can. 

[Nebojša Ćirić, 2011/06/24 16:43:22]

I am not going to refactor - current code makes it easy to delete else if part
in the future without too much thinking :).

On 2011/06/24 16:33:47, Jungshik Shin wrote:

     }
   }
 
   // Default is to show short date and time.
   if (!cleanSettings.hasOwnProperty('skeleton') &&
-      !cleanSettings.hasOwnProperty('dateType') &&
-      !cleanSettings.hasOwnProperty('timeType')) {
-    cleanSettings = {'dateType': 'short',
-                     'timeType': 'short'};
+      !cleanSettings.hasOwnProperty('dateStyle') &&
+      !cleanSettings.hasOwnProperty('timeStyle')) {
+    cleanSettings = {'dateStyle': 'short',
+                     'timeStyle': 'short'};
   }
 
   locale = v8Locale.__createLocaleOrDefault(locale);
   var formatter = NativeJSDateTimeFormat(locale.__icuLocaleID, cleanSettings);
 
   // NativeJSDateTimeFormat creates formatter.options for us, we just need
   // to append actual settings to it.
   for (key in cleanSettings) {
     formatter.options[key] = cleanSettings[key];
   }
@@ skipping 49 matching lines @@
   var cleanSettings = {};
   if (settings.hasOwnProperty('skeleton')) {
     // Assign skeleton to cleanSettings and fix invalid currency pattern
     // if present - 'ooxo' becomes 'o'.
     cleanSettings['skeleton'] =
         settings['skeleton'].replace(/\u00a4+[^\u00a4]+\u00a4+/g, '\u00a4');
   } else if (settings.hasOwnProperty('pattern')) {
     cleanSettings['pattern'] = settings['pattern'];
   } else if (settings.hasOwnProperty('style')) {
     var style = settings['style'];
-    if (!/^decimal|currency|percent|scientific$/.test(style)) {
+    if (!/^(decimal|currency|percent|scientific)$/.test(style)) {
       style = 'decimal';
     }
     cleanSettings['style'] = style;
   }
 
   // Default is to show decimal style.
   if (!cleanSettings.hasOwnProperty('skeleton') &&
       !cleanSettings.hasOwnProperty('pattern') &&
       !cleanSettings.hasOwnProperty('style')) {
     cleanSettings = {'style': 'decimal'};
@@ skipping 97 matching lines @@
  * @returns {Object} - v8Locale object.
  * @private
  */
 v8Locale.__createLocaleOrDefault = function(locale) {
   if (!locale || !(locale instanceof v8Locale)) {
     return new v8Locale();
   } else {
     return locale;
   }
 };