Allow ICU to normalize time zones

littledan · Commit bot · commit bff3074d73fd · 2015-12-10T20:13:45.000Z
There's at least one case of a time zone alias: Asia/Kathmandu aliases Asia/Katmandu. ICU seems to normalize to the (deprecated) latter choice. V8 internationalization choked on this change; this patch interprets ICU's output more precisely and allows it. BUG=chromium:487322 R=jungshik,adamk LOG=Y Review URL: https://codereview.chromium.org/1509273007 Cr-Commit-Position: refs/heads/master@{#32769}
diff --git a/src/js/i18n.js b/src/js/i18n.js
@@ -1574,7 +1574,7 @@ function initializeDateTimeFormat(dateFormat, locales, options) {
   var formatter = %CreateDateTimeFormat(
     requestedLocale, {skeleton: ldmlString, timeZone: tz}, resolved);
 
-  if (!IS_UNDEFINED(tz) && tz !== resolved.timeZone) {
+  if (resolved.timeZone === "Etc/Unknown") {
     throw MakeRangeError(kUnsupportedTimeZone, tz);
   }
 
diff --git a/test/mjsunit/regress/regress-487322.js b/test/mjsunit/regress/regress-487322.js
@@ -0,0 +1,13 @@
+// Copyright 2015 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Normalizes Kat{h,}mandu (chromium:487322)
+df = new Intl.DateTimeFormat('en-US', {'timeZone': 'Asia/Katmandu'})
+assertEquals('Asia/Katmandu', df.resolvedOptions().timeZone);
+
+df = new Intl.DateTimeFormat('en-US', {'timeZone': 'Asia/Kathmandu'})
+assertEquals('Asia/Katmandu', df.resolvedOptions().timeZone);
+
+// Throws for unsupported time zones.
+assertThrows(() => Intl.DateTimeFormat(undefined, {timeZone: 'Aurope/Paris'}));

Original file line number	Diff line number	Diff line change
`@@ -1574,7 +1574,7 @@ function initializeDateTimeFormat(dateFormat, locales, options) {`
`1574`	`1574`	`var formatter = %CreateDateTimeFormat(`
`1575`	`1575`	`requestedLocale, {skeleton: ldmlString, timeZone: tz}, resolved);`
`1576`	`1576`
`1577`		`- if (!IS_UNDEFINED(tz) && tz !== resolved.timeZone) {`
	`1577`	`+ if (resolved.timeZone === "Etc/Unknown") {`
`1578`	`1578`	`throw MakeRangeError(kUnsupportedTimeZone, tz);`
`1579`	`1579`	`}`
`1580`	`1580`