mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-21 12:40:02 +00:00
ICU-8892 Updated tz related data to 2012b level
X-SVN-Rev: 31588
This commit is contained in:
parent
4ef34e6655
commit
6c7f41c17c
5 changed files with 1438 additions and 1400 deletions
|
@ -1,6 +1,6 @@
|
|||
// ***************************************************************************
|
||||
// *
|
||||
// * Copyright (C) 2011 International Business Machines
|
||||
// * Copyright (C) 2012 International Business Machines
|
||||
// * Corporation and others. All Rights Reserved.
|
||||
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
|
||||
// * Source File:<path>/metaZones.xml
|
||||
|
@ -139,6 +139,7 @@ metaZones:table(nofallback){
|
|||
AW{"America/Aruba"}
|
||||
BB{"America/Barbados"}
|
||||
BM{"Atlantic/Bermuda"}
|
||||
BQ{"America/Kralendijk"}
|
||||
DM{"America/Dominica"}
|
||||
GD{"America/Grenada"}
|
||||
GL{"America/Thule"}
|
||||
|
@ -149,6 +150,7 @@ metaZones:table(nofallback){
|
|||
MQ{"America/Martinique"}
|
||||
MS{"America/Montserrat"}
|
||||
PR{"America/Puerto_Rico"}
|
||||
SX{"America/Lower_Princes"}
|
||||
TT{"America/Port_of_Spain"}
|
||||
VC{"America/St_Vincent"}
|
||||
VG{"America/Tortola"}
|
||||
|
@ -1478,6 +1480,11 @@ metaZones:table(nofallback){
|
|||
"America_Central",
|
||||
}
|
||||
}
|
||||
"America:Creston"{
|
||||
{
|
||||
"America_Mountain",
|
||||
}
|
||||
}
|
||||
"America:Cuiaba"{
|
||||
{
|
||||
"Amazon",
|
||||
|
@ -1842,6 +1849,11 @@ metaZones:table(nofallback){
|
|||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
"America:Kralendijk"{
|
||||
{
|
||||
"Atlantic",
|
||||
}
|
||||
}
|
||||
"America:La_Paz"{
|
||||
{
|
||||
"Bolivia",
|
||||
|
@ -1874,6 +1886,11 @@ metaZones:table(nofallback){
|
|||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
"America:Lower_Princes"{
|
||||
{
|
||||
"Atlantic",
|
||||
}
|
||||
}
|
||||
"America:Maceio"{
|
||||
{
|
||||
"Brasilia",
|
||||
|
@ -2462,6 +2479,16 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Australia_Western",
|
||||
"2010-03-04 15:00",
|
||||
"2011-10-27 18:00",
|
||||
}
|
||||
{
|
||||
"Casey",
|
||||
"2011-10-27 18:00",
|
||||
"2012-02-21 17:00",
|
||||
}
|
||||
{
|
||||
"Australia_Western",
|
||||
"2012-02-21 17:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
|
@ -3496,7 +3523,7 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Europe_Eastern",
|
||||
"1990-06-30 23:00",
|
||||
"2011-03-27 00:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
"Europe:Lisbon"{
|
||||
|
@ -3675,7 +3702,7 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Europe_Eastern",
|
||||
"1997-03-30 01:00",
|
||||
"2011-03-27 01:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
"Europe:Skopje"{
|
||||
|
@ -3724,7 +3751,7 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Europe_Eastern",
|
||||
"1991-03-31 02:00",
|
||||
"2011-03-27 01:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
"Europe:Vaduz"{
|
||||
|
@ -3788,7 +3815,7 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Europe_Eastern",
|
||||
"1991-03-30 23:00",
|
||||
"2011-03-27 01:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
"Europe:Zurich"{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// ***************************************************************************
|
||||
// *
|
||||
// * Copyright (C) 2011 International Business Machines
|
||||
// * Copyright (C) 2012 International Business Machines
|
||||
// * Corporation and others. All Rights Reserved.
|
||||
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
|
||||
// * Source File:<path>/common/bcp47/*.xml
|
||||
|
@ -226,6 +226,7 @@ timezoneTypes:table(nofallback){
|
|||
"America:Coral_Harbour"{"cayzs"}
|
||||
"America:Cordoba"{"arcor"}
|
||||
"America:Costa_Rica"{"crsjo"}
|
||||
"America:Creston"{"cacfq"}
|
||||
"America:Cuiaba"{"brcgb"}
|
||||
"America:Curacao"{"ancur"}
|
||||
"America:Danmarkshavn"{"gldkshvn"}
|
||||
|
@ -264,10 +265,12 @@ timezoneTypes:table(nofallback){
|
|||
"America:Jujuy"{"arjuj"}
|
||||
"America:Juneau"{"usjnu"}
|
||||
"America:Kentucky:Monticello"{"usmoc"}
|
||||
"America:Kralendijk"{"bqkra"}
|
||||
"America:La_Paz"{"bolpb"}
|
||||
"America:Lima"{"pelim"}
|
||||
"America:Los_Angeles"{"uslax"}
|
||||
"America:Louisville"{"uslui"}
|
||||
"America:Lower_Princes"{"sxphi"}
|
||||
"America:Maceio"{"brmcz"}
|
||||
"America:Managua"{"nimga"}
|
||||
"America:Manaus"{"brmao"}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// ***************************************************************************
|
||||
// *
|
||||
// * Copyright (C) 2011 International Business Machines
|
||||
// * Copyright (C) 2012 International Business Machines
|
||||
// * Corporation and others. All Rights Reserved.
|
||||
// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java
|
||||
// * Source File:<path>/windowsZones.xml
|
||||
|
@ -32,9 +32,6 @@ windowsZones:table(nofallback){
|
|||
Argentina Standard Time{
|
||||
001{"America/Buenos_Aires"}
|
||||
}
|
||||
Armenian Standard Time{
|
||||
001{"Asia/Yerevan"}
|
||||
}
|
||||
Atlantic Standard Time{
|
||||
001{"America/Halifax"}
|
||||
}
|
||||
|
@ -44,6 +41,9 @@ windowsZones:table(nofallback){
|
|||
Azores Standard Time{
|
||||
001{"Atlantic/Azores"}
|
||||
}
|
||||
Bahia Standard Time{
|
||||
001{"America/Bahia"}
|
||||
}
|
||||
Bangladesh Standard Time{
|
||||
001{"Asia/Dhaka"}
|
||||
}
|
||||
|
@ -96,7 +96,7 @@ windowsZones:table(nofallback){
|
|||
001{"Australia/Brisbane"}
|
||||
}
|
||||
E. Europe Standard Time{
|
||||
001{"Europe/Minsk"}
|
||||
001{"Asia/Nicosia"}
|
||||
}
|
||||
E. South America Standard Time{
|
||||
001{"America/Sao_Paulo"}
|
||||
|
@ -120,7 +120,7 @@ windowsZones:table(nofallback){
|
|||
001{"Europe/London"}
|
||||
}
|
||||
GTB Standard Time{
|
||||
001{"Europe/Istanbul"}
|
||||
001{"Europe/Bucharest"}
|
||||
}
|
||||
Georgian Standard Time{
|
||||
001{"Asia/Tbilisi"}
|
||||
|
@ -146,8 +146,8 @@ windowsZones:table(nofallback){
|
|||
Jordan Standard Time{
|
||||
001{"Asia/Amman"}
|
||||
}
|
||||
Kamchatka Standard Time{
|
||||
001{"Asia/Kamchatka"}
|
||||
Kaliningrad Standard Time{
|
||||
001{"Europe/Kaliningrad"}
|
||||
}
|
||||
Korea Standard Time{
|
||||
001{"Asia/Seoul"}
|
||||
|
@ -158,15 +158,6 @@ windowsZones:table(nofallback){
|
|||
Mauritius Standard Time{
|
||||
001{"Indian/Mauritius"}
|
||||
}
|
||||
Mexico Standard Time{
|
||||
001{"America/Mexico_City"}
|
||||
}
|
||||
Mexico Standard Time 2{
|
||||
001{"America/Chihuahua"}
|
||||
}
|
||||
Mid-Atlantic Standard Time{
|
||||
001{"Etc/GMT+2"}
|
||||
}
|
||||
Middle East Standard Time{
|
||||
001{"Asia/Beirut"}
|
||||
}
|
||||
|
@ -266,6 +257,9 @@ windowsZones:table(nofallback){
|
|||
Tonga Standard Time{
|
||||
001{"Pacific/Tongatapu"}
|
||||
}
|
||||
Turkey Standard Time{
|
||||
001{"Europe/Istanbul"}
|
||||
}
|
||||
US Eastern Standard Time{
|
||||
001{"America/Indianapolis"}
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,6 +1,6 @@
|
|||
/***********************************************************************
|
||||
* COPYRIGHT:
|
||||
* Copyright (c) 1997-2011, International Business Machines Corporation
|
||||
* Copyright (c) 1997-2012, International Business Machines Corporation
|
||||
* and others. All Rights Reserved.
|
||||
***********************************************************************/
|
||||
|
||||
|
@ -1980,6 +1980,8 @@ void TimeZoneTest::TestCanonicalID() {
|
|||
const char *zone;
|
||||
} excluded1[] = {
|
||||
{"America/Shiprock", "America/Denver"}, // America/Shiprock is defined as a Link to America/Denver in tzdata
|
||||
{"America/Kralendijk", "America/Curacao"},
|
||||
{"America/Lower_Princes", "America/Curacao"},
|
||||
{"America/Marigot", "America/Guadeloupe"},
|
||||
{"America/St_Barthelemy", "America/Guadeloupe"},
|
||||
{"Antarctica/South_Pole", "Antarctica/McMurdo"},
|
||||
|
|
Loading…
Add table
Reference in a new issue