From 67b61c8f9414bea13338da85faae4bf282e87457 Mon Sep 17 00:00:00 2001 From: David Hull Date: Sat, 21 Nov 2015 23:01:46 +0000 Subject: [PATCH 1/2] ibuild: Write newline to end of tz_index.hrl file. --- src/ibuild.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ibuild.erl b/src/ibuild.erl index 92cf709..2530004 100755 --- a/src/ibuild.erl +++ b/src/ibuild.erl @@ -24,7 +24,7 @@ build_index() -> end, I = lists:foldl(F, dict:new(), ?tz_database), {ok, File} = file:open("tz_index.hrl", [write]), - io:fwrite(File, "-define(tz_index, ~p).", [I]). + io:fwrite(File, "-define(tz_index, ~p).\n", [I]). %% So this can be run from escript: main(_Args) -> From 1b3c22c7aa8aba10c624bc004d2c2bb1cc3a82db Mon Sep 17 00:00:00 2001 From: David Hull Date: Sat, 21 Nov 2015 23:05:23 +0000 Subject: [PATCH 2/2] Update timezone database from Olson 2015g. --- include/tz_database.hrl | 131 +++++++++++------------ include/tz_index.hrl | 224 ++++++++++++++++++++-------------------- 2 files changed, 175 insertions(+), 180 deletions(-) diff --git a/include/tz_database.hrl b/include/tz_database.hrl index 2539526..d728a13 100644 --- a/include/tz_database.hrl +++ b/include/tz_database.hrl @@ -22,27 +22,19 @@ -define(tz_database, [ - %% Automatically generated from the time zone database version 2013i for 2014-01-09. + %% Automatically generated from the time zone database version 2015g for 2016-01-01. %% Problems: - %% Ignored Jun 29 in Rule Morocco. - %% Ignored Jul 29 in Rule Morocco. - %% Rounded Apr Sun>=23 to [4 sun apr] in Rule ChileAQ. - %% Rounded Sep Sun>=2 to [1 sun sep] in Rule ChileAQ. - %% Ignored Mar 22 in Rule Iran. - %% Ignored Sep 22 in Rule Iran. + %% Ignored Jun 5 in Rule Morocco. + %% Ignored Jul 10 in Rule Morocco. + %% Ignored Mar 21 in Rule Iran. + %% Ignored Sep 21 in Rule Iran. %% Rounded Mar Fri>=23 to [4 fri mar] in Rule Zion. - %% Rounded Sep Fri>=21 to [4 fri sep] in Rule Palestine. - %% Rounded Oct Sun>=21 to [4 sun oct] in Rule Fiji. - %% Rounded Jan Sun>=18 to [3 sun jan] in Rule Fiji. - %% Rounded Apr Sun>=23 to [4 sun apr] in Rule Chile. - %% Rounded Sep Sun>=2 to [1 sun sep] in Rule Chile. + %% Rounded Oct Fri>=21 to [4 fri oct] in Rule Palestine. %% Discarded excess rules for Zone Africa/Casablanca. %% Discarded excess rules for Zone Africa/El_Aaiun. %% Moving rule to beginning of day for Zone America/Godthab. %% Moving rule to beginning of day for Zone America/Godthab. - %% Moving rule to beginning of day for Zone Pacific/Easter. - %% Moving rule to beginning of day for Zone Pacific/Easter. {"Africa/Abidjan",{"GMT","GMT"},undef,0,0,undef,{0,0},undef,{0,0}}, {"Africa/Accra",{"GMT","GMT"},undef,0,0,undef,{0,0},undef,{0,0}}, @@ -98,7 +90,7 @@ {"Africa/Tripoli",{"EET","EET"},undef,120,0,undef,{0,0},undef,{0,0}}, {"Africa/Tunis",{"CET","CET"},undef,60,0,undef,{0,0},undef,{0,0}}, {"Africa/Windhoek",{"WAT","WAT"},{"WAST","WAST"},60,60,{1,sun,sep},{2,0},{1,sun,apr},{2,0}}, - {"America/Adak",{"HAST","HAST"},{"HADT","HADT"},-600,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, + {"America/Adak",{"HST","HST"},{"HDT","HDT"},-600,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"America/Anchorage",{"AKST","AKST"},{"AKDT","AKDT"},-540,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"America/Anguilla",{"AST","AST"},undef,-240,0,undef,{0,0},undef,{0,0}}, {"America/Antigua",{"AST","AST"},undef,-240,0,undef,{0,0},undef,{0,0}}, @@ -119,7 +111,7 @@ {"America/Aruba",{"AST","AST"},undef,-240,0,undef,{0,0},undef,{0,0}}, {"America/Asuncion",{"PYT","PYT"},{"PYST","PYST"},-240,60,{1,sun,oct},{0,0},{4,sun,mar},{0,0}}, {"America/Atikokan",{"EST","EST"},undef,-300,0,undef,{0,0},undef,{0,0}}, - {"America/Atka",{"HAST","HAST"},{"HADT","HADT"},-600,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, + {"America/Atka",{"HST","HST"},{"HDT","HDT"},-600,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"America/Bahia",{"BRT","BRT"},undef,-180,0,undef,{0,0},undef,{0,0}}, {"America/Bahia_Banderas",{"CST","CST"},{"CDT","CDT"},-360,60,{1,sun,apr},{2,0},{last,sun,oct},{2,0}}, {"America/Barbados",{"AST","AST"},undef,-240,0,undef,{0,0},undef,{0,0}}, @@ -132,11 +124,11 @@ {"America/Buenos_Aires",{"ART","ART"},undef,-180,0,undef,{0,0},undef,{0,0}}, {"America/Cambridge_Bay",{"MST","MST"},{"MDT","MDT"},-420,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"America/Campo_Grande",{"AMT","AMT"},{"AMST","AMST"},-240,60,{3,sun,oct},{0,0},{3,sun,feb},{0,0}}, - {"America/Cancun",{"CST","CST"},{"CDT","CDT"},-360,60,{1,sun,apr},{2,0},{last,sun,oct},{2,0}}, + {"America/Cancun",{"EST","EST"},undef,-300,0,undef,{0,0},undef,{0,0}}, {"America/Caracas",{"VET","VET"},undef,-270,0,undef,{0,0},undef,{0,0}}, {"America/Catamarca",{"ART","ART"},undef,-180,0,undef,{0,0},undef,{0,0}}, {"America/Cayenne",{"GFT","GFT"},undef,-180,0,undef,{0,0},undef,{0,0}}, - {"America/Cayman",{"EST","EST"},undef,-300,0,undef,{0,0},undef,{0,0}}, + {"America/Cayman",{"EST","EST"},{"EDT","EDT"},-300,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"America/Chicago",{"CST","CST"},{"CDT","CDT"},-360,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"America/Chihuahua",{"MST","MST"},{"MDT","MDT"},-420,60,{1,sun,apr},{2,0},{last,sun,oct},{2,0}}, {"America/Coral_Harbour",{"EST","EST"},undef,-300,0,undef,{0,0},undef,{0,0}}, @@ -155,12 +147,13 @@ {"America/Eirunepe",{"ACT","ACT"},undef,-300,0,undef,{0,0},undef,{0,0}}, {"America/El_Salvador",{"CST","CST"},undef,-360,0,undef,{0,0},undef,{0,0}}, {"America/Ensenada",{"PST","PST"},{"PDT","PDT"},-480,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, + {"America/Fort_Nelson",{"MST","MST"},undef,-420,0,undef,{0,0},undef,{0,0}}, {"America/Fort_Wayne",{"EST","EST"},{"EDT","EDT"},-300,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"America/Fortaleza",{"BRT","BRT"},undef,-180,0,undef,{0,0},undef,{0,0}}, {"America/Glace_Bay",{"AST","AST"},{"ADT","ADT"},-240,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"America/Godthab",{"WGT","WGT"},{"WGST","WGST"},-180,60,{last,sun,mar},{0,0},{last,sun,oct},{0,0}}, {"America/Goose_Bay",{"AST","AST"},{"ADT","ADT"},-240,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, - {"America/Grand_Turk",{"EST","EST"},{"EDT","EDT"},-300,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, + {"America/Grand_Turk",{"AST","AST"},undef,-240,0,undef,{0,0},undef,{0,0}}, {"America/Grenada",{"AST","AST"},undef,-240,0,undef,{0,0},undef,{0,0}}, {"America/Guadeloupe",{"AST","AST"},undef,-240,0,undef,{0,0},undef,{0,0}}, {"America/Guatemala",{"CST","CST"},undef,-360,0,undef,{0,0},undef,{0,0}}, @@ -202,12 +195,12 @@ {"America/Mendoza",{"ART","ART"},undef,-180,0,undef,{0,0},undef,{0,0}}, {"America/Menominee",{"CST","CST"},{"CDT","CDT"},-360,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"America/Merida",{"CST","CST"},{"CDT","CDT"},-360,60,{1,sun,apr},{2,0},{last,sun,oct},{2,0}}, - {"America/Metlakatla",{"MeST","MeST"},undef,-480,0,undef,{0,0},undef,{0,0}}, + {"America/Metlakatla",{"PST","PST"},undef,-480,0,undef,{0,0},undef,{0,0}}, {"America/Mexico_City",{"CST","CST"},{"CDT","CDT"},-360,60,{1,sun,apr},{2,0},{last,sun,oct},{2,0}}, {"America/Miquelon",{"PMST","PMST"},{"PMDT","PMDT"},-180,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"America/Moncton",{"AST","AST"},{"ADT","ADT"},-240,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"America/Monterrey",{"CST","CST"},{"CDT","CDT"},-360,60,{1,sun,apr},{2,0},{last,sun,oct},{2,0}}, - {"America/Montevideo",{"UYT","UYT"},{"UYST","UYST"},-180,60,{1,sun,oct},{2,0},{2,sun,mar},{2,0}}, + {"America/Montevideo",{"UYT","UYT"},undef,-180,0,undef,{0,0},undef,{0,0}}, {"America/Montreal",{"EST","EST"},{"EDT","EDT"},-300,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"America/Montserrat",{"AST","AST"},undef,-240,0,undef,{0,0},undef,{0,0}}, {"America/Nassau",{"EST","EST"},{"EDT","EDT"},-300,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, @@ -237,7 +230,7 @@ {"America/Rosario",{"ART","ART"},undef,-180,0,undef,{0,0},undef,{0,0}}, {"America/Santa_Isabel",{"PST","PST"},{"PDT","PDT"},-480,60,{1,sun,apr},{2,0},{last,sun,oct},{2,0}}, {"America/Santarem",{"BRT","BRT"},undef,-180,0,undef,{0,0},undef,{0,0}}, - {"America/Santiago",{"CLT","CLT"},{"CLST","CLST"},-240,60,{1,sun,sep},{0,0},{4,sun,apr},{0,0}}, + {"America/Santiago",{"CLT","CLT"},undef,-180,0,undef,{0,0},undef,{0,0}}, {"America/Santo_Domingo",{"AST","AST"},undef,-240,0,undef,{0,0},undef,{0,0}}, {"America/Sao_Paulo",{"BRT","BRT"},{"BRST","BRST"},-180,60,{3,sun,oct},{0,0},{3,sun,feb},{0,0}}, {"America/Scoresbysund",{"EGT","EGT"},{"EGST","EGST"},-60,60,{last,sun,mar},{0,0},{last,sun,oct},{1,0}}, @@ -262,16 +255,17 @@ {"America/Winnipeg",{"CST","CST"},{"CDT","CDT"},-360,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"America/Yakutat",{"AKST","AKST"},{"AKDT","AKDT"},-540,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"America/Yellowknife",{"MST","MST"},{"MDT","MDT"},-420,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, - {"Antarctica/Casey",{"WST","WST"},undef,480,0,undef,{0,0},undef,{0,0}}, + {"Antarctica/Casey",{"AWST","AWST"},undef,480,0,undef,{0,0},undef,{0,0}}, {"Antarctica/Davis",{"DAVT","DAVT"},undef,420,0,undef,{0,0},undef,{0,0}}, {"Antarctica/DumontDUrville",{"DDUT","DDUT"},undef,600,0,undef,{0,0},undef,{0,0}}, {"Antarctica/Macquarie",{"MIST","MIST"},undef,660,0,undef,{0,0},undef,{0,0}}, {"Antarctica/Mawson",{"MAWT","MAWT"},undef,300,0,undef,{0,0},undef,{0,0}}, {"Antarctica/McMurdo",{"NZST","NZST"},{"NZDT","NZDT"},720,60,{last,sun,sep},{2,0},{1,sun,apr},{3,0}}, - {"Antarctica/Palmer",{"CLT","CLT"},{"CLST","CLST"},-240,60,{1,sun,sep},{0,0},{4,sun,apr},{0,0}}, + {"Antarctica/Palmer",{"CLT","CLT"},undef,-180,0,undef,{0,0},undef,{0,0}}, {"Antarctica/Rothera",{"ROTT","ROTT"},undef,-180,0,undef,{0,0},undef,{0,0}}, {"Antarctica/South_Pole",{"NZST","NZST"},{"NZDT","NZDT"},720,60,{last,sun,sep},{2,0},{1,sun,apr},{3,0}}, {"Antarctica/Syowa",{"SYOT","SYOT"},undef,180,0,undef,{0,0},undef,{0,0}}, + {"Antarctica/Troll",{"UTC","UTC"},{"CEST","CEST"},0,120,{last,sun,mar},{1,0},{last,sun,oct},{3,0}}, {"Antarctica/Vostok",{"VOST","VOST"},undef,360,0,undef,{0,0},undef,{0,0}}, {"Arctic/Longyearbyen",{"CET","CET"},{"CEST","CEST"},60,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, {"Asia/Aden",{"AST","AST"},undef,180,0,undef,{0,0},undef,{0,0}}, @@ -291,7 +285,7 @@ {"Asia/Brunei",{"BNT","BNT"},undef,480,0,undef,{0,0},undef,{0,0}}, {"Asia/Calcutta",{"IST","IST"},undef,330,0,undef,{0,0},undef,{0,0}}, {"Asia/Chita",{"IRKT","IRKT"},undef,480,0,undef,{0,0},undef,{0,0}}, - {"Asia/Choibalsan",{"CHOT","CHOT"},undef,480,0,undef,{0,0},undef,{0,0}}, + {"Asia/Choibalsan",{"CHOT","CHOT"},{"CHOST","CHOST"},480,60,{last,sat,mar},{2,0},{last,sat,sep},{0,0}}, {"Asia/Chongqing",{"CST","CST"},undef,480,0,undef,{0,0},undef,{0,0}}, {"Asia/Chungking",{"CST","CST"},undef,480,0,undef,{0,0},undef,{0,0}}, {"Asia/Colombo",{"IST","IST"},undef,330,0,undef,{0,0},undef,{0,0}}, @@ -301,12 +295,12 @@ {"Asia/Dili",{"TLT","TLT"},undef,540,0,undef,{0,0},undef,{0,0}}, {"Asia/Dubai",{"GST","GST"},undef,240,0,undef,{0,0},undef,{0,0}}, {"Asia/Dushanbe",{"TJT","TJT"},undef,300,0,undef,{0,0},undef,{0,0}}, - {"Asia/Gaza",{"EET","EET"},{"EEST","EEST"},120,60,{last,thu,mar},{24,0},{4,fri,sep},{0,0}}, + {"Asia/Gaza",{"EET","EET"},{"EEST","EEST"},120,60,{last,fri,mar},{24,0},{4,fri,oct},{0,0}}, {"Asia/Harbin",{"CST","CST"},undef,480,0,undef,{0,0},undef,{0,0}}, - {"Asia/Hebron",{"EET","EET"},{"EEST","EEST"},120,60,{last,thu,mar},{24,0},{4,fri,sep},{0,0}}, + {"Asia/Hebron",{"EET","EET"},{"EEST","EEST"},120,60,{last,fri,mar},{24,0},{4,fri,oct},{0,0}}, {"Asia/Ho_Chi_Minh",{"ICT","ICT"},undef,420,0,undef,{0,0},undef,{0,0}}, {"Asia/Hong_Kong",{"HKT","HKT"},undef,480,0,undef,{0,0},undef,{0,0}}, - {"Asia/Hovd",{"HOVT","HOVT"},undef,420,0,undef,{0,0},undef,{0,0}}, + {"Asia/Hovd",{"HOVT","HOVT"},{"HOVST","HOVST"},420,60,{last,sat,mar},{2,0},{last,sat,sep},{0,0}}, {"Asia/Irkutsk",{"IRKT","IRKT"},undef,480,0,undef,{0,0},undef,{0,0}}, {"Asia/Istanbul",{"EET","EET"},{"EEST","EEST"},120,60,{last,sun,mar},{3,0},{last,sun,oct},{4,0}}, {"Asia/Jakarta",{"WIB","WIB"},undef,420,0,undef,{0,0},undef,{0,0}}, @@ -315,7 +309,7 @@ {"Asia/Kabul",{"AFT","AFT"},undef,270,0,undef,{0,0},undef,{0,0}}, {"Asia/Kamchatka",{"PETT","PETT"},undef,720,0,undef,{0,0},undef,{0,0}}, {"Asia/Karachi",{"PKT","PKT"},undef,300,0,undef,{0,0},undef,{0,0}}, - {"Asia/Kashgar",{"CST","CST"},undef,480,0,undef,{0,0},undef,{0,0}}, + {"Asia/Kashgar",{"XJT","XJT"},undef,360,0,undef,{0,0},undef,{0,0}}, {"Asia/Kathmandu",{"NPT","NPT"},undef,345,0,undef,{0,0},undef,{0,0}}, {"Asia/Katmandu",{"NPT","NPT"},undef,345,0,undef,{0,0},undef,{0,0}}, {"Asia/Khandyga",{"YAKT","YAKT"},undef,540,0,undef,{0,0},undef,{0,0}}, @@ -337,7 +331,7 @@ {"Asia/Oral",{"ORAT","ORAT"},undef,300,0,undef,{0,0},undef,{0,0}}, {"Asia/Phnom_Penh",{"ICT","ICT"},undef,420,0,undef,{0,0},undef,{0,0}}, {"Asia/Pontianak",{"WIB","WIB"},undef,420,0,undef,{0,0},undef,{0,0}}, - {"Asia/Pyongyang",{"KST","KST"},undef,540,0,undef,{0,0},undef,{0,0}}, + {"Asia/Pyongyang",{"KST","KST"},undef,510,0,undef,{0,0},undef,{0,0}}, {"Asia/Qatar",{"AST","AST"},undef,180,0,undef,{0,0},undef,{0,0}}, {"Asia/Qyzylorda",{"QYZT","QYZT"},undef,360,0,undef,{0,0},undef,{0,0}}, {"Asia/Rangoon",{"MMT","MMT"},undef,390,0,undef,{0,0},undef,{0,0}}, @@ -358,9 +352,9 @@ {"Asia/Thimphu",{"BTT","BTT"},undef,360,0,undef,{0,0},undef,{0,0}}, {"Asia/Tokyo",{"JST","JST"},undef,540,0,undef,{0,0},undef,{0,0}}, {"Asia/Ujung_Pandang",{"WITA","WITA"},undef,480,0,undef,{0,0},undef,{0,0}}, - {"Asia/Ulaanbaatar",{"ULAT","ULAT"},undef,480,0,undef,{0,0},undef,{0,0}}, - {"Asia/Ulan_Bator",{"ULAT","ULAT"},undef,480,0,undef,{0,0},undef,{0,0}}, - {"Asia/Urumqi",{"CST","CST"},undef,480,0,undef,{0,0},undef,{0,0}}, + {"Asia/Ulaanbaatar",{"ULAT","ULAT"},{"ULAST","ULAST"},480,60,{last,sat,mar},{2,0},{last,sat,sep},{0,0}}, + {"Asia/Ulan_Bator",{"ULAT","ULAT"},{"ULAST","ULAST"},480,60,{last,sat,mar},{2,0},{last,sat,sep},{0,0}}, + {"Asia/Urumqi",{"XJT","XJT"},undef,360,0,undef,{0,0},undef,{0,0}}, {"Asia/Ust-Nera",{"VLAT","VLAT"},undef,600,0,undef,{0,0},undef,{0,0}}, {"Asia/Vientiane",{"ICT","ICT"},undef,420,0,undef,{0,0},undef,{0,0}}, {"Asia/Vladivostok",{"VLAT","VLAT"},undef,600,0,undef,{0,0},undef,{0,0}}, @@ -379,29 +373,29 @@ {"Atlantic/South_Georgia",{"GST","GST"},undef,-120,0,undef,{0,0},undef,{0,0}}, {"Atlantic/St_Helena",{"GMT","GMT"},undef,0,0,undef,{0,0},undef,{0,0}}, {"Atlantic/Stanley",{"FKST","FKST"},undef,-180,0,undef,{0,0},undef,{0,0}}, - {"Australia/ACT",{"EST","EST"},{"EST","EST"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, - {"Australia/Adelaide",{"CST","CST"},{"CST","CST"},570,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, - {"Australia/Brisbane",{"EST","EST"},undef,600,0,undef,{0,0},undef,{0,0}}, - {"Australia/Broken_Hill",{"CST","CST"},{"CST","CST"},570,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, - {"Australia/Canberra",{"EST","EST"},{"EST","EST"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, - {"Australia/Currie",{"EST","EST"},{"EST","EST"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, - {"Australia/Darwin",{"CST","CST"},undef,570,0,undef,{0,0},undef,{0,0}}, - {"Australia/Eucla",{"CWST","CWST"},undef,525,0,undef,{0,0},undef,{0,0}}, - {"Australia/Hobart",{"EST","EST"},{"EST","EST"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, - {"Australia/LHI",{"LHST","LHST"},{"LHST","LHST"},630,30,{1,sun,oct},{2,0},{1,sun,apr},{2,0}}, - {"Australia/Lindeman",{"EST","EST"},undef,600,0,undef,{0,0},undef,{0,0}}, - {"Australia/Lord_Howe",{"LHST","LHST"},{"LHST","LHST"},630,30,{1,sun,oct},{2,0},{1,sun,apr},{2,0}}, - {"Australia/Melbourne",{"EST","EST"},{"EST","EST"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, - {"Australia/NSW",{"EST","EST"},{"EST","EST"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, - {"Australia/North",{"CST","CST"},undef,570,0,undef,{0,0},undef,{0,0}}, - {"Australia/Perth",{"WST","WST"},undef,480,0,undef,{0,0},undef,{0,0}}, - {"Australia/Queensland",{"EST","EST"},undef,600,0,undef,{0,0},undef,{0,0}}, - {"Australia/South",{"CST","CST"},{"CST","CST"},570,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, - {"Australia/Sydney",{"EST","EST"},{"EST","EST"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, - {"Australia/Tasmania",{"EST","EST"},{"EST","EST"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, - {"Australia/Victoria",{"EST","EST"},{"EST","EST"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, - {"Australia/West",{"WST","WST"},undef,480,0,undef,{0,0},undef,{0,0}}, - {"Australia/Yancowinna",{"CST","CST"},{"CST","CST"},570,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, + {"Australia/ACT",{"AEST","AEST"},{"AEDT","AEDT"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, + {"Australia/Adelaide",{"ACST","ACST"},{"ACDT","ACDT"},570,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, + {"Australia/Brisbane",{"AEST","AEST"},undef,600,0,undef,{0,0},undef,{0,0}}, + {"Australia/Broken_Hill",{"ACST","ACST"},{"ACDT","ACDT"},570,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, + {"Australia/Canberra",{"AEST","AEST"},{"AEDT","AEDT"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, + {"Australia/Currie",{"AEST","AEST"},{"AEDT","AEDT"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, + {"Australia/Darwin",{"ACST","ACST"},undef,570,0,undef,{0,0},undef,{0,0}}, + {"Australia/Eucla",{"ACWST","ACWST"},undef,525,0,undef,{0,0},undef,{0,0}}, + {"Australia/Hobart",{"AEST","AEST"},{"AEDT","AEDT"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, + {"Australia/LHI",{"LHST","LHST"},{"LHDT","LHDT"},630,30,{1,sun,oct},{2,0},{1,sun,apr},{2,0}}, + {"Australia/Lindeman",{"AEST","AEST"},undef,600,0,undef,{0,0},undef,{0,0}}, + {"Australia/Lord_Howe",{"LHST","LHST"},{"LHDT","LHDT"},630,30,{1,sun,oct},{2,0},{1,sun,apr},{2,0}}, + {"Australia/Melbourne",{"AEST","AEST"},{"AEDT","AEDT"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, + {"Australia/NSW",{"AEST","AEST"},{"AEDT","AEDT"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, + {"Australia/North",{"ACST","ACST"},undef,570,0,undef,{0,0},undef,{0,0}}, + {"Australia/Perth",{"AWST","AWST"},undef,480,0,undef,{0,0},undef,{0,0}}, + {"Australia/Queensland",{"AEST","AEST"},undef,600,0,undef,{0,0},undef,{0,0}}, + {"Australia/South",{"ACST","ACST"},{"ACDT","ACDT"},570,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, + {"Australia/Sydney",{"AEST","AEST"},{"AEDT","AEDT"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, + {"Australia/Tasmania",{"AEST","AEST"},{"AEDT","AEDT"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, + {"Australia/Victoria",{"AEST","AEST"},{"AEDT","AEDT"},600,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, + {"Australia/West",{"AWST","AWST"},undef,480,0,undef,{0,0},undef,{0,0}}, + {"Australia/Yancowinna",{"ACST","ACST"},{"ACDT","ACDT"},570,60,{1,sun,oct},{2,0},{1,sun,apr},{3,0}}, {"Brazil/Acre",{"ACT","ACT"},undef,-300,0,undef,{0,0},undef,{0,0}}, {"Brazil/DeNoronha",{"FNT","FNT"},undef,-120,0,undef,{0,0},undef,{0,0}}, {"Brazil/East",{"BRT","BRT"},{"BRST","BRST"},-180,60,{3,sun,oct},{0,0},{3,sun,feb},{0,0}}, @@ -417,8 +411,8 @@ {"Canada/Pacific",{"PST","PST"},{"PDT","PDT"},-480,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"Canada/Saskatchewan",{"CST","CST"},undef,-360,0,undef,{0,0},undef,{0,0}}, {"Canada/Yukon",{"PST","PST"},{"PDT","PDT"},-480,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, - {"Chile/Continental",{"CLT","CLT"},{"CLST","CLST"},-240,60,{1,sun,sep},{0,0},{4,sun,apr},{0,0}}, - {"Chile/EasterIsland",{"EAST","EAST"},{"EASST","EASST"},-360,60,{1,sun,sep},{0,0},{4,sun,apr},{0,0}}, + {"Chile/Continental",{"CLT","CLT"},undef,-180,0,undef,{0,0},undef,{0,0}}, + {"Chile/EasterIsland",{"EAST","EAST"},undef,-300,0,undef,{0,0},undef,{0,0}}, {"Cuba",{"CST","CST"},{"CDT","CDT"},-300,60,{2,sun,mar},{0,0},{1,sun,nov},{1,0}}, {"EET",{"EET","EET"},{"EEST","EEST"},120,60,{last,sun,mar},{3,0},{last,sun,oct},{4,0}}, {"EST",{"EST","EST"},undef,-300,0,undef,{0,0},undef,{0,0}}, @@ -471,7 +465,7 @@ {"Europe/Bucharest",{"EET","EET"},{"EEST","EEST"},120,60,{last,sun,mar},{3,0},{last,sun,oct},{4,0}}, {"Europe/Budapest",{"CET","CET"},{"CEST","CEST"},60,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, {"Europe/Busingen",{"CET","CET"},{"CEST","CEST"},60,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, - {"Europe/Chisinau",{"EET","EET"},{"EEST","EEST"},120,60,{last,sun,mar},{3,0},{last,sun,oct},{4,0}}, + {"Europe/Chisinau",{"EET","EET"},{"EEST","EEST"},120,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, {"Europe/Copenhagen",{"CET","CET"},{"CEST","CEST"},60,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, {"Europe/Dublin",{"GMT","GMT"},{"IST","IST"},0,60,{last,sun,mar},{1,0},{last,sun,oct},{2,0}}, {"Europe/Gibraltar",{"CET","CET"},{"CEST","CEST"},60,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, @@ -489,7 +483,7 @@ {"Europe/Madrid",{"CET","CET"},{"CEST","CEST"},60,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, {"Europe/Malta",{"CET","CET"},{"CEST","CEST"},60,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, {"Europe/Mariehamn",{"EET","EET"},{"EEST","EEST"},120,60,{last,sun,mar},{3,0},{last,sun,oct},{4,0}}, - {"Europe/Minsk",{"FET","FET"},undef,180,0,undef,{0,0},undef,{0,0}}, + {"Europe/Minsk",{"MSK","MSK"},undef,180,0,undef,{0,0},undef,{0,0}}, {"Europe/Monaco",{"CET","CET"},{"CEST","CEST"},60,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, {"Europe/Moscow",{"MSK","MSK"},undef,180,0,undef,{0,0},undef,{0,0}}, {"Europe/Nicosia",{"EET","EET"},{"EEST","EEST"},120,60,{last,sun,mar},{3,0},{last,sun,oct},{4,0}}, @@ -502,13 +496,13 @@ {"Europe/Samara",{"SAMT","SAMT"},undef,240,0,undef,{0,0},undef,{0,0}}, {"Europe/San_Marino",{"CET","CET"},{"CEST","CEST"},60,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, {"Europe/Sarajevo",{"CET","CET"},{"CEST","CEST"},60,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, - {"Europe/Simferopol",{"EET","EET"},{"EEST","EEST"},120,60,{last,sun,mar},{3,0},{last,sun,oct},{4,0}}, + {"Europe/Simferopol",{"MSK","MSK"},undef,180,0,undef,{0,0},undef,{0,0}}, {"Europe/Skopje",{"CET","CET"},{"CEST","CEST"},60,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, {"Europe/Sofia",{"EET","EET"},{"EEST","EEST"},120,60,{last,sun,mar},{3,0},{last,sun,oct},{4,0}}, {"Europe/Stockholm",{"CET","CET"},{"CEST","CEST"},60,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, {"Europe/Tallinn",{"EET","EET"},{"EEST","EEST"},120,60,{last,sun,mar},{3,0},{last,sun,oct},{4,0}}, {"Europe/Tirane",{"CET","CET"},{"CEST","CEST"},60,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, - {"Europe/Tiraspol",{"EET","EET"},{"EEST","EEST"},120,60,{last,sun,mar},{3,0},{last,sun,oct},{4,0}}, + {"Europe/Tiraspol",{"EET","EET"},{"EEST","EEST"},120,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, {"Europe/Uzhgorod",{"EET","EET"},{"EEST","EEST"},120,60,{last,sun,mar},{3,0},{last,sun,oct},{4,0}}, {"Europe/Vaduz",{"CET","CET"},{"CEST","CEST"},60,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, {"Europe/Vatican",{"CET","CET"},{"CEST","CEST"},60,60,{last,sun,mar},{2,0},{last,sun,oct},{3,0}}, @@ -557,15 +551,16 @@ {"Navajo",{"MST","MST"},{"MDT","MDT"},-420,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"PRC",{"CST","CST"},undef,480,0,undef,{0,0},undef,{0,0}}, {"PST8PDT",{"PST","PST"},{"PDT","PDT"},-480,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, - {"Pacific/Apia",{"WST","WST"},{"WSDT","WSDT"},780,1,{last,sun,sep},{3,0},{1,sun,apr},{4,0}}, + {"Pacific/Apia",{"WSST","WSST"},{"WSDT","WSDT"},780,60,{last,sun,sep},{3,0},{1,sun,apr},{4,0}}, {"Pacific/Auckland",{"NZST","NZST"},{"NZDT","NZDT"},720,60,{last,sun,sep},{2,0},{1,sun,apr},{3,0}}, + {"Pacific/Bougainville",{"BST","BST"},undef,660,0,undef,{0,0},undef,{0,0}}, {"Pacific/Chatham",{"CHAST","CHAST"},{"CHADT","CHADT"},765,60,{last,sun,sep},{2,45},{1,sun,apr},{3,45}}, {"Pacific/Chuuk",{"CHUT","CHUT"},undef,600,0,undef,{0,0},undef,{0,0}}, - {"Pacific/Easter",{"EAST","EAST"},{"EASST","EASST"},-360,60,{1,sun,sep},{0,0},{4,sun,apr},{0,0}}, + {"Pacific/Easter",{"EAST","EAST"},undef,-300,0,undef,{0,0},undef,{0,0}}, {"Pacific/Efate",{"VUT","VUT"},undef,660,0,undef,{0,0},undef,{0,0}}, {"Pacific/Enderbury",{"PHOT","PHOT"},undef,780,0,undef,{0,0},undef,{0,0}}, {"Pacific/Fakaofo",{"TKT","TKT"},undef,780,0,undef,{0,0},undef,{0,0}}, - {"Pacific/Fiji",{"FJT","FJT"},{"FJST","FJST"},720,60,{4,sun,oct},{2,0},{3,sun,jan},{3,0}}, + {"Pacific/Fiji",{"FJT","FJT"},{"FJST","FJST"},720,60,{1,sun,nov},{2,0},{3,sun,jan},{3,0}}, {"Pacific/Funafuti",{"TVT","TVT"},undef,720,0,undef,{0,0},undef,{0,0}}, {"Pacific/Galapagos",{"GALT","GALT"},undef,-360,0,undef,{0,0},undef,{0,0}}, {"Pacific/Gambier",{"GAMT","GAMT"},undef,-540,0,undef,{0,0},undef,{0,0}}, @@ -581,7 +576,7 @@ {"Pacific/Midway",{"SST","SST"},undef,-660,0,undef,{0,0},undef,{0,0}}, {"Pacific/Nauru",{"NRT","NRT"},undef,720,0,undef,{0,0},undef,{0,0}}, {"Pacific/Niue",{"NUT","NUT"},undef,-660,0,undef,{0,0},undef,{0,0}}, - {"Pacific/Norfolk",{"NFT","NFT"},undef,690,0,undef,{0,0},undef,{0,0}}, + {"Pacific/Norfolk",{"NFT","NFT"},undef,660,0,undef,{0,0},undef,{0,0}}, {"Pacific/Noumea",{"NCT","NCT"},undef,660,0,undef,{0,0},undef,{0,0}}, {"Pacific/Pago_Pago",{"SST","SST"},undef,-660,0,undef,{0,0},undef,{0,0}}, {"Pacific/Palau",{"PWT","PWT"},undef,540,0,undef,{0,0},undef,{0,0}}, @@ -607,7 +602,7 @@ {"Turkey",{"EET","EET"},{"EEST","EEST"},120,60,{last,sun,mar},{3,0},{last,sun,oct},{4,0}}, {"UCT",{"UCT","UCT"},undef,0,0,undef,{0,0},undef,{0,0}}, {"US/Alaska",{"AKST","AKST"},{"AKDT","AKDT"},-540,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, - {"US/Aleutian",{"HAST","HAST"},{"HADT","HADT"},-600,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, + {"US/Aleutian",{"HST","HST"},{"HDT","HDT"},-600,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"US/Arizona",{"MST","MST"},undef,-420,0,undef,{0,0},undef,{0,0}}, {"US/Central",{"CST","CST"},{"CDT","CDT"},-360,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, {"US/East-Indiana",{"EST","EST"},{"EDT","EDT"},-300,60,{2,sun,mar},{2,0},{1,sun,nov},{2,0}}, @@ -620,7 +615,7 @@ {"US/Samoa",{"SST","SST"},undef,-660,0,undef,{0,0},undef,{0,0}}, {"UTC",{"UTC","UTC"},undef,0,0,undef,{0,0},undef,{0,0}}, {"Universal",{"UTC","UTC"},undef,0,0,undef,{0,0},undef,{0,0}}, - {"W-SU",{"MSK","MSK"},undef,240,0,undef,{0,0},undef,{0,0}}, + {"W-SU",{"MSK","MSK"},undef,180,0,undef,{0,0},undef,{0,0}}, {"WET",{"WET","WET"},{"WEST","WEST"},0,60,{last,sun,mar},{1,0},{last,sun,oct},{2,0}}, {"Zulu",{"UTC","UTC"},undef,0,0,undef,{0,0},undef,{0,0}} ]). diff --git a/include/tz_index.hrl b/include/tz_index.hrl index 81e7294..03b0034 100644 --- a/include/tz_index.hrl +++ b/include/tz_index.hrl @@ -1,7 +1,8 @@ --define(tz_index, {dict,198,40,64,32,200,120, +-define(tz_index, {dict,202,41,64,32,205,123, {[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]}, {{[["WGST","America/Godthab"],["GMT+2","Etc/GMT+2"]], [["NPT","Asia/Kathmandu","Asia/Katmandu"], + ["ACWST","Australia/Eucla"], ["CCT","Indian/Cocos"]], [["DAVT","Antarctica/Davis"], ["AZT","Asia/Baku"], @@ -9,12 +10,12 @@ [["MST","America/Boise","America/Cambridge_Bay", "America/Chihuahua","America/Creston", "America/Dawson_Creek","America/Denver", - "America/Edmonton","America/Hermosillo", - "America/Inuvik","America/Mazatlan", - "America/Ojinaga","America/Phoenix", - "America/Shiprock","America/Yellowknife", - "Canada/Mountain","MST","MST7MDT", - "Mexico/BajaSur","Navajo","US/Arizona", + "America/Edmonton","America/Fort_Nelson", + "America/Hermosillo","America/Inuvik", + "America/Mazatlan","America/Ojinaga", + "America/Phoenix","America/Shiprock", + "America/Yellowknife","Canada/Mountain","MST", + "MST7MDT","Mexico/BajaSur","Navajo","US/Arizona", "US/Mountain"], ["GMT-7","Etc/GMT-7"]], [["ROTT","Antarctica/Rothera"], @@ -25,43 +26,41 @@ ["GMT-1","Etc/GMT-1"], ["GMT-10","Etc/GMT-10"]], [["SAKT","Asia/Sakhalin"], - ["LHST","Australia/LHI","Australia/LHI", - "Australia/Lord_Howe","Australia/Lord_Howe"], - ["MSK","Europe/Moscow","W-SU"], + ["LHST","Australia/LHI","Australia/Lord_Howe"], + ["MSK","Europe/Minsk","Europe/Moscow", + "Europe/Simferopol","Europe/Volgograd","W-SU"], ["PHOT","Pacific/Enderbury"], ["PWT","Pacific/Palau"]], - [["AST","America/Anguilla","America/Antigua", + [["HDT","America/Adak","America/Atka","US/Aleutian"], + ["AST","America/Anguilla","America/Antigua", "America/Aruba","America/Barbados", "America/Blanc-Sablon","America/Curacao", "America/Dominica","America/Glace_Bay", - "America/Goose_Bay","America/Grenada", - "America/Guadeloupe","America/Halifax", - "America/Kralendijk","America/Lower_Princes", - "America/Marigot","America/Martinique", - "America/Moncton","America/Montserrat", - "America/Port_of_Spain","America/Puerto_Rico", - "America/Santo_Domingo","America/St_Barthelemy", - "America/St_Kitts","America/St_Lucia", - "America/St_Thomas","America/St_Vincent", - "America/Thule","America/Tortola", - "America/Virgin","Asia/Aden","Asia/Baghdad", - "Asia/Bahrain","Asia/Kuwait","Asia/Qatar", - "Asia/Riyadh","Atlantic/Bermuda", - "Canada/Atlantic"], - ["EASST","Chile/EasterIsland","Pacific/Easter"]], + "America/Goose_Bay","America/Grand_Turk", + "America/Grenada","America/Guadeloupe", + "America/Halifax","America/Kralendijk", + "America/Lower_Princes","America/Marigot", + "America/Martinique","America/Moncton", + "America/Montserrat","America/Port_of_Spain", + "America/Puerto_Rico","America/Santo_Domingo", + "America/St_Barthelemy","America/St_Kitts", + "America/St_Lucia","America/St_Thomas", + "America/St_Vincent","America/Thule", + "America/Tortola","America/Virgin","Asia/Aden", + "Asia/Baghdad","Asia/Bahrain","Asia/Kuwait", + "Asia/Qatar","Asia/Riyadh","Atlantic/Bermuda", + "Canada/Atlantic"]], [["NST","America/St_Johns","Canada/Newfoundland"], - ["MIST","Antarctica/Macquarie"], - ["WITA","Asia/Makassar","Asia/Ujung_Pandang"], ["YEKT","Asia/Yekaterinburg"]], [["BDT","Asia/Dacca","Asia/Dhaka"], ["GMT+7","Etc/GMT+7"], ["CKT","Pacific/Rarotonga"]], - [["PKT","Asia/Karachi"], - ["NOVT","Asia/Novokuznetsk","Asia/Novosibirsk"], + [["HST","America/Adak","America/Atka","HST", + "Pacific/Honolulu","Pacific/Johnston", + "US/Aleutian","US/Hawaii"], + ["PKT","Asia/Karachi"], + ["NOVT","Asia/Novosibirsk"], ["GMT+4","Etc/GMT+4"], - ["FET","Europe/Kaliningrad","Europe/Minsk"], - ["HST","HST","Pacific/Honolulu","Pacific/Johnston", - "US/Hawaii"], ["MVT","Indian/Maldives"], ["VUT","Pacific/Efate"], ["LINT","Pacific/Kiritimati"]], @@ -74,39 +73,40 @@ ["VOST","Antarctica/Vostok"], ["BNT","Asia/Brunei"], ["TLT","Asia/Dili"], + ["HOVST","Asia/Hovd"], + ["ACDT","Australia/Adelaide", + "Australia/Broken_Hill","Australia/South", + "Australia/Yancowinna"], ["GMT+1","Etc/GMT+1"], ["CHADT","NZ-CHAT","Pacific/Chatham"], ["FJT","Pacific/Fiji"]], - [["HADT","America/Adak","America/Atka", - "US/Aleutian"], - ["EEST","Asia/Amman","Asia/Beirut","Asia/Damascus", + [["EEST","Asia/Amman","Asia/Beirut","Asia/Damascus", "Asia/Gaza","Asia/Hebron","Asia/Istanbul", "Asia/Nicosia","EET","Europe/Athens", "Europe/Bucharest","Europe/Chisinau", "Europe/Helsinki","Europe/Istanbul","Europe/Kiev", "Europe/Mariehamn","Europe/Nicosia","Europe/Riga", - "Europe/Simferopol","Europe/Sofia", - "Europe/Tallinn","Europe/Tiraspol", + "Europe/Sofia","Europe/Tallinn","Europe/Tiraspol", "Europe/Uzhgorod","Europe/Vilnius", "Europe/Zaporozhye","Turkey"], ["IDT","Asia/Jerusalem","Asia/Tel_Aviv","Israel"], - ["CWST","Australia/Eucla"], ["BST","Europe/Belfast","Europe/Guernsey", "Europe/Isle_of_Man","Europe/Jersey", - "Europe/London","GB","GB-Eire"], + "Europe/London","GB","GB-Eire", + "Pacific/Bougainville"], ["KOST","Pacific/Kosrae"], ["WFT","Pacific/Wallis"]], [["ALMT","Asia/Almaty"], ["CHOT","Asia/Choibalsan"], + ["SRET","Asia/Srednekolymsk"], ["AZOT","Atlantic/Azores"], ["GMT-9","Etc/GMT-9"], ["MET","MET"], ["TVT","Pacific/Funafuti"]], [["SAST","Africa/Johannesburg","Africa/Maseru", "Africa/Mbabane"], - ["CDT","America/Bahia_Banderas","America/Cancun", - "America/Chicago","America/Havana", - "America/Indiana/Knox", + ["CDT","America/Bahia_Banderas","America/Chicago", + "America/Havana","America/Indiana/Knox", "America/Indiana/Tell_City","America/Knox_IN", "America/Matamoros","America/Menominee", "America/Merida","America/Mexico_City", @@ -117,11 +117,13 @@ "America/Resolute","America/Winnipeg","CST6CDT", "Canada/Central","Cuba","Mexico/General", "US/Central","US/Indiana-Starke"], + ["ACST","Australia/Adelaide", + "Australia/Broken_Hill","Australia/Darwin", + "Australia/North","Australia/South", + "Australia/Yancowinna"], ["GMT-6","Etc/GMT-6"], ["CHAST","NZ-CHAT","Pacific/Chatham"]], - [["HAST","America/Adak","America/Atka", - "US/Aleutian"], - ["PYST","America/Asuncion"], + [["PYST","America/Asuncion"], ["PDT","America/Dawson","America/Ensenada", "America/Los_Angeles","America/Santa_Isabel", "America/Tijuana","America/Vancouver", @@ -135,8 +137,7 @@ ["GMT-12","Etc/GMT-12"], ["GMT-3","Etc/GMT-3"]]}, {[["PMDT","America/Miquelon"], - ["GMT+11","Etc/GMT+11"], - ["VOLT","Europe/Volgograd"]], + ["GMT+11","Etc/GMT+11"]], [["EAT","Africa/Addis_Ababa","Africa/Asmara", "Africa/Asmera","Africa/Dar_es_Salaam", "Africa/Djibouti","Africa/Juba","Africa/Kampala", @@ -144,10 +145,9 @@ "Africa/Nairobi","Indian/Antananarivo", "Indian/Comoro","Indian/Mayotte"], ["CST","America/Bahia_Banderas","America/Belize", - "America/Cancun","America/Chicago", - "America/Costa_Rica","America/El_Salvador", - "America/Guatemala","America/Havana", - "America/Indiana/Knox", + "America/Chicago","America/Costa_Rica", + "America/El_Salvador","America/Guatemala", + "America/Havana","America/Indiana/Knox", "America/Indiana/Tell_City","America/Knox_IN", "America/Managua","America/Matamoros", "America/Menominee","America/Merida", @@ -159,42 +159,40 @@ "America/Regina","America/Resolute", "America/Swift_Current","America/Tegucigalpa", "America/Winnipeg","Asia/Chongqing", - "Asia/Chungking","Asia/Harbin","Asia/Kashgar", - "Asia/Macao","Asia/Macau","Asia/Shanghai", - "Asia/Taipei","Asia/Urumqi","Australia/Adelaide", - "Australia/Adelaide","Australia/Broken_Hill", - "Australia/Broken_Hill","Australia/Darwin", - "Australia/North","Australia/South", - "Australia/South","Australia/Yancowinna", - "Australia/Yancowinna","CST6CDT","Canada/Central", + "Asia/Chungking","Asia/Harbin","Asia/Macao", + "Asia/Macau","Asia/Shanghai","Asia/Taipei", + "CST6CDT","Canada/Central", "Canada/East-Saskatchewan","Canada/Saskatchewan", "Cuba","Mexico/General","PRC","ROC","US/Central", "US/Indiana-Starke"], ["TJT","Asia/Dushanbe"], - ["KRAT","Asia/Krasnoyarsk"], + ["KRAT","Asia/Krasnoyarsk","Asia/Novokuznetsk"], ["MYT","Asia/Kuala_Lumpur","Asia/Kuching"], ["SCT","Indian/Mahe"]], - [["CEST","Africa/Ceuta","Arctic/Longyearbyen", - "Atlantic/Jan_Mayen","CET","Europe/Amsterdam", - "Europe/Andorra","Europe/Belgrade", - "Europe/Berlin","Europe/Bratislava", - "Europe/Brussels","Europe/Budapest", - "Europe/Busingen","Europe/Copenhagen", - "Europe/Gibraltar","Europe/Ljubljana", - "Europe/Luxembourg","Europe/Madrid", - "Europe/Malta","Europe/Monaco","Europe/Oslo", - "Europe/Paris","Europe/Podgorica","Europe/Prague", - "Europe/Rome","Europe/San_Marino", + [["CEST","Africa/Ceuta","Antarctica/Troll", + "Arctic/Longyearbyen","Atlantic/Jan_Mayen","CET", + "Europe/Amsterdam","Europe/Andorra", + "Europe/Belgrade","Europe/Berlin", + "Europe/Bratislava","Europe/Brussels", + "Europe/Budapest","Europe/Busingen", + "Europe/Copenhagen","Europe/Gibraltar", + "Europe/Ljubljana","Europe/Luxembourg", + "Europe/Madrid","Europe/Malta","Europe/Monaco", + "Europe/Oslo","Europe/Paris","Europe/Podgorica", + "Europe/Prague","Europe/Rome","Europe/San_Marino", "Europe/Sarajevo","Europe/Skopje", "Europe/Stockholm","Europe/Tirane","Europe/Vaduz", "Europe/Vatican","Europe/Vienna","Europe/Warsaw", "Europe/Zagreb","Europe/Zurich","Poland"], ["PST","America/Dawson","America/Ensenada", - "America/Los_Angeles","America/Santa_Isabel", - "America/Tijuana","America/Vancouver", - "America/Whitehorse","Canada/Pacific", - "Canada/Yukon","Mexico/BajaNorte","PST8PDT", - "Pacific/Pitcairn","US/Pacific"], + "America/Los_Angeles","America/Metlakatla", + "America/Santa_Isabel","America/Tijuana", + "America/Vancouver","America/Whitehorse", + "Canada/Pacific","Canada/Yukon", + "Mexico/BajaNorte","PST8PDT","Pacific/Pitcairn", + "US/Pacific"], + ["AWST","Antarctica/Casey","Australia/Perth", + "Australia/West"], ["SYOT","Antarctica/Syowa"], ["VLAT","Asia/Ust-Nera","Asia/Vladivostok"], ["CXT","Indian/Christmas"], @@ -204,14 +202,15 @@ "US/Alaska"], ["GYT","America/Guyana"], ["PMST","America/Miquelon"], + ["UTC","Antarctica/Troll","Etc/UTC", + "Etc/Universal","Etc/Zulu","UTC","Universal", + "Zulu"], ["WIT","Asia/Jayapura"], ["GMT+9","Etc/GMT+9"], - ["UTC","Etc/UTC","Etc/Universal","Etc/Zulu","UTC", - "Universal","Zulu"], ["MART","Pacific/Marquesas"]], - [["MeST","America/Metlakatla"], - ["SRT","America/Paramaribo"], + [["SRT","America/Paramaribo"], ["MAWT","Antarctica/Mawson"], + ["CHOST","Asia/Choibalsan"], ["YAKT","Asia/Khandyga","Asia/Yakutsk"], ["JST","Asia/Tokyo","Japan"], ["AZOST","Atlantic/Azores"], @@ -219,12 +218,13 @@ ["MHT","Kwajalein","Pacific/Kwajalein", "Pacific/Majuro"], ["MEST","MET"]], - [["CLST","America/Santiago","Antarctica/Palmer", - "Chile/Continental"], - ["WST","Antarctica/Casey","Australia/Perth", - "Australia/West","Pacific/Apia"], - ["MMT","Asia/Rangoon"], + [["MMT","Asia/Rangoon"], ["ULAT","Asia/Ulaanbaatar","Asia/Ulan_Bator"], + ["AEDT","Australia/ACT","Australia/Canberra", + "Australia/Currie","Australia/Hobart", + "Australia/Melbourne","Australia/NSW", + "Australia/Sydney","Australia/Tasmania", + "Australia/Victoria"], ["GMT+3","Etc/GMT+3"]], [["WEST","Africa/Casablanca","Africa/El_Aaiun", "Atlantic/Canary","Atlantic/Faeroe", @@ -258,8 +258,8 @@ ["NZDT","Antarctica/McMurdo", "Antarctica/South_Pole","NZ","Pacific/Auckland"], ["GALT","Pacific/Galapagos"]], - [["EDT","America/Detroit","America/Fort_Wayne", - "America/Grand_Turk", + [["EDT","America/Cayman","America/Detroit", + "America/Fort_Wayne", "America/Indiana/Indianapolis", "America/Indiana/Marengo", "America/Indiana/Petersburg", @@ -278,6 +278,12 @@ ["TMT","Asia/Ashgabat","Asia/Ashkhabad"], ["PETT","Asia/Kamchatka"], ["CVT","Atlantic/Cape_Verde"], + ["AEST","Australia/ACT","Australia/Brisbane", + "Australia/Canberra","Australia/Currie", + "Australia/Hobart","Australia/Lindeman", + "Australia/Melbourne","Australia/NSW", + "Australia/Queensland","Australia/Sydney", + "Australia/Tasmania","Australia/Victoria"], ["EAST","Chile/EasterIsland","Pacific/Easter"], ["GMT-8","Etc/GMT-8"], ["NCT","Pacific/Noumea"]], @@ -287,7 +293,7 @@ "Brazil/West"], ["WGT","America/Godthab"], ["UYT","America/Montevideo"], - ["IRKT","Asia/Irkutsk"], + ["IRKT","Asia/Chita","Asia/Irkutsk"], ["WIB","Asia/Jakarta","Asia/Pontianak"], ["KST","Asia/Pyongyang","Asia/Seoul","ROK"], ["BTT","Asia/Thimbu","Asia/Thimphu"], @@ -332,9 +338,9 @@ "Europe/Stockholm","Europe/Tirane","Europe/Vaduz", "Europe/Vatican","Europe/Vienna","Europe/Warsaw", "Europe/Zagreb","Europe/Zurich","Poland"], - ["EST","America/Atikokan","America/Cayman", - "America/Coral_Harbour","America/Detroit", - "America/Fort_Wayne","America/Grand_Turk", + ["EST","America/Atikokan","America/Cancun", + "America/Cayman","America/Coral_Harbour", + "America/Detroit","America/Fort_Wayne", "America/Indiana/Indianapolis", "America/Indiana/Marengo", "America/Indiana/Petersburg", @@ -349,19 +355,8 @@ "America/Nipigon","America/Panama", "America/Pangnirtung","America/Port-au-Prince", "America/Thunder_Bay","America/Toronto", - "Australia/ACT","Australia/ACT", - "Australia/Brisbane","Australia/Canberra", - "Australia/Canberra","Australia/Currie", - "Australia/Currie","Australia/Hobart", - "Australia/Hobart","Australia/Lindeman", - "Australia/Melbourne","Australia/Melbourne", - "Australia/NSW","Australia/NSW", - "Australia/Queensland","Australia/Sydney", - "Australia/Sydney","Australia/Tasmania", - "Australia/Tasmania","Australia/Victoria", - "Australia/Victoria","Canada/Eastern","EST", - "EST5EDT","Jamaica","US/East-Indiana", - "US/Eastern","US/Michigan"], + "Canada/Eastern","EST","EST5EDT","Jamaica", + "US/East-Indiana","US/Eastern","US/Michigan"], ["ANAT","Asia/Anadyr"], ["GMT+10","Etc/GMT+10"], ["UCT","Etc/UCT","UCT"], @@ -372,6 +367,8 @@ [["GFT","America/Cayenne"], ["PET","America/Lima"], ["HOVT","Asia/Hovd"], + ["ULAST","Asia/Ulaanbaatar","Asia/Ulan_Bator"], + ["WSST","Pacific/Apia"], ["PONT","Pacific/Pohnpei","Pacific/Ponape"], ["TAHT","Pacific/Tahiti"]], [["COT","America/Bogota"], @@ -407,7 +404,6 @@ "Canada/Mountain","MST7MDT","Mexico/BajaSur", "Navajo","US/Mountain"], ["AMST","America/Campo_Grande","America/Cuiaba"], - ["UYST","America/Montevideo"], ["SAMT","Europe/Samara"]], [["AQTT","Asia/Aqtau","Asia/Aqtobe"], ["AZST","Asia/Baku"], @@ -418,7 +414,8 @@ [["WAST","Africa/Windhoek"], ["FJST","Pacific/Fiji"], ["NUT","Pacific/Niue"]], - [["PHT","Asia/Manila"]], + [["PHT","Asia/Manila"], + ["LHDT","Australia/LHI","Australia/Lord_Howe"]], [["ADT","America/Glace_Bay","America/Goose_Bay", "America/Halifax","America/Moncton", "America/Thule","Atlantic/Bermuda", @@ -431,15 +428,16 @@ "Asia/Gaza","Asia/Hebron","Asia/Istanbul", "Asia/Nicosia","EET","Egypt","Europe/Athens", "Europe/Bucharest","Europe/Chisinau", - "Europe/Helsinki","Europe/Istanbul","Europe/Kiev", + "Europe/Helsinki","Europe/Istanbul", + "Europe/Kaliningrad","Europe/Kiev", "Europe/Mariehamn","Europe/Nicosia","Europe/Riga", - "Europe/Simferopol","Europe/Sofia", - "Europe/Tallinn","Europe/Tiraspol", + "Europe/Sofia","Europe/Tallinn","Europe/Tiraspol", "Europe/Uzhgorod","Europe/Vilnius", "Europe/Zaporozhye","Libya","Turkey"], ["NDT","America/St_Johns","Canada/Newfoundland"], ["GST","Asia/Dubai","Asia/Muscat", "Atlantic/South_Georgia"], + ["XJT","Asia/Kashgar","Asia/Urumqi"], ["ORAT","Asia/Oral"], ["GMT+12","Etc/GMT+12"]], [["UZT","Asia/Samarkand","Asia/Tashkent"], @@ -450,5 +448,7 @@ "Africa/Maputo"], ["QYZT","Asia/Qyzylorda"], ["FKST","Atlantic/Stanley"]], - [],[],[],[],[],[],[],[]}, - {[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]}}}). \ No newline at end of file + [["MIST","Antarctica/Macquarie"], + ["WITA","Asia/Makassar","Asia/Ujung_Pandang"]], + [],[],[],[],[],[],[]}, + {[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]}}}).