github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-29 02:53:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Update moment-timezone-with-data (#22313)

Browse Source 
`Africa/Cairo` timezone introduced DST so I replaced it in tests with `America/Lima`
This commit is contained in:
Jarek Radosz 2023-06-28 11:33:55 +02:00 committed by GitHub
parent 80bd7d7509
commit 7791bb1276
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 112 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/tests/fixtures/topic.js vendored
View File

@ -3256,7 +3256,7 @@ export default {
avatar_template: "/letter_avatar_proxy/v4/letter/b/3be4f8/{size}.png", avatar_template: "/letter_avatar_proxy/v4/letter/b/3be4f8/{size}.png",
created_at: "2020-07-05T09:28:36.371Z", created_at: "2020-07-05T09:28:36.371Z",
cooked: cooked:
'<p><span data-date="2021-09-30" data-time="13:00:00" class="discourse-local-date" data-timezone="Africa/Cairo" data-email-preview="2021-09-30T11:00:00Z UTC">2021-09-30T11:00:00Z</span></p>', '<p><span data-date="2021-09-30" data-time="13:00:00" class="discourse-local-date" data-timezone="America/Lima" data-email-preview="2021-09-30T18:00:00Z UTC">2021-09-30T18:00:00Z</span></p>',
post_number: 1, post_number: 1,
post_type: 1, post_type: 1,
updated_at: "2020-07-05T09:28:36.371Z", updated_at: "2020-07-05T09:28:36.371Z",

71
plugins/discourse-local-dates/test/javascripts/acceptance/download-calendar-test.js
View File

@ -1,8 +1,4 @@
import { import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance,
exists,
query,
} from "discourse/tests/helpers/qunit-helpers";
import { click, visit } from "@ember/test-helpers"; import { click, visit } from "@ember/test-helpers";
import I18n from "I18n"; import I18n from "I18n";
import { test } from "qunit"; import { test } from "qunit";
@ -18,24 +14,25 @@ acceptance(
needs.pretender((server, helper) => { needs.pretender((server, helper) => {
const response = cloneJSON(fixturesByUrl["/t/281.json"]); const response = cloneJSON(fixturesByUrl["/t/281.json"]);
const startDate = moment const startDate = moment
.tz("Africa/Cairo") .tz("America/Lima")
.add(1, "days") .add(1, "days")
.format("YYYY-MM-DD"); .format("YYYY-MM-DD");
response.post_stream.posts[0].cooked = `<p><span data-date=\"${startDate}\" data-time=\"13:00:00\" class=\"discourse-local-date\" data-timezone=\"Africa/Cairo\" data-email-preview=\"${startDate}T11:00:00Z UTC\">${startDate}T11:00:00Z</span></p>`; response.post_stream.posts[0].cooked = `<p><span data-date=\"${startDate}\" data-time=\"13:00:00\" class=\"discourse-local-date\" data-timezone=\"America/Lima\" data-email-preview=\"${startDate}T18:00:00Z UTC\">${startDate}T18:00:00Z</span></p>`;
server.get("/t/281.json", () => helper.response(response)); server.get("/t/281.json", () => helper.response(response));
}); });
test("Display pick calendar modal", async function (assert) { test("Display pick calendar modal", async function (assert) {
await visit("/t/local-dates/281"); await visit("/t/local-dates/281");
await click(".discourse-local-date"); await click(".discourse-local-date");
await click(document.querySelector(".download-calendar")); await click(".download-calendar");
assert.strictEqual(
query("#discourse-modal-title").textContent.trim(), assert
I18n.t("download_calendar.title"), .dom("#discourse-modal-title")
"it should display modal to select calendar" .hasText(
); I18n.t("download_calendar.title"),
"it should display modal to select calendar"
);
}); });
} }
); );
@ -48,20 +45,20 @@ acceptance(
needs.pretender((server, helper) => { needs.pretender((server, helper) => {
const response = cloneJSON(fixturesByUrl["/t/281.json"]); const response = cloneJSON(fixturesByUrl["/t/281.json"]);
const startDate = moment const startDate = moment
.tz("Africa/Cairo") .tz("America/Lima")
.subtract(1, "days") .subtract(1, "days")
.format("YYYY-MM-DD"); .format("YYYY-MM-DD");
response.post_stream.posts[0].cooked = `<p><span data-date=\"${startDate}\" data-time=\"13:00:00\" class=\"discourse-local-date\" data-timezone=\"Africa/Cairo\" data-email-preview=\"${startDate}T11:00:00Z UTC\">${startDate}T11:00:00Z</span></p>`; response.post_stream.posts[0].cooked = `<p><span data-date=\"${startDate}\" data-time=\"13:00:00\" class=\"discourse-local-date\" data-timezone=\"America/Lima\" data-email-preview=\"${startDate}T18:00:00Z UTC\">${startDate}T18:00:00Z</span></p>`;
server.get("/t/281.json", () => helper.response(response)); server.get("/t/281.json", () => helper.response(response));
}); });
test("Does not show add to calendar button", async function (assert) { test("Does not show add to calendar button", async function (assert) {
await visit("/t/local-dates/281"); await visit("/t/local-dates/281");
await click(".discourse-local-date"); await click(".discourse-local-date");
assert.ok(!exists(document.querySelector(".download-calendar")));
assert.dom(".download-calendar").doesNotExist();
}); });
} }
); );
@ -74,38 +71,38 @@ acceptance(
needs.pretender((server, helper) => { needs.pretender((server, helper) => {
const response = cloneJSON(fixturesByUrl["/t/281.json"]); const response = cloneJSON(fixturesByUrl["/t/281.json"]);
const startDate = moment const startDate = moment
.tz("Africa/Cairo") .tz("America/Lima")
.add(1, "days") .add(1, "days")
.format("YYYY-MM-DD"); .format("YYYY-MM-DD");
response.post_stream.posts[0].cooked = `<p><span data-date=\"${startDate}\" data-time=\"13:00:00\" class=\"discourse-local-date\" data-timezone=\"Africa/Cairo\" data-email-preview=\"${startDate}T11:00:00Z UTC\">${startDate}T11:00:00Z</span></p>`; response.post_stream.posts[0].cooked = `<p><span data-date=\"${startDate}\" data-time=\"13:00:00\" class=\"discourse-local-date\" data-timezone=\"America/Lima\" data-email-preview=\"${startDate}T18:00:00Z UTC\">${startDate}T18:00:00Z</span></p>`;
response.title = " title to trim "; response.title = " title to trim ";
server.get("/t/281.json", () => helper.response(response)); server.get("/t/281.json", () => helper.response(response));
}); });
needs.hooks.beforeEach(function () {
let win = { focus: function () {} };
sinon.stub(window, "open").returns(win);
sinon.stub(win, "focus");
});
test("saves into default calendar", async function (assert) { test("saves into default calendar", async function (assert) {
const startDate = moment const startDate = moment
.tz("Africa/Cairo") .tz("America/Lima")
.add(1, "days") .add(1, "days")
.format("YYYYMMDD"); .format("YYYYMMDD");
await visit("/t/local-dates/281"); await visit("/t/local-dates/281");
sinon.stub(window, "open").callsFake(function () {
assert.deepEqual(
[...arguments],
[
`https://www.google.com/calendar/event?action=TEMPLATE&text=title%20to%20trim&dates=${startDate}T180000Z/${startDate}T190000Z`,
"_blank",
"noopener",
"noreferrer",
]
);
return { focus() {} };
});
await click(".discourse-local-date"); await click(".discourse-local-date");
await click(document.querySelector(".download-calendar")); await click(".download-calendar");
assert.ok(!exists(document.querySelector("#discourse-modal-title")));
assert.ok( assert.dom("#discourse-modal-title").doesNotExist();
window.open.calledWith(
`https://www.google.com/calendar/event?action=TEMPLATE&text=title%20to%20trim&dates=${startDate}T110000Z/${startDate}T120000Z`,
"_blank",
"noopener",
"noreferrer"
)
);
}); });
} }
); );

153
vendor/assets/javascripts/moment-timezone-with-data.js vendored
View File

@ -1,5 +1,5 @@
//! moment-timezone.js //! moment-timezone.js
//! version : 0.5.39 //! version : 0.5.43
//! Copyright (c) JS Foundation and other contributors //! Copyright (c) JS Foundation and other contributors
//! license : MIT //! license : MIT
//! github.com/moment/moment-timezone //! github.com/moment/moment-timezone
@ -29,7 +29,7 @@
// return moment; // return moment;
// } // }
var VERSION = "0.5.39", var VERSION = "0.5.43",
zones = {}, zones = {},
links = {}, links = {},
countries = {}, countries = {},
@ -691,102 +691,101 @@
} }
loadData({ loadData({
"version": "2022f", "version": "2023c",
"zones": [ "zones": [
"Africa/Abidjan|GMT|0|0||48e5", "Africa/Abidjan|GMT|0|0||48e5",
"Africa/Nairobi|EAT|-30|0||47e5", "Africa/Nairobi|EAT|-30|0||47e5",
"Africa/Algiers|CET|-10|0||26e5", "Africa/Algiers|CET|-10|0||26e5",
"Africa/Lagos|WAT|-10|0||17e6", "Africa/Lagos|WAT|-10|0||17e6",
"Africa/Maputo|CAT|-20|0||26e5", "Africa/Khartoum|CAT|-20|0||51e5",
"Africa/Cairo|EET|-20|0||15e6", "Africa/Cairo|EET EEST|-20 -30|0101010101010|29NW0 1cL0 1cN0 1fz0 1a10 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0|15e6",
"Africa/Casablanca|+00 +01|0 -10|01010101010101010101010101|1T0q0 mo0 gM0 LA0 WM0 jA0 e00 28M0 e00 2600 gM0 2600 e00 2600 gM0 2600 gM0 2600 e00 2600 gM0 2600 e00 28M0 e00|32e5", "Africa/Casablanca|+00 +01|0 -10|010101010101010101010101|1Vq20 jA0 e00 28M0 e00 2600 gM0 2600 e00 2600 gM0 2600 e00 28M0 e00 2600 gM0 2600 e00 28M0 e00 2600 gM0|32e5",
"Europe/Paris|CET CEST|-10 -20|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|11e6", "Europe/Paris|CET CEST|-10 -20|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|11e6",
"Africa/Johannesburg|SAST|-20|0||84e5", "Africa/Johannesburg|SAST|-20|0||84e5",
"Africa/Juba|EAT CAT|-30 -20|01|24nx0|", "Africa/Juba|EAT CAT|-30 -20|01|24nx0|",
"Africa/Khartoum|EAT CAT|-30 -20|01|1Usl0|51e5",
"Africa/Sao_Tome|GMT WAT|0 -10|010|1UQN0 2q00|", "Africa/Sao_Tome|GMT WAT|0 -10|010|1UQN0 2q00|",
"Africa/Windhoek|CAT WAT|-20 -10|010|1T3c0 11B0|32e4", "Africa/Tripoli|EET|-20|0||11e5",
"America/Adak|HST HDT|a0 90|01010101010101010101010|1ST00 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|326", "America/Adak|HST HDT|a0 90|01010101010101010101010|1VkA0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|326",
"America/Anchorage|AKST AKDT|90 80|01010101010101010101010|1SSX0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|30e4", "America/Anchorage|AKST AKDT|90 80|01010101010101010101010|1Vkz0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|30e4",
"America/Santo_Domingo|AST|40|0||29e5", "America/Santo_Domingo|AST|40|0||29e5",
"America/Fortaleza|-03|30|0||34e5", "America/Fortaleza|-03|30|0||34e5",
"America/Asuncion|-03 -04|30 40|01010101010101010101010|1T0r0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0|28e5", "America/Asuncion|-03 -04|30 40|01010101010101010101010|1Vq30 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0 19X0 1fB0|28e5",
"America/Panama|EST|50|0||15e5", "America/Panama|EST|50|0||15e5",
"America/Mexico_City|CST CDT|60 50|0101010101010|1T3k0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|20e6", "America/Mexico_City|CST CDT|60 50|01010101010|1VsU0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|20e6",
"America/Managua|CST|60|0||22e5", "America/Managua|CST|60|0||22e5",
"America/Caracas|-04|40|0||29e5", "America/Caracas|-04|40|0||29e5",
"America/Lima|-05|50|0||11e6", "America/Lima|-05|50|0||11e6",
"America/Denver|MST MDT|70 60|01010101010101010101010|1SSV0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|26e5", "America/Denver|MST MDT|70 60|01010101010101010101010|1Vkx0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|26e5",
"America/Campo_Grande|-03 -04|30 40|010101|1SKr0 1zd0 On0 1HB0 FX0|77e4", "America/Campo_Grande|-03 -04|30 40|0101|1Vc30 1HB0 FX0|77e4",
"America/Chicago|CST CDT|60 50|01010101010101010101010|1SSU0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|92e5", "America/Chicago|CST CDT|60 50|01010101010101010101010|1Vkw0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|92e5",
"America/Chihuahua|MST MDT CST|70 60 60|0101010101012|1T3l0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|81e4", "America/Chihuahua|MST MDT CST|70 60 60|01010101012|1VsV0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|81e4",
"America/Ciudad_Juarez|MST MDT CST|70 60 60|010101010120101010101010|1Vkx0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1wn0 cm0 EP0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|",
"America/Phoenix|MST|70|0||42e5", "America/Phoenix|MST|70|0||42e5",
"America/Whitehorse|PST PDT MST|80 70 70|010101012|1SSW0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1z90|23e3", "America/Whitehorse|PST PDT MST|80 70 70|0101012|1Vky0 1zb0 Op0 1zb0 Op0 1z90|23e3",
"America/New_York|EST EDT|50 40|01010101010101010101010|1SST0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|21e6", "America/New_York|EST EDT|50 40|01010101010101010101010|1Vkv0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|21e6",
"America/Los_Angeles|PST PDT|80 70|01010101010101010101010|1SSW0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|15e6", "America/Los_Angeles|PST PDT|80 70|01010101010101010101010|1Vky0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|15e6",
"America/Halifax|AST ADT|40 30|01010101010101010101010|1SSS0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|39e4", "America/Halifax|AST ADT|40 30|01010101010101010101010|1Vku0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|39e4",
"America/Godthab|-03 -02|30 20|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|17e3", "America/Godthab|-03 -02 -01|30 20 10|0101010101012121212121|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 2so0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|17e3",
"America/Grand_Turk|AST EDT EST|40 40 50|012121212121212121212|1Vkv0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|37e2", "America/Grand_Turk|AST EDT EST|40 40 50|01212121212121212121212|1Vkv0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|37e2",
"America/Havana|CST CDT|50 40|01010101010101010101010|1SSR0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0|21e5", "America/Havana|CST CDT|50 40|01010101010101010101010|1Vkt0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0|21e5",
"America/Mazatlan|MST MDT|70 60|0101010101010|1T3l0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|44e4", "America/Mazatlan|MST MDT|70 60|01010101010|1VsV0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|44e4",
"America/Metlakatla|AKST AKDT PST|90 80 80|010120101010101010101010|1SSX0 1zb0 Op0 1zb0 uM0 jB0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|14e2", "America/Metlakatla|AKST AKDT PST|90 80 80|012010101010101010101010|1Vkz0 1zb0 uM0 jB0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|14e2",
"America/Miquelon|-03 -02|30 20|01010101010101010101010|1SSR0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|61e2", "America/Miquelon|-03 -02|30 20|01010101010101010101010|1Vkt0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|61e2",
"America/Noronha|-02|20|0||30e2", "America/Noronha|-02|20|0||30e2",
"America/Ojinaga|MST MDT CST|70 60 60|0101010101012|1SSV0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1wn0|23e3", "America/Ojinaga|MST MDT CST CDT|70 60 60 50|01010101012323232323232|1Vkx0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1wn0 Rc0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|23e3",
"America/Santiago|-03 -04|30 40|01010101010101010101010|1Tk30 Ap0 1Nb0 Ap0 1zb0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0|62e5", "America/Santiago|-03 -04|30 40|01010101010101010101010|1VJD0 Ap0 1zb0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0|62e5",
"America/Sao_Paulo|-02 -03|20 30|010101|1SKq0 1zd0 On0 1HB0 FX0|20e6", "America/Sao_Paulo|-02 -03|20 30|0101|1Vc20 1HB0 FX0|20e6",
"Atlantic/Azores|-01 +00|10 0|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|25e4", "Atlantic/Azores|-01 +00|10 0|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|25e4",
"America/St_Johns|NST NDT|3u 2u|01010101010101010101010|1SSRu 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|11e4", "America/St_Johns|NST NDT|3u 2u|01010101010101010101010|1Vktu 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|11e4",
"Antarctica/Casey|+11 +08|-b0 -80|0101010|1Vkh0 1o30 14k0 1kr0 12l0 1o01|10", "Antarctica/Casey|+11 +08|-b0 -80|0101010|1Vkh0 1o30 14k0 1kr0 12l0 1o01|10",
"Asia/Bangkok|+07|-70|0||15e6", "Asia/Bangkok|+07|-70|0||15e6",
"Asia/Vladivostok|+10|-a0|0||60e4", "Asia/Vladivostok|+10|-a0|0||60e4",
"Australia/Sydney|AEDT AEST|-b0 -a0|01010101010101010101010|1T340 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|40e5", "Australia/Sydney|AEDT AEST|-b0 -a0|01010101010101010101010|1VsE0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|40e5",
"Asia/Tashkent|+05|-50|0||23e5", "Asia/Tashkent|+05|-50|0||23e5",
"Pacific/Auckland|NZDT NZST|-d0 -c0|01010101010101010101010|1T320 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00|14e5", "Pacific/Auckland|NZDT NZST|-d0 -c0|01010101010101010101010|1VsC0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00|14e5",
"Europe/Istanbul|+03|-30|0||13e6", "Europe/Istanbul|+03|-30|0||13e6",
"Antarctica/Troll|+00 +02|0 -20|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|40", "Antarctica/Troll|+00 +02|0 -20|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|40",
"Asia/Dhaka|+06|-60|0||16e6", "Asia/Dhaka|+06|-60|0||16e6",
"Asia/Amman|EET EEST +03|-20 -30 -30|0101010101012|1T2m0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 LA0 1C00|25e5", "Asia/Amman|EET EEST +03|-20 -30 -30|01010101012|1VrW0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 LA0 1C00|25e5",
"Asia/Kamchatka|+12|-c0|0||18e4", "Asia/Kamchatka|+12|-c0|0||18e4",
"Asia/Dubai|+04|-40|0||39e5", "Asia/Dubai|+04|-40|0||39e5",
"Asia/Beirut|EET EEST|-20 -30|01010101010101010101010|1T0m0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0|22e5", "Asia/Beirut|EET EEST|-20 -30|01010101010101010101010|1VpW0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0|22e5",
"Asia/Kuala_Lumpur|+08|-80|0||71e5", "Asia/Kuala_Lumpur|+08|-80|0||71e5",
"Asia/Kolkata|IST|-5u|0||15e6", "Asia/Kolkata|IST|-5u|0||15e6",
"Asia/Chita|+09|-90|0||33e4", "Asia/Chita|+09|-90|0||33e4",
"Asia/Shanghai|CST|-80|0||23e6", "Asia/Shanghai|CST|-80|0||23e6",
"Asia/Colombo|+0530|-5u|0||22e5", "Asia/Colombo|+0530|-5u|0||22e5",
"Asia/Damascus|EET EEST +03|-20 -30 -30|0101010101012|1T2m0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0|26e5", "Asia/Damascus|EET EEST +03|-20 -30 -30|01010101012|1VrW0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0|26e5",
"Asia/Famagusta|+03 EET EEST|-30 -20 -30|0121212121212121212121|1Urd0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|", "Europe/Athens|EET EEST|-20 -30|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|35e5",
"Asia/Gaza|EET EEST|-20 -30|01010101010101010101010|1SXX0 1qL0 WN0 1qL0 11c0 1on0 11B0 1o00 11A0 1qo0 XA0 1qp0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0|18e5", "Asia/Gaza|EET EEST|-20 -30|01010101010101010101010|1Vpz0 1qL0 11c0 1on0 11B0 1o00 11A0 1qo0 XA0 1qp0 1cN0 1cL0 17d0 1in0 14p0 1lb0 11B0 1nX0 11B0 1qL0 WN0 1qL0|18e5",
"Asia/Hong_Kong|HKT|-80|0||73e5", "Asia/Hong_Kong|HKT|-80|0||73e5",
"Asia/Jakarta|WIB|-70|0||31e6", "Asia/Jakarta|WIB|-70|0||31e6",
"Asia/Jayapura|WIT|-90|0||26e4", "Asia/Jayapura|WIT|-90|0||26e4",
"Asia/Jerusalem|IST IDT|-20 -30|01010101010101010101010|1SXA0 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0 10N0 1rz0 W10 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0 10N0 1oL0 10N0 1rz0|81e4", "Asia/Jerusalem|IST IDT|-20 -30|01010101010101010101010|1Vpc0 1rz0 10N0 1oL0 10N0 1oL0 10N0 1rz0 W10 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0 10N0 1oL0 10N0 1rz0 W10 1rz0|81e4",
"Asia/Kabul|+0430|-4u|0||46e5", "Asia/Kabul|+0430|-4u|0||46e5",
"Asia/Karachi|PKT|-50|0||24e6", "Asia/Karachi|PKT|-50|0||24e6",
"Asia/Kathmandu|+0545|-5J|0||12e5", "Asia/Kathmandu|+0545|-5J|0||12e5",
"Asia/Sakhalin|+11|-b0|0||58e4", "Asia/Sakhalin|+11|-b0|0||58e4",
"Asia/Makassar|WITA|-80|0||15e5", "Asia/Makassar|WITA|-80|0||15e5",
"Asia/Manila|PST|-80|0||24e6", "Asia/Manila|PST|-80|0||24e6",
"Europe/Athens|EET EEST|-20 -30|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|35e5",
"Asia/Pyongyang|KST KST|-8u -90|01|1VGf0|29e5", "Asia/Pyongyang|KST KST|-8u -90|01|1VGf0|29e5",
"Asia/Qyzylorda|+06 +05|-60 -50|01|1Xei0|73e4", "Asia/Qyzylorda|+06 +05|-60 -50|01|1Xei0|73e4",
"Asia/Rangoon|+0630|-6u|0||48e5", "Asia/Rangoon|+0630|-6u|0||48e5",
"Asia/Seoul|KST|-90|0||23e6", "Asia/Seoul|KST|-90|0||23e6",
"Asia/Tehran|+0330 +0430|-3u -4u|0101010101010|1SWIu 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0|14e6", "Asia/Tehran|+0330 +0430|-3u -4u|01010101010|1VoIu 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0|14e6",
"Asia/Tokyo|JST|-90|0||38e6", "Asia/Tokyo|JST|-90|0||38e6",
"Europe/Lisbon|WET WEST|0 -10|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|27e5", "Europe/Lisbon|WET WEST|0 -10|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|27e5",
"Atlantic/Cape_Verde|-01|10|0||50e4", "Atlantic/Cape_Verde|-01|10|0||50e4",
"Australia/Adelaide|ACDT ACST|-au -9u|01010101010101010101010|1T34u 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|11e5", "Australia/Adelaide|ACDT ACST|-au -9u|01010101010101010101010|1VsEu 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|11e5",
"Australia/Brisbane|AEST|-a0|0||20e5", "Australia/Brisbane|AEST|-a0|0||20e5",
"Australia/Darwin|ACST|-9u|0||12e4", "Australia/Darwin|ACST|-9u|0||12e4",
"Australia/Eucla|+0845|-8J|0||368", "Australia/Eucla|+0845|-8J|0||368",
"Australia/Lord_Howe|+11 +1030|-b0 -au|01010101010101010101010|1T330 1cMu 1cLu 1fAu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1fzu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu|347", "Australia/Lord_Howe|+11 +1030|-b0 -au|01010101010101010101010|1VsD0 1fAu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1fzu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu|347",
"Australia/Perth|AWST|-80|0||18e5", "Australia/Perth|AWST|-80|0||18e5",
"Pacific/Easter|-05 -06|50 60|01010101010101010101010|1Tk30 Ap0 1Nb0 Ap0 1zb0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0|30e2", "Pacific/Easter|-05 -06|50 60|01010101010101010101010|1VJD0 Ap0 1zb0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0|30e2",
"Europe/Dublin|GMT IST|0 -10|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|12e5", "Europe/Dublin|GMT IST|0 -10|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|12e5",
"Etc/GMT-1|+01|-10|0||", "Etc/GMT-1|+01|-10|0||",
"Pacific/Fakaofo|+13|-d0|0||483", "Pacific/Tongatapu|+13|-d0|0||75e3",
"Pacific/Kiritimati|+14|-e0|0||51e2", "Pacific/Kiritimati|+14|-e0|0||51e2",
"Etc/GMT-2|+02|-20|0||", "Etc/GMT-2|+02|-20|0||",
"Pacific/Tahiti|-10|a0|0||18e4", "Pacific/Tahiti|-10|a0|0||18e4",
@ -797,20 +796,19 @@
"Pacific/Pitcairn|-08|80|0||56", "Pacific/Pitcairn|-08|80|0||56",
"Pacific/Gambier|-09|90|0||125", "Pacific/Gambier|-09|90|0||125",
"Etc/UTC|UTC|0|0||", "Etc/UTC|UTC|0|0||",
"Europe/London|GMT BST|0 -10|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|10e6", "Europe/London|GMT BST|0 -10|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|10e6",
"Europe/Chisinau|EET EEST|-20 -30|01010101010101010101010|1T0o0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|67e4", "Europe/Chisinau|EET EEST|-20 -30|01010101010101010101010|1Vq00 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|67e4",
"Europe/Moscow|MSK|-30|0||16e6", "Europe/Moscow|MSK|-30|0||16e6",
"Europe/Volgograd|+03 +04|-30 -40|010|1WQL0 5gn0|10e5", "Europe/Volgograd|MSK +04|-30 -40|010|1WQL0 5gn0|10e5",
"Pacific/Honolulu|HST|a0|0||37e4", "Pacific/Honolulu|HST|a0|0||37e4",
"MET|MET MEST|-10 -20|01010101010101010101010|1T0p0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0|", "MET|MET MEST|-10 -20|01010101010101010101010|1Vq10 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|",
"Pacific/Chatham|+1345 +1245|-dJ -cJ|01010101010101010101010|1T320 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00|600", "Pacific/Chatham|+1345 +1245|-dJ -cJ|01010101010101010101010|1VsC0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00|600",
"Pacific/Apia|+14 +13|-e0 -d0|0101010101|1T320 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0|37e3", "Pacific/Apia|+14 +13|-e0 -d0|01010101|1VsC0 1cM0 1fA0 1a00 1fA0 1a00 1fA0|37e3",
"Pacific/Fiji|+13 +12|-d0 -c0|0101010101|1Swe0 1VA0 s00 1VA0 s00 20o0 pc0 2hc0 bc0|88e4", "Pacific/Fiji|+13 +12|-d0 -c0|01010101|1UVO0 1VA0 s00 20o0 pc0 2hc0 bc0|88e4",
"Pacific/Guam|ChST|-a0|0||17e4", "Pacific/Guam|ChST|-a0|0||17e4",
"Pacific/Marquesas|-0930|9u|0||86e2", "Pacific/Marquesas|-0930|9u|0||86e2",
"Pacific/Pago_Pago|SST|b0|0||37e2", "Pacific/Pago_Pago|SST|b0|0||37e2",
"Pacific/Norfolk|+11 +12|-b0 -c0|010101010101010101|219P0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|25e4", "Pacific/Norfolk|+11 +12|-b0 -c0|01010101010101010101|219P0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|25e4"
"Pacific/Tongatapu|+14 +13|-e0 -d0|01|1Swd0|75e3"
], ],
"links": [ "links": [
"Africa/Abidjan|Africa/Accra", "Africa/Abidjan|Africa/Accra",
@ -840,13 +838,19 @@
"Africa/Abidjan|Greenwich", "Africa/Abidjan|Greenwich",
"Africa/Abidjan|Iceland", "Africa/Abidjan|Iceland",
"Africa/Algiers|Africa/Tunis", "Africa/Algiers|Africa/Tunis",
"Africa/Cairo|Africa/Tripoli",
"Africa/Cairo|Egypt", "Africa/Cairo|Egypt",
"Africa/Cairo|Europe/Kaliningrad",
"Africa/Cairo|Libya",
"Africa/Casablanca|Africa/El_Aaiun", "Africa/Casablanca|Africa/El_Aaiun",
"Africa/Johannesburg|Africa/Maseru", "Africa/Johannesburg|Africa/Maseru",
"Africa/Johannesburg|Africa/Mbabane", "Africa/Johannesburg|Africa/Mbabane",
"Africa/Khartoum|Africa/Blantyre",
"Africa/Khartoum|Africa/Bujumbura",
"Africa/Khartoum|Africa/Gaborone",
"Africa/Khartoum|Africa/Harare",
"Africa/Khartoum|Africa/Kigali",
"Africa/Khartoum|Africa/Lubumbashi",
"Africa/Khartoum|Africa/Lusaka",
"Africa/Khartoum|Africa/Maputo",
"Africa/Khartoum|Africa/Windhoek",
"Africa/Lagos|Africa/Bangui", "Africa/Lagos|Africa/Bangui",
"Africa/Lagos|Africa/Brazzaville", "Africa/Lagos|Africa/Brazzaville",
"Africa/Lagos|Africa/Douala", "Africa/Lagos|Africa/Douala",
@ -857,13 +861,6 @@
"Africa/Lagos|Africa/Ndjamena", "Africa/Lagos|Africa/Ndjamena",
"Africa/Lagos|Africa/Niamey", "Africa/Lagos|Africa/Niamey",
"Africa/Lagos|Africa/Porto-Novo", "Africa/Lagos|Africa/Porto-Novo",
"Africa/Maputo|Africa/Blantyre",
"Africa/Maputo|Africa/Bujumbura",
"Africa/Maputo|Africa/Gaborone",
"Africa/Maputo|Africa/Harare",
"Africa/Maputo|Africa/Kigali",
"Africa/Maputo|Africa/Lubumbashi",
"Africa/Maputo|Africa/Lusaka",
"Africa/Nairobi|Africa/Addis_Ababa", "Africa/Nairobi|Africa/Addis_Ababa",
"Africa/Nairobi|Africa/Asmara", "Africa/Nairobi|Africa/Asmara",
"Africa/Nairobi|Africa/Asmera", "Africa/Nairobi|Africa/Asmera",
@ -874,6 +871,8 @@
"Africa/Nairobi|Indian/Antananarivo", "Africa/Nairobi|Indian/Antananarivo",
"Africa/Nairobi|Indian/Comoro", "Africa/Nairobi|Indian/Comoro",
"Africa/Nairobi|Indian/Mayotte", "Africa/Nairobi|Indian/Mayotte",
"Africa/Tripoli|Europe/Kaliningrad",
"Africa/Tripoli|Libya",
"America/Adak|America/Atka", "America/Adak|America/Atka",
"America/Adak|US/Aleutian", "America/Adak|US/Aleutian",
"America/Anchorage|America/Juneau", "America/Anchorage|America/Juneau",
@ -1191,6 +1190,7 @@
"Etc/UTC|UTC", "Etc/UTC|UTC",
"Etc/UTC|Universal", "Etc/UTC|Universal",
"Etc/UTC|Zulu", "Etc/UTC|Zulu",
"Europe/Athens|Asia/Famagusta",
"Europe/Athens|Asia/Nicosia", "Europe/Athens|Asia/Nicosia",
"Europe/Athens|EET", "Europe/Athens|EET",
"Europe/Athens|Europe/Bucharest", "Europe/Athens|Europe/Bucharest",
@ -1216,7 +1216,6 @@
"Europe/Istanbul|Asia/Qatar", "Europe/Istanbul|Asia/Qatar",
"Europe/Istanbul|Asia/Riyadh", "Europe/Istanbul|Asia/Riyadh",
"Europe/Istanbul|Etc/GMT-3", "Europe/Istanbul|Etc/GMT-3",
"Europe/Istanbul|Europe/Kirov",
"Europe/Istanbul|Europe/Minsk", "Europe/Istanbul|Europe/Minsk",
"Europe/Istanbul|Turkey", "Europe/Istanbul|Turkey",
"Europe/Lisbon|Atlantic/Canary", "Europe/Lisbon|Atlantic/Canary",
@ -1231,6 +1230,7 @@
"Europe/London|Europe/Jersey", "Europe/London|Europe/Jersey",
"Europe/London|GB", "Europe/London|GB",
"Europe/London|GB-Eire", "Europe/London|GB-Eire",
"Europe/Moscow|Europe/Kirov",
"Europe/Moscow|Europe/Simferopol", "Europe/Moscow|Europe/Simferopol",
"Europe/Moscow|W-SU", "Europe/Moscow|W-SU",
"Europe/Paris|Africa/Ceuta", "Europe/Paris|Africa/Ceuta",
@ -1273,9 +1273,6 @@
"Pacific/Auckland|NZ", "Pacific/Auckland|NZ",
"Pacific/Chatham|NZ-CHAT", "Pacific/Chatham|NZ-CHAT",
"Pacific/Easter|Chile/EasterIsland", "Pacific/Easter|Chile/EasterIsland",
"Pacific/Fakaofo|Etc/GMT-13",
"Pacific/Fakaofo|Pacific/Enderbury",
"Pacific/Fakaofo|Pacific/Kanton",
"Pacific/Galapagos|Etc/GMT+6", "Pacific/Galapagos|Etc/GMT+6",
"Pacific/Gambier|Etc/GMT+9", "Pacific/Gambier|Etc/GMT+9",
"Pacific/Guam|Pacific/Saipan", "Pacific/Guam|Pacific/Saipan",
@ -1289,7 +1286,11 @@
"Pacific/Pago_Pago|US/Samoa", "Pacific/Pago_Pago|US/Samoa",
"Pacific/Pitcairn|Etc/GMT+8", "Pacific/Pitcairn|Etc/GMT+8",
"Pacific/Tahiti|Etc/GMT+10", "Pacific/Tahiti|Etc/GMT+10",
"Pacific/Tahiti|Pacific/Rarotonga" "Pacific/Tahiti|Pacific/Rarotonga",
"Pacific/Tongatapu|Etc/GMT-13",
"Pacific/Tongatapu|Pacific/Enderbury",
"Pacific/Tongatapu|Pacific/Fakaofo",
"Pacific/Tongatapu|Pacific/Kanton"
], ],
"countries": [ "countries": [
"AD|Europe/Andorra", "AD|Europe/Andorra",
@ -1328,7 +1329,7 @@
"BW|Africa/Maputo Africa/Gaborone", "BW|Africa/Maputo Africa/Gaborone",
"BY|Europe/Minsk", "BY|Europe/Minsk",
"BZ|America/Belize", "BZ|America/Belize",
"CA|America/St_Johns America/Halifax America/Glace_Bay America/Moncton America/Goose_Bay America/Toronto America/Iqaluit America/Pangnirtung America/Winnipeg America/Resolute America/Rankin_Inlet America/Regina America/Swift_Current America/Edmonton America/Cambridge_Bay America/Yellowknife America/Inuvik America/Dawson_Creek America/Fort_Nelson America/Whitehorse America/Dawson America/Vancouver America/Panama America/Puerto_Rico America/Phoenix America/Blanc-Sablon America/Atikokan America/Creston", "CA|America/St_Johns America/Halifax America/Glace_Bay America/Moncton America/Goose_Bay America/Toronto America/Iqaluit America/Winnipeg America/Resolute America/Rankin_Inlet America/Regina America/Swift_Current America/Edmonton America/Cambridge_Bay America/Inuvik America/Dawson_Creek America/Fort_Nelson America/Whitehorse America/Dawson America/Vancouver America/Panama America/Puerto_Rico America/Phoenix America/Blanc-Sablon America/Atikokan America/Creston",
"CC|Asia/Yangon Indian/Cocos", "CC|Asia/Yangon Indian/Cocos",
"CD|Africa/Maputo Africa/Lagos Africa/Kinshasa Africa/Lubumbashi", "CD|Africa/Maputo Africa/Lagos Africa/Kinshasa Africa/Lubumbashi",
"CF|Africa/Lagos Africa/Bangui", "CF|Africa/Lagos Africa/Bangui",
@ -1446,7 +1447,7 @@
"MU|Indian/Mauritius", "MU|Indian/Mauritius",
"MV|Indian/Maldives", "MV|Indian/Maldives",
"MW|Africa/Maputo Africa/Blantyre", "MW|Africa/Maputo Africa/Blantyre",
"MX|America/Mexico_City America/Cancun America/Merida America/Monterrey America/Matamoros America/Mazatlan America/Chihuahua America/Ojinaga America/Hermosillo America/Tijuana America/Bahia_Banderas", "MX|America/Mexico_City America/Cancun America/Merida America/Monterrey America/Matamoros America/Chihuahua America/Ciudad_Juarez America/Ojinaga America/Mazatlan America/Bahia_Banderas America/Hermosillo America/Tijuana",
"MY|Asia/Kuching Asia/Singapore Asia/Kuala_Lumpur", "MY|Asia/Kuching Asia/Singapore Asia/Kuala_Lumpur",
"MZ|Africa/Maputo", "MZ|Africa/Maputo",
"NA|Africa/Windhoek", "NA|Africa/Windhoek",
@ -1521,7 +1522,7 @@
"TZ|Africa/Nairobi Africa/Dar_es_Salaam", "TZ|Africa/Nairobi Africa/Dar_es_Salaam",
"UA|Europe/Simferopol Europe/Kyiv", "UA|Europe/Simferopol Europe/Kyiv",
"UG|Africa/Nairobi Africa/Kampala", "UG|Africa/Nairobi Africa/Kampala",
"UM|Pacific/Pago_Pago Pacific/Tarawa Pacific/Honolulu Pacific/Midway Pacific/Wake", "UM|Pacific/Pago_Pago Pacific/Tarawa Pacific/Midway Pacific/Wake",
"US|America/New_York America/Detroit America/Kentucky/Louisville America/Kentucky/Monticello America/Indiana/Indianapolis America/Indiana/Vincennes America/Indiana/Winamac America/Indiana/Marengo America/Indiana/Petersburg America/Indiana/Vevay America/Chicago America/Indiana/Tell_City America/Indiana/Knox America/Menominee America/North_Dakota/Center America/North_Dakota/New_Salem America/North_Dakota/Beulah America/Denver America/Boise America/Phoenix America/Los_Angeles America/Anchorage America/Juneau America/Sitka America/Metlakatla America/Yakutat America/Nome America/Adak Pacific/Honolulu", "US|America/New_York America/Detroit America/Kentucky/Louisville America/Kentucky/Monticello America/Indiana/Indianapolis America/Indiana/Vincennes America/Indiana/Winamac America/Indiana/Marengo America/Indiana/Petersburg America/Indiana/Vevay America/Chicago America/Indiana/Tell_City America/Indiana/Knox America/Menominee America/North_Dakota/Center America/North_Dakota/New_Salem America/North_Dakota/Beulah America/Denver America/Boise America/Phoenix America/Los_Angeles America/Anchorage America/Juneau America/Sitka America/Metlakatla America/Yakutat America/Nome America/Adak Pacific/Honolulu",
"UY|America/Montevideo", "UY|America/Montevideo",
"UZ|Asia/Samarkand Asia/Tashkent", "UZ|Asia/Samarkand Asia/Tashkent",