ICU-5015 olson 2006 update
X-SVN-Rev: 19130
This commit is contained in:
Steven R. Loomis
parent
ab3f1478c4
commit
877be1db38
@ -1,6 +1,6 @@
|
||||
/***********************************************************************
|
||||
* COPYRIGHT:
|
||||
* Copyright (c) 1997-2005, International Business Machines Corporation
|
||||
* Copyright (c) 1997-2006, International Business Machines Corporation
|
||||
* and others. All Rights Reserved.
|
||||
***********************************************************************/
|
||||
|
||||
@ -581,7 +581,7 @@ void TimeZoneTest::TestShortZoneIDs()
|
||||
{"PNT", -420, FALSE},
|
||||
{"MST", -420, FALSE}, // updated Aug 2003 aliu
|
||||
{"CST", -360, TRUE},
|
||||
{"IET", -300, FALSE},
|
||||
{"IET", -300, TRUE}, // updated Jan 2006 srl
|
||||
{"EST", -300, FALSE}, // updated Aug 2003 aliu
|
||||
{"PRT", -240, FALSE},
|
||||
{"CNT", -210, TRUE},
|
||||
@ -874,137 +874,123 @@ TimeZoneTest::TestAliasedNames()
|
||||
const char *from;
|
||||
const char *to;
|
||||
} kData[] = {
|
||||
/* Generated by org.unicode.cldr.tool.CountItems */
|
||||
{ "America/Argentina/Buenos_Aires", "America/Buenos_Aires" },
|
||||
{ "America/Argentina/Catamarca", "America/Catamarca" },
|
||||
{ "America/Argentina/Cordoba", "America/Cordoba" },
|
||||
{ "America/Argentina/Jujuy", "America/Jujuy" },
|
||||
{ "America/Argentina/Mendoza", "America/Mendoza" },
|
||||
{ "America/Atka", "America/Adak" },
|
||||
{ "America/Ensenada", "America/Tijuana" },
|
||||
{ "America/Fort_Wayne", "America/Indianapolis" },
|
||||
{ "America/Indiana/Indianapolis", "America/Indianapolis" },
|
||||
{ "America/Kentucky/Louisville", "America/Louisville" },
|
||||
{ "America/Knox_IN", "America/Indiana/Knox" },
|
||||
{ "America/Porto_Acre", "America/Rio_Branco" },
|
||||
{ "America/Rosario", "America/Cordoba" },
|
||||
{ "America/Virgin", "America/St_Thomas" },
|
||||
{ "Asia/Ashkhabad", "Asia/Ashgabat" },
|
||||
{ "Asia/Chungking", "Asia/Chongqing" },
|
||||
{ "Asia/Dacca", "Asia/Dhaka" },
|
||||
{ "Asia/Istanbul", "Europe/Istanbul" },
|
||||
{ "Asia/Macao", "Asia/Macau" },
|
||||
{ "Asia/Tel_Aviv", "Asia/Jerusalem" },
|
||||
{ "Asia/Thimbu", "Asia/Thimphu" },
|
||||
{ "Asia/Ujung_Pandang", "Asia/Makassar" },
|
||||
{ "Asia/Ulan_Bator", "Asia/Ulaanbaatar" },
|
||||
{ "Australia/ACT", "Australia/Sydney" },
|
||||
{ "Australia/Canberra", "Australia/Sydney" },
|
||||
{ "Australia/LHI", "Australia/Lord_Howe" },
|
||||
{ "Australia/NSW", "Australia/Sydney" },
|
||||
{ "Australia/North", "Australia/Darwin" },
|
||||
{ "Australia/Queensland", "Australia/Brisbane" },
|
||||
{ "Australia/South", "Australia/Adelaide" },
|
||||
{ "Australia/Tasmania", "Australia/Hobart" },
|
||||
{ "Australia/Victoria", "Australia/Melbourne" },
|
||||
{ "Australia/West", "Australia/Perth" },
|
||||
{ "Australia/Yancowinna", "Australia/Broken_Hill" },
|
||||
{ "Brazil/Acre", "America/Rio_Branco" },
|
||||
{ "Brazil/DeNoronha", "America/Noronha" },
|
||||
{ "Brazil/East", "America/Sao_Paulo" },
|
||||
{ "Brazil/West", "America/Manaus" },
|
||||
{ "CST6CDT", "America/Chicago" },
|
||||
{ "Canada/Atlantic", "America/Halifax" },
|
||||
{ "Canada/Central", "America/Winnipeg" },
|
||||
{ "Canada/East-Saskatchewan", "America/Regina" },
|
||||
{ "Canada/Eastern", "America/Toronto" },
|
||||
{ "Canada/Mountain", "America/Edmonton" },
|
||||
{ "Canada/Newfoundland", "America/St_Johns" },
|
||||
{ "Canada/Pacific", "America/Vancouver" },
|
||||
{ "Canada/Saskatchewan", "America/Regina" },
|
||||
{ "Canada/Yukon", "America/Whitehorse" },
|
||||
{ "Chile/Continental", "America/Santiago" },
|
||||
{ "Chile/EasterIsland", "Pacific/Easter" },
|
||||
{ "Cuba", "America/Havana" },
|
||||
{ "EST", "America/Indianapolis" },
|
||||
{ "EST5EDT", "America/New_York" },
|
||||
{ "Egypt", "Africa/Cairo" },
|
||||
{ "Eire", "Europe/Dublin" },
|
||||
{ "Etc/GMT+0", "Etc/GMT" },
|
||||
{ "Etc/GMT-0", "Etc/GMT" },
|
||||
{ "Etc/GMT0", "Etc/GMT" },
|
||||
{ "Etc/Greenwich", "Etc/GMT" },
|
||||
{ "Etc/UCT", "Etc/GMT" },
|
||||
{ "Etc/UTC", "Etc/GMT" },
|
||||
{ "Etc/Universal", "Etc/GMT" },
|
||||
{ "Etc/Zulu", "Etc/GMT" },
|
||||
{ "Europe/Nicosia", "Asia/Nicosia" },
|
||||
{ "Europe/Tiraspol", "Europe/Chisinau" },
|
||||
{ "GB", "Europe/London" },
|
||||
{ "GB-Eire", "Europe/London" },
|
||||
{ "GMT", "Etc/GMT" },
|
||||
{ "GMT+0", "Etc/GMT" },
|
||||
{ "GMT-0", "Etc/GMT" },
|
||||
{ "GMT0", "Etc/GMT" },
|
||||
{ "Greenwich", "Etc/GMT" },
|
||||
{ "HST", "Pacific/Honolulu" },
|
||||
{ "Hongkong", "Asia/Hong_Kong" },
|
||||
{ "Iceland", "Atlantic/Reykjavik" },
|
||||
{ "Iran", "Asia/Tehran" },
|
||||
{ "Israel", "Asia/Jerusalem" },
|
||||
{ "Jamaica", "America/Jamaica" },
|
||||
{ "Japan", "Asia/Tokyo" },
|
||||
{ "Kwajalein", "Pacific/Kwajalein" },
|
||||
{ "Libya", "Africa/Tripoli" },
|
||||
{ "MST", "America/Phoenix" },
|
||||
{ "MST7MDT", "America/Denver" },
|
||||
{ "Mexico/BajaNorte", "America/Tijuana" },
|
||||
{ "Mexico/BajaSur", "America/Mazatlan" },
|
||||
{ "Mexico/General", "America/Mexico_City" },
|
||||
{ "NZ", "Pacific/Auckland" },
|
||||
{ "NZ-CHAT", "Pacific/Chatham" },
|
||||
{ "Navajo", "America/Denver" },
|
||||
{ "PRC", "Asia/Shanghai" },
|
||||
{ "PST8PDT", "America/Los_Angeles" },
|
||||
{ "Pacific/Samoa", "Pacific/Pago_Pago" },
|
||||
{ "Poland", "Europe/Warsaw" },
|
||||
{ "Portugal", "Europe/Lisbon" },
|
||||
{ "ROC", "Asia/Taipei" },
|
||||
{ "ROK", "Asia/Seoul" },
|
||||
{ "Singapore", "Asia/Singapore" },
|
||||
{ "SystemV/AST4", "America/Puerto_Rico" },
|
||||
{ "SystemV/AST4ADT", "America/Halifax" },
|
||||
{ "SystemV/CST6", "America/Regina" },
|
||||
{ "SystemV/CST6CDT", "America/Chicago" },
|
||||
{ "SystemV/EST5", "America/Indianapolis" },
|
||||
{ "SystemV/EST5EDT", "America/New_York" },
|
||||
{ "SystemV/HST10", "Pacific/Honolulu" },
|
||||
{ "SystemV/MST7", "America/Phoenix" },
|
||||
{ "SystemV/MST7MDT", "America/Denver" },
|
||||
{ "SystemV/PST8", "Pacific/Pitcairn" },
|
||||
{ "SystemV/PST8PDT", "America/Los_Angeles" },
|
||||
{ "SystemV/YST9", "Pacific/Gambier" },
|
||||
{ "SystemV/YST9YDT", "America/Anchorage" },
|
||||
{ "Turkey", "Europe/Istanbul" },
|
||||
{ "UCT", "Etc/GMT" },
|
||||
{ "US/Alaska", "America/Anchorage" },
|
||||
{ "US/Aleutian", "America/Adak" },
|
||||
{ "US/Arizona", "America/Phoenix" },
|
||||
{ "US/Central", "America/Chicago" },
|
||||
{ "US/East-Indiana", "America/Indianapolis" },
|
||||
{ "US/Eastern", "America/New_York" },
|
||||
{ "US/Hawaii", "Pacific/Honolulu" },
|
||||
{ "US/Indiana-Starke", "America/Indiana/Knox" },
|
||||
{ "US/Michigan", "America/Detroit" },
|
||||
{ "US/Mountain", "America/Denver" },
|
||||
{ "US/Pacific", "America/Los_Angeles" },
|
||||
{ "US/Pacific-New", "America/Los_Angeles" },
|
||||
{ "US/Samoa", "Pacific/Pago_Pago" },
|
||||
{ "UTC", "Etc/GMT" },
|
||||
{ "Universal", "Etc/GMT" },
|
||||
{ "W-SU", "Europe/Moscow" },
|
||||
{ "Zulu", "Etc/GMT" }
|
||||
/* Total: 129 */
|
||||
/* Generated by org.unicode.cldr.tool.CountItems */
|
||||
|
||||
/* zoneID, canonical zoneID */
|
||||
{"Africa/Timbuktu", "Africa/Bamako"},
|
||||
{"America/Argentina/Buenos_Aires", "America/Buenos_Aires"},
|
||||
{"America/Argentina/Catamarca", "America/Catamarca"},
|
||||
{"America/Argentina/ComodRivadavia", "America/Catamarca"},
|
||||
{"America/Argentina/Cordoba", "America/Cordoba"},
|
||||
{"America/Argentina/Jujuy", "America/Jujuy"},
|
||||
{"America/Argentina/Mendoza", "America/Mendoza"},
|
||||
{"America/Atka", "America/Adak"},
|
||||
{"America/Ensenada", "America/Tijuana"},
|
||||
{"America/Fort_Wayne", "America/Indiana/Indianapolis"},
|
||||
{"America/Indianapolis", "America/Indiana/Indianapolis"},
|
||||
{"America/Knox_IN", "America/Indiana/Knox"},
|
||||
{"America/Louisville", "America/Kentucky/Louisville"},
|
||||
{"America/Porto_Acre", "America/Rio_Branco"},
|
||||
{"America/Rosario", "America/Cordoba"},
|
||||
{"America/Virgin", "America/St_Thomas"},
|
||||
{"Asia/Ashkhabad", "Asia/Ashgabat"},
|
||||
{"Asia/Chungking", "Asia/Chongqing"},
|
||||
{"Asia/Dacca", "Asia/Dhaka"},
|
||||
{"Asia/Istanbul", "Europe/Istanbul"},
|
||||
{"Asia/Macao", "Asia/Macau"},
|
||||
{"Asia/Tel_Aviv", "Asia/Jerusalem"},
|
||||
{"Asia/Thimbu", "Asia/Thimphu"},
|
||||
{"Asia/Ujung_Pandang", "Asia/Makassar"},
|
||||
{"Asia/Ulan_Bator", "Asia/Ulaanbaatar"},
|
||||
{"Australia/ACT", "Australia/Sydney"},
|
||||
{"Australia/Canberra", "Australia/Sydney"},
|
||||
{"Australia/LHI", "Australia/Lord_Howe"},
|
||||
{"Australia/NSW", "Australia/Sydney"},
|
||||
{"Australia/North", "Australia/Darwin"},
|
||||
{"Australia/Queensland", "Australia/Brisbane"},
|
||||
{"Australia/South", "Australia/Adelaide"},
|
||||
{"Australia/Tasmania", "Australia/Hobart"},
|
||||
{"Australia/Victoria", "Australia/Melbourne"},
|
||||
{"Australia/West", "Australia/Perth"},
|
||||
{"Australia/Yancowinna", "Australia/Broken_Hill"},
|
||||
{"Brazil/Acre", "America/Rio_Branco"},
|
||||
{"Brazil/DeNoronha", "America/Noronha"},
|
||||
{"Brazil/East", "America/Sao_Paulo"},
|
||||
{"Brazil/West", "America/Manaus"},
|
||||
{"Canada/Atlantic", "America/Halifax"},
|
||||
{"Canada/Central", "America/Winnipeg"},
|
||||
{"Canada/East-Saskatchewan", "America/Regina"},
|
||||
{"Canada/Eastern", "America/Toronto"},
|
||||
{"Canada/Mountain", "America/Edmonton"},
|
||||
{"Canada/Newfoundland", "America/St_Johns"},
|
||||
{"Canada/Pacific", "America/Vancouver"},
|
||||
{"Canada/Saskatchewan", "America/Regina"},
|
||||
{"Canada/Yukon", "America/Whitehorse"},
|
||||
{"Chile/Continental", "America/Santiago"},
|
||||
{"Chile/EasterIsland", "Pacific/Easter"},
|
||||
{"Cuba", "America/Havana"},
|
||||
{"Egypt", "Africa/Cairo"},
|
||||
{"Eire", "Europe/Dublin"},
|
||||
{"Etc/GMT+0", "Etc/GMT"},
|
||||
{"Etc/GMT-0", "Etc/GMT"},
|
||||
{"Etc/GMT0", "Etc/GMT"},
|
||||
{"Etc/Greenwich", "Etc/GMT"},
|
||||
{"Etc/UCT", "Etc/GMT"},
|
||||
{"Etc/UTC", "Etc/GMT"},
|
||||
{"Etc/Universal", "Etc/GMT"},
|
||||
{"Etc/Zulu", "Etc/GMT"},
|
||||
{"Europe/Belfast", "Europe/London"},
|
||||
{"Europe/Nicosia", "Asia/Nicosia"},
|
||||
{"Europe/Tiraspol", "Europe/Chisinau"},
|
||||
{"GB", "Europe/London"},
|
||||
{"GB-Eire", "Europe/London"},
|
||||
{"GMT", "Etc/GMT"},
|
||||
{"GMT+0", "Etc/GMT"},
|
||||
{"GMT-0", "Etc/GMT"},
|
||||
{"GMT0", "Etc/GMT"},
|
||||
{"Greenwich", "Etc/GMT"},
|
||||
{"Hongkong", "Asia/Hong_Kong"},
|
||||
{"Iceland", "Atlantic/Reykjavik"},
|
||||
{"Iran", "Asia/Tehran"},
|
||||
{"Israel", "Asia/Jerusalem"},
|
||||
{"Jamaica", "America/Jamaica"},
|
||||
{"Japan", "Asia/Tokyo"},
|
||||
{"Kwajalein", "Pacific/Kwajalein"},
|
||||
{"Libya", "Africa/Tripoli"},
|
||||
{"Mexico/BajaNorte", "America/Tijuana"},
|
||||
{"Mexico/BajaSur", "America/Mazatlan"},
|
||||
{"Mexico/General", "America/Mexico_City"},
|
||||
{"NZ", "Pacific/Auckland"},
|
||||
{"NZ-CHAT", "Pacific/Chatham"},
|
||||
{"Navajo", "America/Shiprock"},
|
||||
{"PRC", "Asia/Shanghai"},
|
||||
{"Pacific/Samoa", "Pacific/Pago_Pago"},
|
||||
{"Pacific/Yap", "Pacific/Truk"},
|
||||
{"Poland", "Europe/Warsaw"},
|
||||
{"Portugal", "Europe/Lisbon"},
|
||||
{"ROC", "Asia/Taipei"},
|
||||
{"ROK", "Asia/Seoul"},
|
||||
{"Singapore", "Asia/Singapore"},
|
||||
{"Turkey", "Europe/Istanbul"},
|
||||
{"UCT", "Etc/GMT"},
|
||||
{"US/Alaska", "America/Anchorage"},
|
||||
{"US/Aleutian", "America/Adak"},
|
||||
{"US/Arizona", "America/Phoenix"},
|
||||
{"US/Central", "America/Chicago"},
|
||||
{"US/East-Indiana", "America/Indiana/Indianapolis"},
|
||||
{"US/Eastern", "America/New_York"},
|
||||
{"US/Hawaii", "Pacific/Honolulu"},
|
||||
{"US/Indiana-Starke", "America/Indiana/Knox"},
|
||||
{"US/Michigan", "America/Detroit"},
|
||||
{"US/Mountain", "America/Denver"},
|
||||
{"US/Pacific", "America/Los_Angeles"},
|
||||
{"US/Pacific-New", "America/Los_Angeles"},
|
||||
{"US/Samoa", "Pacific/Pago_Pago"},
|
||||
{"UTC", "Etc/GMT"},
|
||||
{"Universal", "Etc/GMT"},
|
||||
{"W-SU", "Europe/Moscow"},
|
||||
{"Zulu", "Etc/GMT"},
|
||||
/* Total: 113 */
|
||||
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user