diff --git a/builds/moment-timezone-with-data-2012-2022.js b/builds/moment-timezone-with-data-2012-2022.js index b9c32f24..04fae727 100644 --- a/builds/moment-timezone-with-data-2012-2022.js +++ b/builds/moment-timezone-with-data-2012-2022.js @@ -1,5 +1,5 @@ //! moment-timezone.js -//! version : 0.5.15 +//! version : 0.5.16 //! Copyright (c) JS Foundation and other contributors //! license : MIT //! github.com/moment/moment-timezone @@ -24,7 +24,7 @@ // return moment; // } - var VERSION = "0.5.15", + var VERSION = "0.5.16", zones = {}, links = {}, names = {}, @@ -728,7 +728,7 @@ "Pacific/Pitcairn|-08|80|0||56", "Pacific/Gambier|-09|90|0||125", "Etc/UCT|UCT|0|0|", - "Etc/Universal|UTC|0|0|", + "Etc/UTC|UTC|0|0|", "Europe/Astrakhan|+04 +03|-40 -30|010|1N7y0 3rd0", "Europe/London|GMT BST|0 -10|01010101010101010101010|1GNB0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|10e6", "Europe/Chisinau|EET EEST|-20 -30|01010101010101010101010|1GNA0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|67e4", @@ -1091,11 +1091,11 @@ "Australia/Sydney|Australia/Tasmania", "Australia/Sydney|Australia/Victoria", "Etc/UCT|UCT", - "Etc/Universal|Etc/UTC", - "Etc/Universal|Etc/Zulu", - "Etc/Universal|UTC", - "Etc/Universal|Universal", - "Etc/Universal|Zulu", + "Etc/UTC|Etc/Universal", + "Etc/UTC|Etc/Zulu", + "Etc/UTC|UTC", + "Etc/UTC|Universal", + "Etc/UTC|Zulu", "Europe/Astrakhan|Europe/Ulyanovsk", "Europe/Athens|Asia/Nicosia", "Europe/Athens|EET", diff --git a/builds/moment-timezone-with-data.js b/builds/moment-timezone-with-data.js index b2e3da35..86911d51 100644 --- a/builds/moment-timezone-with-data.js +++ b/builds/moment-timezone-with-data.js @@ -1,5 +1,5 @@ //! moment-timezone.js -//! version : 0.5.15 +//! version : 0.5.16 //! Copyright (c) JS Foundation and other contributors //! license : MIT //! github.com/moment/moment-timezone @@ -24,7 +24,7 @@ // return moment; // } - var VERSION = "0.5.15", + var VERSION = "0.5.16", zones = {}, links = {}, names = {}, @@ -895,7 +895,7 @@ "Etc/GMT+8|-08|80|0|", "Etc/GMT+9|-09|90|0|", "Etc/UCT|UCT|0|0|", - "Etc/Universal|UTC|0|0|", + "Etc/UTC|UTC|0|0|", "Europe/Amsterdam|AMT NST +0120 +0020 CEST CET|-j.w -1j.w -1k -k -20 -10|010101010101010101010101010101010101010101012323234545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545|-2aFcj.w 11b0 1iP0 11A0 1io0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1co0 1io0 1yo0 Pc0 1a00 1fA0 1Bc0 Mo0 1tc0 Uo0 1tA0 U00 1uo0 W00 1s00 VA0 1so0 Vc0 1sM0 UM0 1wo0 Rc0 1u00 Wo0 1rA0 W00 1s00 VA0 1sM0 UM0 1w00 fV0 BCX.w 1tA0 U00 1u00 Wo0 1sm0 601k WM0 1fA0 1cM0 1cM0 1cM0 16M0 1gMM0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|16e5", "Europe/Andorra|WET CET CEST|0 -10 -20|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-UBA0 1xIN0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|79e3", "Europe/Astrakhan|LMT +03 +04 +05|-3c.c -30 -40 -50|012323232323232323212121212121212121212121212121212121212121212|-1Pcrc.c eUMc.c 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 2pB0 1cM0 1fA0 1cM0 3Co0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0 3rd0", @@ -1141,11 +1141,11 @@ "Etc/GMT-0|GMT0", "Etc/GMT-0|Greenwich", "Etc/UCT|UCT", - "Etc/Universal|Etc/UTC", - "Etc/Universal|Etc/Zulu", - "Etc/Universal|UTC", - "Etc/Universal|Universal", - "Etc/Universal|Zulu", + "Etc/UTC|Etc/Universal", + "Etc/UTC|Etc/Zulu", + "Etc/UTC|UTC", + "Etc/UTC|Universal", + "Etc/UTC|Zulu", "Europe/Belgrade|Europe/Ljubljana", "Europe/Belgrade|Europe/Podgorica", "Europe/Belgrade|Europe/Sarajevo", diff --git a/changelog.md b/changelog.md index 574a89c1..919b8d2f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,6 @@ +### `0.5.16` _2018-04-18_ +* Fixed Etc/UTC timezone recognition, updated tests. [#599](https://github.com/moment/moment-timezone/pull/599) + ### `0.5.15` _2018-04-17_ * Updated data to IANA TZDB `2018d`. [#596](https://github.com/moment/moment-timezone/pull/596) diff --git a/data/packed/2018d.json b/data/packed/2018d.json index 3ce67330..09151940 100644 --- a/data/packed/2018d.json +++ b/data/packed/2018d.json @@ -294,7 +294,7 @@ "Etc/GMT+8|-08|80|0|", "Etc/GMT+9|-09|90|0|", "Etc/UCT|UCT|0|0|", - "Etc/Universal|UTC|0|0|", + "Etc/UTC|UTC|0|0|", "Europe/Amsterdam|AMT NST +0120 +0020 CEST CET|-j.w -1j.w -1k -k -20 -10|010101010101010101010101010101010101010101012323234545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545|-2aFcj.w 11b0 1iP0 11A0 1io0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1co0 1io0 1yo0 Pc0 1a00 1fA0 1Bc0 Mo0 1tc0 Uo0 1tA0 U00 1uo0 W00 1s00 VA0 1so0 Vc0 1sM0 UM0 1wo0 Rc0 1u00 Wo0 1rA0 W00 1s00 VA0 1sM0 UM0 1w00 fV0 BCX.w 1tA0 U00 1u00 Wo0 1sm0 601k WM0 1fA0 1cM0 1cM0 1cM0 16M0 1gMM0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|16e5", "Europe/Andorra|WET CET CEST|0 -10 -20|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-UBA0 1xIN0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|79e3", "Europe/Astrakhan|LMT +03 +04 +05|-3c.c -30 -40 -50|012323232323232323212121212121212121212121212121212121212121212|-1Pcrc.c eUMc.c 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 2pB0 1cM0 1fA0 1cM0 3Co0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0 3rd0", @@ -540,11 +540,11 @@ "Etc/GMT-0|GMT0", "Etc/GMT-0|Greenwich", "Etc/UCT|UCT", - "Etc/Universal|Etc/UTC", - "Etc/Universal|Etc/Zulu", - "Etc/Universal|UTC", - "Etc/Universal|Universal", - "Etc/Universal|Zulu", + "Etc/UTC|Etc/Universal", + "Etc/UTC|Etc/Zulu", + "Etc/UTC|UTC", + "Etc/UTC|Universal", + "Etc/UTC|Zulu", "Europe/Belgrade|Europe/Ljubljana", "Europe/Belgrade|Europe/Podgorica", "Europe/Belgrade|Europe/Sarajevo", diff --git a/data/packed/latest.json b/data/packed/latest.json index 3ce67330..09151940 100644 --- a/data/packed/latest.json +++ b/data/packed/latest.json @@ -294,7 +294,7 @@ "Etc/GMT+8|-08|80|0|", "Etc/GMT+9|-09|90|0|", "Etc/UCT|UCT|0|0|", - "Etc/Universal|UTC|0|0|", + "Etc/UTC|UTC|0|0|", "Europe/Amsterdam|AMT NST +0120 +0020 CEST CET|-j.w -1j.w -1k -k -20 -10|010101010101010101010101010101010101010101012323234545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545|-2aFcj.w 11b0 1iP0 11A0 1io0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1co0 1io0 1yo0 Pc0 1a00 1fA0 1Bc0 Mo0 1tc0 Uo0 1tA0 U00 1uo0 W00 1s00 VA0 1so0 Vc0 1sM0 UM0 1wo0 Rc0 1u00 Wo0 1rA0 W00 1s00 VA0 1sM0 UM0 1w00 fV0 BCX.w 1tA0 U00 1u00 Wo0 1sm0 601k WM0 1fA0 1cM0 1cM0 1cM0 16M0 1gMM0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|16e5", "Europe/Andorra|WET CET CEST|0 -10 -20|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-UBA0 1xIN0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|79e3", "Europe/Astrakhan|LMT +03 +04 +05|-3c.c -30 -40 -50|012323232323232323212121212121212121212121212121212121212121212|-1Pcrc.c eUMc.c 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 2pB0 1cM0 1fA0 1cM0 3Co0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0 3rd0", @@ -540,11 +540,11 @@ "Etc/GMT-0|GMT0", "Etc/GMT-0|Greenwich", "Etc/UCT|UCT", - "Etc/Universal|Etc/UTC", - "Etc/Universal|Etc/Zulu", - "Etc/Universal|UTC", - "Etc/Universal|Universal", - "Etc/Universal|Zulu", + "Etc/UTC|Etc/Universal", + "Etc/UTC|Etc/Zulu", + "Etc/UTC|UTC", + "Etc/UTC|Universal", + "Etc/UTC|Zulu", "Europe/Belgrade|Europe/Ljubljana", "Europe/Belgrade|Europe/Podgorica", "Europe/Belgrade|Europe/Sarajevo", diff --git a/moment-timezone-utils.js b/moment-timezone-utils.js index e0ba49d9..1879599f 100644 --- a/moment-timezone-utils.js +++ b/moment-timezone-utils.js @@ -1,5 +1,5 @@ //! moment-timezone-utils.js -//! version : 0.5.15 +//! version : 0.5.16 //! Copyright (c) JS Foundation and other contributors //! license : MIT //! github.com/moment/moment-timezone @@ -172,7 +172,7 @@ return arraysAreEqual(a.offsets, b.offsets) && arraysAreEqual(a.abbrs, b.abbrs) && arraysAreEqual(a.untils, b.untils); } - function findAndCreateLinks (input, output, links) { + function findAndCreateLinks (input, output, links, groupLeaders) { var i, j, a, b, group, foundGroup, groups = []; for (i = 0; i < input.length; i++) { @@ -185,7 +185,9 @@ if (zonesAreEqual(a, b)) { if (a.population > b.population) { group.unshift(a); - } else { + } else if (a.population === b.population && groupLeaders && groupLeaders[a.name]) { + group.unshift(a); + } else { group.push(a); } foundGroup = true; @@ -206,7 +208,7 @@ } } - function createLinks (source) { + function createLinks (source, groupLeaders) { var zones = [], links = []; @@ -214,7 +216,7 @@ links = source.links.slice(); } - findAndCreateLinks(source.zones, zones, links); + findAndCreateLinks(source.zones, zones, links, groupLeaders); return { version : source.version, @@ -279,7 +281,7 @@ Filter, Link, and Pack ************************************/ - function filterLinkPack (input, start, end) { + function filterLinkPack (input, start, end, groupLeaders) { var i, inputZones = input.zones, outputZones = [], @@ -293,7 +295,7 @@ zones : outputZones, links : input.links.slice(), version : input.version - }); + }, groupLeaders); for (i = 0; i < output.zones.length; i++) { output.zones[i] = pack(output.zones[i]); diff --git a/moment-timezone.js b/moment-timezone.js index 658952d9..7710b7fa 100644 --- a/moment-timezone.js +++ b/moment-timezone.js @@ -1,5 +1,5 @@ //! moment-timezone.js -//! version : 0.5.15 +//! version : 0.5.16 //! Copyright (c) JS Foundation and other contributors //! license : MIT //! github.com/moment/moment-timezone @@ -24,7 +24,7 @@ // return moment; // } - var VERSION = "0.5.15", + var VERSION = "0.5.16", zones = {}, links = {}, names = {}, diff --git a/package.json b/package.json index 87cc03dd..a35f7a29 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "moment-timezone", - "version": "0.5.15", + "version": "0.5.16", "description": "Parse and display moments in any timezone.", "homepage": "http://momentjs.com/timezone/", "author": "Tim Wood (http://timwoodcreates.com/)", diff --git a/tasks/builds.js b/tasks/builds.js index 73796a8c..581b21f1 100644 --- a/tasks/builds.js +++ b/tasks/builds.js @@ -1,6 +1,7 @@ "use strict"; -var tz = require('../moment-timezone-utils').tz; +var tz = require('../moment-timezone-utils').tz, + groupLeaders = require('./group-leaders.json'); module.exports = function (grunt) { grunt.registerMultiTask('build', 'Build minified versions with data included.', function () { @@ -18,7 +19,7 @@ module.exports = function (grunt) { end = this.data[1]; } - data = tz.filterLinkPack(data, start, end); + data = tz.filterLinkPack(data, start, end, groupLeaders); data = JSON.stringify(data, null, '\t'); data = data.split('\n').join('\n\t'); data = 'loadData(' + data + ');\n'; diff --git a/tasks/data-pack.js b/tasks/data-pack.js index 5b5ce9e5..270ab65d 100644 --- a/tasks/data-pack.js +++ b/tasks/data-pack.js @@ -1,13 +1,14 @@ "use strict"; -var tz = require('../moment-timezone-utils').tz; +var tz = require('../moment-timezone-utils').tz, + groupLeaders = require('./group-leaders.json'); module.exports = function (grunt) { grunt.registerTask('data-pack', '6. Pack data from data-dedupe.', function (version) { version = version || 'latest'; var unpacked = grunt.file.readJSON('data/unpacked/' + version + '.json'), - output = tz.createLinks(unpacked); + output = tz.createLinks(unpacked, groupLeaders); output.zones = output.zones.map(function (unpacked) { return tz.pack(unpacked); diff --git a/tasks/group-leaders.json b/tasks/group-leaders.json new file mode 100644 index 00000000..fe9280da --- /dev/null +++ b/tasks/group-leaders.json @@ -0,0 +1,545 @@ +{ + "Africa/Abidjan": [ + "Africa/Abidjan", + "Africa/Bamako", + "Africa/Banjul", + "Africa/Conakry", + "Africa/Dakar", + "Africa/Freetown", + "Africa/Lome", + "Africa/Nouakchott", + "Africa/Ouagadougou", + "Africa/Timbuktu", + "Atlantic/St_Helena" + ], + "Africa/Nairobi": [ + "Africa/Nairobi", + "Africa/Addis_Ababa", + "Africa/Asmara", + "Africa/Asmera", + "Africa/Dar_es_Salaam", + "Africa/Djibouti", + "Africa/Kampala", + "Africa/Mogadishu", + "Indian/Antananarivo", + "Indian/Comoro", + "Indian/Mayotte" + ], + "Africa/Lagos": [ + "Africa/Lagos", + "Africa/Bangui", + "Africa/Brazzaville", + "Africa/Douala", + "Africa/Kinshasa", + "Africa/Libreville", + "Africa/Luanda", + "Africa/Malabo", + "Africa/Niamey", + "Africa/Porto-Novo" + ], + "Africa/Maputo": [ + "Africa/Maputo", + "Africa/Blantyre", + "Africa/Bujumbura", + "Africa/Gaborone", + "Africa/Harare", + "Africa/Kigali", + "Africa/Lubumbashi", + "Africa/Lusaka" + ], + "Africa/Cairo": [ + "Africa/Cairo", + "Egypt" + ], + "Africa/Johannesburg": [ + "Africa/Johannesburg", + "Africa/Maseru", + "Africa/Mbabane" + ], + "Africa/Tripoli": [ + "Africa/Tripoli", + "Libya" + ], + "America/Adak": [ + "America/Adak", + "America/Atka", + "US/Aleutian" + ], + "America/Anchorage": [ + "America/Anchorage", + "US/Alaska" + ], + "America/Port_of_Spain": [ + "America/Port_of_Spain", + "America/Anguilla", + "America/Antigua", + "America/Dominica", + "America/Grenada", + "America/Guadeloupe", + "America/Marigot", + "America/Montserrat", + "America/St_Barthelemy", + "America/St_Kitts", + "America/St_Lucia", + "America/St_Thomas", + "America/St_Vincent", + "America/Tortola", + "America/Virgin" + ], + "America/Argentina/Buenos_Aires": [ + "America/Argentina/Buenos_Aires", + "America/Buenos_Aires" + ], + "America/Argentina/Catamarca": [ + "America/Argentina/Catamarca", + "America/Argentina/ComodRivadavia", + "America/Catamarca" + ], + "America/Argentina/Cordoba": [ + "America/Argentina/Cordoba", + "America/Cordoba", + "America/Rosario" + ], + "America/Argentina/Jujuy": [ + "America/Argentina/Jujuy", + "America/Jujuy" + ], + "America/Argentina/Mendoza": [ + "America/Argentina/Mendoza", + "America/Mendoza" + ], + "America/Curacao": [ + "America/Curacao", + "America/Aruba", + "America/Kralendijk", + "America/Lower_Princes" + ], + "America/Atikokan": [ + "America/Atikokan", + "America/Coral_Harbour" + ], + "America/Panama": [ + "America/Panama", + "America/Cayman" + ], + "America/Chicago": [ + "America/Chicago", + "US/Central" + ], + "America/Denver": [ + "America/Denver", + "America/Shiprock", + "Navajo", + "US/Mountain" + ], + "America/Detroit": [ + "America/Detroit", + "US/Michigan" + ], + "America/Edmonton": [ + "America/Edmonton", + "Canada/Mountain" + ], + "America/Tijuana": [ + "America/Tijuana", + "America/Santa_Isabel", + "America/Ensenada", + "Mexico/BajaNorte" + ], + "America/Fort_Wayne": [ + "America/Fort_Wayne", + "America/Indiana/Indianapolis", + "America/Indianapolis", + "US/East-Indiana" + ], + "America/Halifax": [ + "America/Halifax", + "Canada/Atlantic" + ], + "America/Havana": [ + "America/Havana", + "Cuba" + ], + "America/Indiana/Knox": [ + "America/Indiana/Knox", + "America/Knox_IN", + "US/Indiana-Starke" + ], + "America/Jamaica": [ + "America/Jamaica", + "Jamaica" + ], + "America/Kentucky/Louisville": [ + "America/Kentucky/Louisville", + "America/Louisville" + ], + "America/Los_Angeles": [ + "America/Los_Angeles", + "US/Pacific-New", + "US/Pacific" + ], + "America/Manaus": [ + "America/Manaus", + "Brazil/West" + ], + "America/Mazatlan": [ + "America/Mazatlan", + "Mexico/BajaSur" + ], + "America/Mexico_City": [ + "America/Mexico_City", + "Mexico/General" + ], + "America/Toronto": [ + "America/Toronto", + "America/Montreal", + "Canada/Eastern" + ], + "America/New_York": [ + "America/New_York", + "US/Eastern" + ], + "America/Noronha": [ + "America/Noronha", + "Brazil/DeNoronha" + ], + "America/Phoenix": [ + "America/Phoenix", + "US/Arizona" + ], + "America/Rio_Branco": [ + "America/Rio_Branco", + "America/Porto_Acre", + "Brazil/Acre" + ], + "America/Regina": [ + "America/Regina", + "Canada/Saskatchewan" + ], + "America/Santiago": [ + "America/Santiago", + "Chile/Continental" + ], + "America/Sao_Paulo": [ + "America/Sao_Paulo", + "Brazil/East" + ], + "America/St_Johns": [ + "America/St_Johns", + "Canada/Newfoundland" + ], + "America/Vancouver": [ + "America/Vancouver", + "Canada/Pacific" + ], + "America/Whitehorse": [ + "America/Whitehorse", + "Canada/Yukon" + ], + "America/Winnipeg": [ + "America/Winnipeg", + "Canada/Central" + ], + "Pacific/Auckland": [ + "Pacific/Auckland", + "Antarctica/McMurdo", + "Antarctica/South_Pole", + "NZ" + ], + "Europe/Oslo": [ + "Europe/Oslo", + "Arctic/Longyearbyen", + "Atlantic/Jan_Mayen" + ], + "Asia/Riyadh": [ + "Asia/Riyadh", + "Asia/Aden", + "Asia/Kuwait" + ], + "Asia/Ashgabat": [ + "Asia/Ashgabat", + "Asia/Ashkhabad" + ], + "Asia/Qatar": [ + "Asia/Qatar", + "Asia/Bahrain" + ], + "Asia/Bangkok": [ + "Asia/Bangkok", + "Asia/Phnom_Penh", + "Asia/Vientiane" + ], + "Asia/Kolkata": [ + "Asia/Kolkata", + "Asia/Calcutta" + ], + "Asia/Shanghai": [ + "Asia/Shanghai", + "Asia/Chongqing", + "Asia/Chungking", + "Asia/Harbin", + "PRC" + ], + "Asia/Dhaka": [ + "Asia/Dhaka", + "Asia/Dacca" + ], + "Asia/Dubai": [ + "Asia/Dubai", + "Asia/Muscat" + ], + "Asia/Ho_Chi_Minh": [ + "Asia/Ho_Chi_Minh", + "Asia/Saigon" + ], + "Asia/Hong_Kong": [ + "Asia/Hong_Kong", + "Hongkong" + ], + "Europe/Istanbul": [ + "Europe/Istanbul", + "Asia/Istanbul", + "Turkey" + ], + "Asia/Jerusalem": [ + "Asia/Jerusalem", + "Asia/Tel_Aviv", + "Israel" + ], + "Asia/Urumqi": [ + "Asia/Urumqi", + "Asia/Kashgar" + ], + "Asia/Kathmandu": [ + "Asia/Kathmandu", + "Asia/Katmandu" + ], + "Asia/Kuala_Lumpur": [ + "Asia/Kuala_Lumpur", + "Asia/Singapore", + "Singapore" + ], + "Asia/Macau": [ + "Asia/Macau", + "Asia/Macao" + ], + "Asia/Makassar": [ + "Asia/Makassar", + "Asia/Ujung_Pandang" + ], + "Asia/Nicosia": [ + "Asia/Nicosia", + "Europe/Nicosia" + ], + "Asia/Rangoon": [ + "Asia/Rangoon", + "Asia/Yangon" + ], + "Asia/Seoul": [ + "Asia/Seoul", + "ROK" + ], + "Asia/Taipei": [ + "Asia/Taipei", + "ROC" + ], + "Asia/Tehran": [ + "Asia/Tehran", + "Iran" + ], + "Asia/Thimphu": [ + "Asia/Thimphu", + "Asia/Thimbu" + ], + "Asia/Tokyo": [ + "Asia/Tokyo", + "Japan" + ], + "Asia/Ulaanbaatar": [ + "Asia/Ulaanbaatar", + "Asia/Ulan_Bator" + ], + "Atlantic/Faroe": [ + "Atlantic/Faroe", + "Atlantic/Faeroe" + ], + "Atlantic/Reykjavik": [ + "Atlantic/Reykjavik", + "Iceland" + ], + "Atlantic/South_Georgia": [ + "Atlantic/South_Georgia", + "Etc/GMT+2" + ], + "Australia/Sydney": [ + "Australia/Sydney", + "Australia/ACT", + "Australia/Canberra", + "Australia/NSW" + ], + "Australia/Adelaide": [ + "Australia/Adelaide", + "Australia/South" + ], + "Australia/Brisbane": [ + "Australia/Brisbane", + "Australia/Queensland" + ], + "Australia/Broken_Hill": [ + "Australia/Broken_Hill", + "Australia/Yancowinna" + ], + "Australia/Darwin": [ + "Australia/Darwin", + "Australia/North" + ], + "Australia/Hobart": [ + "Australia/Hobart", + "Australia/Tasmania" + ], + "Australia/Lord_Howe": [ + "Australia/Lord_Howe", + "Australia/LHI" + ], + "Australia/Melbourne": [ + "Australia/Melbourne", + "Australia/Victoria" + ], + "Australia/Perth": [ + "Australia/Perth", + "Australia/West" + ], + "Pacific/Easter": [ + "Pacific/Easter", + "Chile/EasterIsland" + ], + "Europe/Dublin": [ + "Europe/Dublin", + "Eire" + ], + "Etc/GMT-0": [ + "Etc/GMT-0", + "Etc/GMT", + "Etc/GMT+0", + "Etc/GMT0", + "Etc/Greenwich", + "GMT-0", + "GMT", + "GMT+0", + "GMT0", + "Greenwich" + ], + "Pacific/Port_Moresby": [ + "Pacific/Port_Moresby", + "Pacific/Chuuk", + "Etc/GMT-10", + "Pacific/Truk", + "Pacific/Yap" + ], + "Pacific/Pohnpei": [ + "Pacific/Pohnpei", + "Etc/GMT-11", + "Pacific/Ponape" + ], + "Pacific/Tarawa": [ + "Pacific/Tarawa", + "Pacific/Funafuti", + "Etc/GMT-12", + "Pacific/Wake", + "Pacific/Wallis" + ], + "Indian/Christmas": [ + "Indian/Christmas", + "Etc/GMT-7" + ], + "Pacific/Palau": [ + "Pacific/Palau", + "Etc/GMT-9" + ], + "Etc/UCT": [ + "Etc/UCT", + "UCT" + ], + "Etc/UTC": [ + "Etc/Universal", + "Etc/UTC", + "Etc/Zulu", + "Universal", + "UTC", + "Zulu" + ], + "Europe/London": [ + "Europe/London", + "Europe/Belfast", + "Europe/Guernsey", + "Europe/Isle_of_Man", + "Europe/Jersey", + "GB-Eire", + "GB" + ], + "Europe/Belgrade": [ + "Europe/Belgrade", + "Europe/Ljubljana", + "Europe/Podgorica", + "Europe/Sarajevo", + "Europe/Skopje", + "Europe/Zagreb" + ], + "Europe/Prague": [ + "Europe/Prague", + "Europe/Bratislava" + ], + "Europe/Zurich": [ + "Europe/Zurich", + "Europe/Busingen", + "Europe/Vaduz" + ], + "Europe/Chisinau": [ + "Europe/Chisinau", + "Europe/Tiraspol" + ], + "Europe/Helsinki": [ + "Europe/Helsinki", + "Europe/Mariehamn" + ], + "Europe/Lisbon": [ + "Europe/Lisbon", + "Portugal" + ], + "Europe/Moscow": [ + "Europe/Moscow", + "W-SU" + ], + "Europe/Rome": [ + "Europe/Rome", + "Europe/San_Marino", + "Europe/Vatican" + ], + "Europe/Warsaw": [ + "Europe/Warsaw", + "Poland" + ], + "Pacific/Kwajalein": [ + "Pacific/Kwajalein", + "Kwajalein" + ], + "Pacific/Chatham": [ + "Pacific/Chatham", + "NZ-CHAT" + ], + "Pacific/Guam": [ + "Pacific/Guam", + "Pacific/Saipan" + ], + "Pacific/Honolulu": [ + "Pacific/Honolulu", + "Pacific/Johnston", + "US/Hawaii" + ], + "Pacific/Pago_Pago": [ + "Pacific/Pago_Pago", + "Pacific/Midway", + "Pacific/Samoa", + "US/Samoa" + ] +} \ No newline at end of file diff --git a/tests/zones/etc/uct.js b/tests/zones/etc/uct.js index 79ed2980..10c3b51d 100644 --- a/tests/zones/etc/uct.js +++ b/tests/zones/etc/uct.js @@ -3,5 +3,5 @@ var helpers = require("../../helpers/helpers"); exports["Etc/UCT"] = { - + "guess" : helpers.makeTestGuess("Etc/UCT", { offset: false, abbr: true }), }; \ No newline at end of file diff --git a/tests/zones/etc/universal.js b/tests/zones/etc/universal.js index 5c2e5e02..099141ad 100644 --- a/tests/zones/etc/universal.js +++ b/tests/zones/etc/universal.js @@ -3,5 +3,5 @@ var helpers = require("../../helpers/helpers"); exports["Etc/Universal"] = { - + "guess" : helpers.makeTestGuess("Etc/Universal", { offset: false, abbr: true, expect: "Etc/UTC" }), }; \ No newline at end of file diff --git a/tests/zones/etc/utc.js b/tests/zones/etc/utc.js index f1d02334..30bd495b 100644 --- a/tests/zones/etc/utc.js +++ b/tests/zones/etc/utc.js @@ -3,5 +3,5 @@ var helpers = require("../../helpers/helpers"); exports["Etc/UTC"] = { - + "guess" : helpers.makeTestGuess("Etc/UTC", { offset: false, abbr: true }), }; \ No newline at end of file diff --git a/tests/zones/etc/zulu.js b/tests/zones/etc/zulu.js index 3cfb9e57..18aa5376 100644 --- a/tests/zones/etc/zulu.js +++ b/tests/zones/etc/zulu.js @@ -3,5 +3,5 @@ var helpers = require("../../helpers/helpers"); exports["Etc/Zulu"] = { - + "guess" : helpers.makeTestGuess("Etc/Zulu", { offset: false, abbr: true, expect: "Etc/UTC" }), }; \ No newline at end of file