Closure i18n/timezone API update.

Added the LONG_GMT and GENERIC_LOCATION time zone display names:
goog.i18n.TimeZone.getLongNameGMT
goog.i18n.TimeZone.getGenericLocation

Additionally, goog.i18n.DateTimeFormat was updated to accept 'V' in the date formatting pattern which adds the GENERIC_LOCATION.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=99387254

Author: joeltine

closure/goog/deps.js

@@ -151,9 +151,9 @@ goog.i18n.DateTimeFormat.TOKENS_ = [
   //quote string
   /^\'(?:[^\']|\'\')*\'/,
   // pattern chars
-  /^(?:G+|y+|M+|k+|S+|E+|a+|h+|K+|H+|c+|L+|Q+|d+|m+|s+|v+|w+|z+|Z+)/,
+  /^(?:G+|y+|M+|k+|S+|E+|a+|h+|K+|H+|c+|L+|Q+|d+|m+|s+|v+|V+|w+|z+|Z+)/,
   // and all the other chars
-  /^[^\'GyMkSEahKHcLQdmsvwzZ]+/  // and all the other chars
+  /^[^\'GyMkSEahKHcLQdmsvVwzZ]+/  // and all the other chars
 ];
 
 
@@ -786,6 +786,24 @@ goog.i18n.DateTimeFormat.prototype.formatTimeZoneId_ =
 };
 
 
+/**
+ * Generate localized, location dependent time zone id
+ * @param {number} count Number of time pattern char repeats, it controls
+ *     how a field should be formatted.
+ * @param {!goog.date.DateLike} date Whose value being evaluated.
+ * @param {goog.i18n.TimeZone=} opt_timeZone This holds current time zone info.
+ * @return {string} GMT timeZone string.
+ * @private
+ */
+goog.i18n.DateTimeFormat.prototype.formatTimeZoneLocationId_ =
+    function(count, date, opt_timeZone) {
+  opt_timeZone = opt_timeZone ||
+      goog.i18n.TimeZone.createTimeZone(date.getTimezoneOffset());
+  return count <= 2 ? opt_timeZone.getTimeZoneId() :
+             opt_timeZone.getGenericLocation(date);
+};
+
+
 /**
  * Formatting one date field.
  * @param {string} patternStr The pattern string for the field being formatted.
@@ -819,6 +837,7 @@ goog.i18n.DateTimeFormat.prototype.formatField_ =
     case 'm': return this.formatMinutes_(count, dateForTime);
     case 's': return this.formatSeconds_(count, dateForTime);
     case 'v': return this.formatTimeZoneId_(date, opt_timeZone);
+    case 'V': return this.formatTimeZoneLocationId_(count, date, opt_timeZone);
     case 'w': return this.formatWeekOfYear_(count, dateForTime);
     case 'z': return this.formatTimeZone_(count, date, opt_timeZone);
     case 'Z': return this.formatTimeZoneRFC_(count, date, opt_timeZone);

closure/goog/i18n/datetimeformat.js

@@ -108,6 +108,12 @@ var americaLosAngelesData = {
     571450, 60, 577161, 0, 580186, 60, 585897, 0, 588922, 60, 594633, 0
   ],
   'names': ['PST', 'Pacific Standard Time', 'PDT', 'Pacific Daylight Time'],
+  'names_ext': {
+    STD_LONG_NAME_GMT: 'GMT-08:00',
+    STD_GENERIC_LOCATION: 'Los Angeles Time',
+    DST_LONG_NAME_GMT: 'GMT-07:00',
+    DST_GENERIC_LOCATION: 'Los Angeles Time'
+  },
   'id': 'America/Los_Angeles',
   'std_offset': -480
 };
@@ -136,6 +142,12 @@ var europeBerlinData = {
     589417, 60, 594457, 0],
   'names': ['MEZ', 'Mitteleurop\u00e4ische Zeit',
             'MESZ', 'Mitteleurop\u00e4ische Sommerzeit'],
+  'names_ext': {
+    STD_LONG_NAME_GMT: 'GMT+01:00',
+    STD_GENERIC_LOCATION: 'Deutschland Zeit',
+    DST_LONG_NAME_GMT: 'GMT+02:00',
+    DST_GENERIC_LOCATION: 'Deutschland Zeit'
+  },
   'id': 'Europe/Berlin',
   'std_offset': 60
 };
@@ -510,6 +522,39 @@ function testMMddyyyyHHmmssvSimpleTimeZone() {
   assertEquals('07/27/2006 06:10:10 Etc/GMT+7', fmt.format(date, timeZone));
 }
 
+function testMMddyyyyHHmmssVCommonTimeZone() {
+  goog.i18n.DateTimePatterns = goog.i18n.DateTimePatterns_de;
+  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_de;
+  var date = new Date(Date.UTC(2006, 6, 27, 13, 10, 10));
+  var timeZone = goog.i18n.TimeZone.createTimeZone(americaLosAngelesData);
+  var fmt = new goog.i18n.DateTimeFormat('MM/dd/yyyy HH:mm:ss V');
+  assertEquals('07/27/2006 06:10:10 America/Los_Angeles',
+      fmt.format(date, timeZone));
+  fmt = new goog.i18n.DateTimeFormat('MM/dd/yyyy HH:mm:ss VV');
+  assertEquals('07/27/2006 06:10:10 America/Los_Angeles',
+      fmt.format(date, timeZone));
+  fmt = new goog.i18n.DateTimeFormat('MM/dd/yyyy HH:mm:ss VVV');
+  assertEquals('07/27/2006 06:10:10 Los Angeles Time',
+      fmt.format(date, timeZone));
+  fmt = new goog.i18n.DateTimeFormat('MM/dd/yyyy HH:mm:ss VVVV');
+  assertEquals('07/27/2006 06:10:10 Los Angeles Time',
+      fmt.format(date, timeZone));
+}
+
+function testMMddyyyyHHmmssVSimpleTimeZone() {
+  goog.i18n.DateTimePatterns = goog.i18n.DateTimePatterns_de;
+  goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_de;
+  var date = new Date(Date.UTC(2006, 6, 27, 13, 10, 10));
+  var timeZone = goog.i18n.TimeZone.createTimeZone(420);
+  var fmt = new goog.i18n.DateTimeFormat('MM/dd/yyyy HH:mm:ss V');
+  assertEquals('07/27/2006 06:10:10 Etc/GMT+7', fmt.format(date, timeZone));
+  fmt = new goog.i18n.DateTimeFormat('MM/dd/yyyy HH:mm:ss VV');
+  assertEquals('07/27/2006 06:10:10 Etc/GMT+7', fmt.format(date, timeZone));
+  fmt = new goog.i18n.DateTimeFormat('MM/dd/yyyy HH:mm:ss VVV');
+  assertEquals('07/27/2006 06:10:10 GMT-07:00', fmt.format(date, timeZone));
+  var fmt = new goog.i18n.DateTimeFormat('MM/dd/yyyy HH:mm:ss VVVV');
+  assertEquals('07/27/2006 06:10:10 GMT-07:00', fmt.format(date, timeZone));
+}
 
 function test_yyyyMMddG() {
   goog.i18n.DateTimePatterns = goog.i18n.DateTimePatterns_de;

closure/goog/i18n/datetimeformat_test.js

@@ -20,7 +20,22 @@
 goog.provide('goog.i18n.TimeZone');
 
 goog.require('goog.array');
+/** @suppress {extraRequire} goog.date.DateLike represents a Date or a
+ * goog.Date object. It is a parameter in the following methods:
+ * - getDaylightAdjustment
+ * - getGMTString
+ * - getLongName
+ * - getOffset
+ * - getRFCTimeZoneString
+ * - getShortName
+ * - isDaylightTime
+ * - getLongNameGMT
+ * - getGenericLocation
+ * Lint warns that this require is unnecessary but the closure compiler needs
+ * it in order to accept a Date or a goog.Date object as a goog.date.DateLike
+ * parameter in any of these methods. */
 goog.require('goog.date.DateLike');
+goog.require('goog.object');
 goog.require('goog.string');
 
 
@@ -36,8 +51,8 @@ goog.require('goog.string');
  * In case only time zone offset is known, there is a decent fallback
  * that only use the time zone offset to create a TimeZone object.
  * A whole set of time zone information array was available under
- * http://go/js_locale_data. It is generated based on CLDR and
- * Olson time zone data base (through pytz), and will be updated timely.
+ * http://go/js_locale_data. It is generated based on CLDR/ICU and
+ * Olson time zone data base, and will be updated timely.
  *
  * @constructor
  * @final
@@ -70,6 +85,25 @@ goog.i18n.TimeZone = function() {
   this.tzNames_;
 
 
+  /**
+   * An object of 2 to 4 elements. The STD_* are always available, while the
+   * DST_* are only available when daylight saving time is available for this
+   * time zone.
+   * <ul>
+   * <li>STD_LONG_NAME_GMT: long GMT name for standard time</li>
+   * <li>STD_GENERIC_LOCATION: generic location for standard time</li>
+   * <li>DST_LONG_NAME_GMT: long GMT for daylight saving time</li>
+   * <li>DST_GENERIC_LOCATION: generic location for daylight saving time</li>
+   * </ul>
+   * @type { { STD_LONG_NAME_GMT:string, STD_GENERIC_LOCATION:string } |
+   *         { STD_LONG_NAME_GMT:string, STD_GENERIC_LOCATION:string,
+   *           DST_LONG_NAME_GMT:string, DST_GENERIC_LOCATION:string }
+   *       }
+   * @private
+   */
+  this.tzNamesExt_;
+
+
   /**
    * This array specifies the Daylight Saving Time transitions for this time
    * zone.  This is a flat array of numbers which are interpreted in pairs:
@@ -118,6 +152,9 @@ goog.i18n.TimeZone.NameType = {
  *     <li>std_offset: The standard time zone offset in minutes EAST of UTC.
  *     <li>names: An array of four names (standard short name, standard long
  *           name, daylight short name, daylight long, name)
+ *     <li>names_ext: A hash of four fields (standard long name gmt, daylight
+ *           long name gmt, standard generic location, daylight generic
+ *           location)
  *     <li>transitions: An array of numbers which are interpreted in pairs:
  *           [time1, adjustment1, time2, adjustment2, ...] where each time is
  *           a DST transition point given as a number of hours since 00:00 UTC,
@@ -135,6 +172,7 @@ goog.i18n.TimeZone.createTimeZone = function(timeZoneData) {
   tz.timeZoneId_ = timeZoneData['id'];
   tz.standardOffset_ = -timeZoneData['std_offset'];
   tz.tzNames_ = timeZoneData['names'];
+  tz.tzNamesExt_ = timeZoneData['names_ext'];
   tz.transitions_ = timeZoneData['transitions'];
   return tz;
 };
@@ -154,7 +192,9 @@ goog.i18n.TimeZone.createSimpleTimeZone_ = function(timeZoneOffsetInMinutes) {
   tz.timeZoneId_ =
       goog.i18n.TimeZone.composePosixTimeZoneID_(timeZoneOffsetInMinutes);
   var str = goog.i18n.TimeZone.composeUTCString_(timeZoneOffsetInMinutes);
+  var strGMT = goog.i18n.TimeZone.composeGMTString_(timeZoneOffsetInMinutes);
   tz.tzNames_ = [str, str];
+  tz.tzNamesExt_ = { STD_LONG_NAME_GMT: strGMT, STD_GENERIC_LOCATION: strGMT };
   tz.transitions_ = [];
   return tz;
 };
@@ -232,6 +272,7 @@ goog.i18n.TimeZone.prototype.getTimeZoneData = function() {
     'id': this.timeZoneId_,
     'std_offset': -this.standardOffset_,  // note createTimeZone flips the sign
     'names': goog.array.clone(this.tzNames_),  // avoid aliasing the array
+    'names_ext': goog.object.clone(this.tzNamesExt_), // avoid aliasing
     'transitions': goog.array.clone(this.transitions_)  // avoid aliasing
   };
 };
@@ -339,3 +380,41 @@ goog.i18n.TimeZone.prototype.getTimeZoneId = function() {
 goog.i18n.TimeZone.prototype.isDaylightTime = function(date) {
   return this.getDaylightAdjustment(date) > 0;
 };
+
+
+/**
+ * Get the long GMT time zone name for a given date/time.
+ * @param {!goog.date.DateLike} date The time for which to retrieve
+ *     the long GMT time zone name.
+ * @return {string} The long GMT time zone name.
+ */
+goog.i18n.TimeZone.prototype.getLongNameGMT = function(date) {
+  if (this.isDaylightTime(date)) {
+    return (goog.isDef(this.tzNamesExt_.DST_LONG_NAME_GMT)) ?
+        this.tzNamesExt_.DST_LONG_NAME_GMT :
+        this.tzNamesExt_['DST_LONG_NAME_GMT'];
+  } else {
+    return (goog.isDef(this.tzNamesExt_.STD_LONG_NAME_GMT)) ?
+        this.tzNamesExt_.STD_LONG_NAME_GMT :
+        this.tzNamesExt_['STD_LONG_NAME_GMT'];
+  }
+};
+
+
+/**
+ * Get the generic location time zone name for a given date/time.
+ * @param {!goog.date.DateLike} date The time for which to retrieve
+ *     the generic location time zone name.
+ * @return {string} The generic location time zone name.
+ */
+goog.i18n.TimeZone.prototype.getGenericLocation = function(date) {
+  if (this.isDaylightTime(date)) {
+    return (goog.isDef(this.tzNamesExt_.DST_GENERIC_LOCATION)) ?
+        this.tzNamesExt_.DST_GENERIC_LOCATION :
+        this.tzNamesExt_['DST_GENERIC_LOCATION'];
+  } else {
+    return (goog.isDef(this.tzNamesExt_.STD_GENERIC_LOCATION)) ?
+        this.tzNamesExt_.STD_GENERIC_LOCATION :
+        this.tzNamesExt_['STD_GENERIC_LOCATION'];
+  }
+};