4e18190e69
1. Location names with more than one underscores (e.g. Ho_Chi_Minh) didn't work because of the way capturing works with repeated patterns in RE. It's now supported by changing the RE to capture the whole string and splitting on '_' in the next step. 2. Adds support for location names with a hyphen 3. Adds support for timezone ids with three parts (e.g. American/Argentina/Buenos_Aires) 4. Adds special handling of 'au', 'es' and 'of' in zone ids. They need to be kept in lowercase. (see the full list at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones ) 5. Adds regression tests for all the above and make the existing tests more robust against future ICU changes. ICU canonicalizes zone names to deprecated names, but it may change. ( http://bugs.icu-project.org/trac/ticket/12044 ) BUG=364374 LOG=Y Review URL: https://codereview.chromium.org/1529363005 Cr-Commit-Position: refs/heads/master@{#33097}
57 lines
2.9 KiB
JavaScript
57 lines
2.9 KiB
JavaScript
// 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.
|
|
|
|
if (this.Intl) {
|
|
// chromium:364374
|
|
|
|
// Locations with 2 underscores are accepted and normalized.
|
|
// 'of' and 'es' are always lowercased.
|
|
df = new Intl.DateTimeFormat('en-US', {'timeZone': 'eUrope/isLe_OF_man'})
|
|
assertEquals('Europe/Isle_of_Man', df.resolvedOptions().timeZone);
|
|
|
|
df = new Intl.DateTimeFormat('en-US', {'timeZone': 'africa/Dar_eS_salaam'})
|
|
assertEquals('Africa/Dar_es_Salaam', df.resolvedOptions().timeZone);
|
|
|
|
df = new Intl.DateTimeFormat('en-US', {'timeZone': 'America/port_of_spain'})
|
|
assertEquals('America/Port_of_Spain', df.resolvedOptions().timeZone);
|
|
|
|
// Zone ids with more than 2 parts are accepted and normalized.
|
|
df = new Intl.DateTimeFormat('en-US', {'timeZone': 'America/north_Dakota/new_salem'})
|
|
assertEquals('America/North_Dakota/New_Salem', df.resolvedOptions().timeZone);
|
|
|
|
// 3-part zone IDs are accepted and normalized.
|
|
// Two Buenose Aires aliases are identical.
|
|
df1 = new Intl.DateTimeFormat('en-US', {'timeZone': 'America/aRgentina/buenos_aIres'})
|
|
df2 = new Intl.DateTimeFormat('en-US', {'timeZone': 'America/Argentina/Buenos_Aires'})
|
|
assertEquals(df1.resolvedOptions().timeZone, df2.resolvedOptions().timeZone);
|
|
|
|
df2 = new Intl.DateTimeFormat('en-US', {'timeZone': 'America/Buenos_Aires'})
|
|
assertEquals(df1.resolvedOptions().timeZone, df2.resolvedOptions().timeZone);
|
|
|
|
df1 = new Intl.DateTimeFormat('en-US', {'timeZone': 'America/Indiana/Indianapolis'})
|
|
df2 = new Intl.DateTimeFormat('en-US', {'timeZone': 'America/Indianapolis'})
|
|
assertEquals(df1.resolvedOptions().timeZone, df2.resolvedOptions().timeZone);
|
|
|
|
// ICU does not recognize East-Indiana. Add later when it does.
|
|
// df2 = new Intl.DateTimeFormat('en-US', {'timeZone': 'America/East-Indiana'})
|
|
// assertEquals(df1.resolvedOptions().timeZone, df2.resolvedOptions().timeZone);
|
|
|
|
|
|
// Zone IDs with hyphens. 'au' has to be in lowercase.
|
|
df = new Intl.DateTimeFormat('en-US', {'timeZone': 'America/port-aU-pRince'})
|
|
assertEquals('America/Port-au-Prince', df.resolvedOptions().timeZone);
|
|
|
|
// Accepts Ho_Chi_Minh and treats it as identical to Saigon
|
|
df1 = new Intl.DateTimeFormat('en-US', {'timeZone': 'Asia/Ho_Chi_Minh'})
|
|
df2 = new Intl.DateTimeFormat('en-US', {'timeZone': 'Asia/Saigon'})
|
|
assertEquals(df1.resolvedOptions().timeZone, df2.resolvedOptions().timeZone);
|
|
|
|
// Throws for invalid timezone ids.
|
|
assertThrows(() => Intl.DateTimeFormat(undefined, {timeZone: 'Europe/_Paris'}));
|
|
assertThrows(() => Intl.DateTimeFormat(undefined, {timeZone: 'America/New__York'}));
|
|
assertThrows(() => Intl.DateTimeFormat(undefined, {timeZone: 'America//New_York'}));
|
|
assertThrows(() => Intl.DateTimeFormat(undefined, {timeZone: 'America/New_York_'}));
|
|
assertThrows(() => Intl.DateTimeFormat(undefined, {timeZone: 'America/New_Y0rk'}));
|
|
}
|