organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-10434 tzdata2013i to ICU4C, including metazone mapping updates (cldrbug:6893), windows tz mapping updates (cldrbug:6894), make file changes (tzdata2013i removed tz files - solar87/88/89) and a test case update.

Browse source 
X-SVN-Rev: 34828
This commit is contained in:
Yoshito Umaoka 2014-01-03 23:12:22 +00:00
parent 6beb32f883
commit c3711bd5bf
5 changed files with 855 additions and 884 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
icu4c/source/data/misc/metaZones.txt
View file

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2013 International Business Machines
// * Copyright (C) 2014 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/metaZones.xml
@ -311,6 +311,7 @@ metaZones:table(nofallback){
EG{"Africa/Cairo"}
FI{"Europe/Helsinki"}
GR{"Europe/Athens"}
JO{"Asia/Amman"}
LB{"Asia/Beirut"}
SY{"Asia/Damascus"}
}
@ -2594,13 +2595,6 @@ metaZones:table(nofallback){
"Asia:Amman"{
{
"Europe_Eastern",
"1970-01-01 00:00",
"2012-10-25 22:00",
}
{
"Arabian",
"2012-10-25 22:00",
"9999-12-31 23:59",
}
}
"Asia:Anadyr"{

20
icu4c/source/data/misc/windowsZones.txt
View file

@ -1,6 +1,6 @@
// ***************************************************************************
// *
// * Copyright (C) 2013 International Business Machines
// * Copyright (C) 2014 International Business Machines
// * Corporation and others. All Rights Reserved.
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
// * Source File: <path>/windowsZones.xml
@ -202,7 +202,7 @@ windowsZones:table(nofallback){
}
"E. South America Standard Time"{
001{"America/Sao_Paulo"}
BR{"America/Sao_Paulo America/Araguaina"}
BR{"America/Sao_Paulo"}
}
"Eastern Standard Time"{
001{"America/New_York"}
@ -272,7 +272,6 @@ windowsZones:table(nofallback){
001{"Atlantic/Reykjavik"}
BF{"Africa/Ouagadougou"}
CI{"Africa/Abidjan"}
EH{"Africa/El_Aaiun"}
GH{"Africa/Accra"}
GM{"Africa/Banjul"}
GN{"Africa/Conakry"}
@ -345,6 +344,7 @@ windowsZones:table(nofallback){
}
"Morocco Standard Time"{
001{"Africa/Casablanca"}
EH{"Africa/El_Aaiun"}
MA{"Africa/Casablanca"}
}
"Mountain Standard Time (Mexico)"{
@ -380,8 +380,8 @@ windowsZones:table(nofallback){
}
"New Zealand Standard Time"{
001{"Pacific/Auckland"}
AQ{"Antarctica/South_Pole Antarctica/McMurdo"}
NZ{"Pacific/Auckland"}
AQ{"Antarctica/McMurdo"}
NZ{"Pacific/Auckland Antarctica/South_Pole"}
}
"Newfoundland Standard Time"{
001{"America/St_Johns"}
@ -434,8 +434,8 @@ windowsZones:table(nofallback){
001{"America/Cayenne"}
AQ{"Antarctica/Rothera"}
BR{
"America/Fortaleza America/Belem America/Maceio America/Recife Americ"
"a/Santarem"
"America/Fortaleza America/Araguaina America/Belem America/Maceio Ame"
"rica/Recife America/Santarem"
}
FK{"Atlantic/Stanley"}
GF{"America/Cayenne"}
@ -444,6 +444,7 @@ windowsZones:table(nofallback){
}
"SA Pacific Standard Time"{
001{"America/Bogota"}
BR{"America/Rio_Branco America/Eirunepe"}
CA{"America/Coral_Harbour"}
CO{"America/Bogota"}
EC{"America/Guayaquil"}
@ -462,10 +463,7 @@ windowsZones:table(nofallback){
BL{"America/St_Barthelemy"}
BO{"America/La_Paz"}
BQ{"America/Kralendijk"}
BR{
"America/Manaus America/Boa_Vista America/Eirunepe America/Porto_Velh"
"o America/Rio_Branco"
}
BR{"America/Manaus America/Boa_Vista America/Porto_Velho"}
CA{"America/Blanc-Sablon"}
CW{"America/Curacao"}
DM{"America/Dominica"}

1701
icu4c/source/data/misc/zoneinfo64.txt
View file

File diff suppressed because it is too large Load diff

5
icu4c/source/test/intltest/tztest.cpp
View file

@ -1,6 +1,6 @@
/***********************************************************************
* COPYRIGHT:
* Copyright (c) 1997-2013, International Business Machines Corporation
* Copyright (c) 1997-2014, International Business Machines Corporation
* and others. All Rights Reserved.
***********************************************************************/
@ -2231,7 +2231,8 @@ void TimeZoneTest::TestGetRegion()
{"Europe/Helsinki", "FI"},
{"Europe/Mariehamn", "AX"}, // Link Europe/Helsinki, but in zone.tab
{"Asia/Riyadh", "SA"},
{"Asia/Riyadh87", "001"}, // this should be "SA" actually, but not in zone.tab
// tz file solar87 was removed from tzdata2013i
// {"Asia/Riyadh87", "001"}, // this should be "SA" actually, but not in zone.tab
{"Etc/Unknown", 0}, // CLDR canonical, but not a sysmte zone ID
{"bogus", 0}, // bogus
{"GMT+08:00", 0}, // a custom ID, not a system zone ID

3
icu4c/source/tools/tzcode/Makefile.in
View file

@ -102,7 +102,8 @@ PRIMARY_YDATA= africa antarctica asia australasia \
YDATA= $(PRIMARY_YDATA) pacificnew etcetera factory backward
NDATA= systemv
SDATA= solar87 solar88 solar89
TDATA= $(YDATA) $(NDATA) $(SDATA)
#TDATA= $(YDATA) $(NDATA) $(SDATA)
TDATA= $(YDATA) $(NDATA)
YEARISTYPE= ./yearistype
TZDIR=zoneinfo