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-20536 ICU 4.8.2 release tasks

Browse source
This commit is contained in:
yumaoka 2019-04-10 23:03:33 -04:00 • committed by Yoshito Umaoka
parent a413bb0926
commit ca6a2dd032
23 changed files with 3185 additions and 2354 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -922,6 +922,7 @@ icu4c/source/tools/tzcode/zoneinfo
icu4c/source/tools/tzcode/zoneinfo.txt
icu4j/*.jar
icu4j/.project
icu4j/build-local.properties
icu4j/demos/out
icu4j/doc
icu4j/main/classes/charset/out

6
icu4c/readme.html
View file

@ -3,7 +3,7 @@
<html lang="en-US" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
<head>
<title>ReadMe for ICU 4.8.1.1</title>
<title>ReadMe for ICU 4.8.2</title>
<meta name="COPYRIGHT" content=
"Copyright (c) 1997-2011 IBM Corporation and others. All Rights Reserved." />
<meta name="KEYWORDS" content=
@ -16,9 +16,9 @@
<body class="draft">
<h1>International Components for Unicode<br />
<abbr title="International Components for Unicode">ICU</abbr> 4.8.1.1 ReadMe</h1>
<abbr title="International Components for Unicode">ICU</abbr> 4.8.2 ReadMe</h1>
<p>Last updated: 2011-Sep-20<br />
<p>Last updated: 2019-Apr-10<br />
Copyright &copy; 1997-2011 International Business Machines Corporation and
others. All Rights Reserved.</p>
<!-- Remember that there is a copyright at the end too -->

8
icu4c/source/common/unicode/uvernum.h
View file

@ -60,14 +60,14 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION_PATCHLEVEL_NUM 1
#define U_ICU_VERSION_PATCHLEVEL_NUM 2
/** The current ICU build level version as an integer.
* This value is for use by ICU clients. It defaults to 0.
* @stable ICU 4.0
*/
#ifndef U_ICU_VERSION_BUILDLEVEL_NUM
#define U_ICU_VERSION_BUILDLEVEL_NUM 1
#define U_ICU_VERSION_BUILDLEVEL_NUM 0
#endif
/** Glued version suffix for renamers
@ -91,7 +91,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION "4.8.1.1"
#define U_ICU_VERSION "4.8.2"
/** The current ICU library major/minor version as a string without dots, for library name suffixes.
* This value will change in the subsequent releases of ICU
@ -102,7 +102,7 @@
/** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only
**/
#define U_ICU_DATA_VERSION "4.8.1"
#define U_ICU_DATA_VERSION "4.8.2"
/*===========================================================================
* ICU collation framework version information

4
icu4c/source/data/misc/icuver.txt
View file

@ -6,6 +6,6 @@
// ***************************************************************************
icuver:table(nofallback){
DataVersion { "4.8.0.0" }
ICUVersion { "4.8.0.0" }
DataVersion { "4.8.2.0" }
ICUVersion { "4.8.2.0" }
}

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

@ -1,11 +1,5 @@
// ***************************************************************************
// *
// * 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
// *
// ***************************************************************************
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
metaZones:table(nofallback){
mapTimezones{
Acre{
@ -90,7 +84,6 @@ metaZones:table(nofallback){
JM{"America/Jamaica"}
KY{"America/Cayman"}
PA{"America/Panama"}
TC{"America/Grand_Turk"}
}
America_Mountain{
001{"America/Denver"}
@ -105,6 +98,9 @@ metaZones:table(nofallback){
Anadyr{
001{"Asia/Anadyr"}
}
Apia{
001{"Pacific/Apia"}
}
Aqtau{
001{"Asia/Aqtau"}
}
@ -135,11 +131,11 @@ metaZones:table(nofallback){
001{"America/Halifax"}
AG{"America/Antigua"}
AI{"America/Anguilla"}
AN{"America/Curacao"}
AW{"America/Aruba"}
BB{"America/Barbados"}
BM{"Atlantic/Bermuda"}
BQ{"America/Kralendijk"}
CW{"America/Curacao"}
DM{"America/Dominica"}
GD{"America/Grenada"}
GL{"America/Thule"}
@ -211,19 +207,14 @@ metaZones:table(nofallback){
001{"Pacific/Saipan"}
GU{"Pacific/Guam"}
}
Changbai{
001{"Asia/Harbin"}
}
Chatham{
001{"Pacific/Chatham"}
}
Chile{
001{"America/Santiago"}
AQ{"Antarctica/Palmer"}
}
China{
001{"Asia/Shanghai"}
MO{"Asia/Macau"}
}
Choibalsan{
001{"Asia/Choibalsan"}
@ -302,6 +293,7 @@ metaZones:table(nofallback){
SM{"Europe/San_Marino"}
TN{"Africa/Tunis"}
VA{"Europe/Vatican"}
XK{"Europe/Belgrade"}
}
Europe_Eastern{
001{"Europe/Bucharest"}
@ -315,6 +307,10 @@ metaZones:table(nofallback){
LB{"Asia/Beirut"}
SY{"Asia/Damascus"}
}
Europe_Further_Eastern{
001{"Europe/Minsk"}
RU{"Europe/Kaliningrad"}
}
Europe_Western{
001{"Atlantic/Canary"}
FO{"Atlantic/Faeroe"}
@ -343,13 +339,11 @@ metaZones:table(nofallback){
GM{"Africa/Banjul"}
GN{"Africa/Conakry"}
IE{"Europe/Dublin"}
LR{"Africa/Monrovia"}
ML{"Africa/Bamako"}
MR{"Africa/Nouakchott"}
SH{"Atlantic/St_Helena"}
SL{"Africa/Freetown"}
SN{"Africa/Dakar"}
ST{"Africa/Sao_Tome"}
TG{"Africa/Lome"}
}
Galapagos{
@ -403,10 +397,9 @@ metaZones:table(nofallback){
001{"Indian/Chagos"}
}
Indochina{
001{"Asia/Saigon"}
001{"Asia/Bangkok"}
KH{"Asia/Phnom_Penh"}
LA{"Asia/Vientiane"}
TH{"Asia/Bangkok"}
}
Indonesia_Central{
001{"Asia/Makassar"}
@ -438,9 +431,6 @@ metaZones:table(nofallback){
Karachi{
001{"Asia/Karachi"}
}
Kashgar{
001{"Asia/Kashgar"}
}
Kazakhstan_Eastern{
001{"Asia/Almaty"}
}
@ -452,7 +442,6 @@ metaZones:table(nofallback){
}
Korea{
001{"Asia/Seoul"}
KP{"Asia/Pyongyang"}
}
Kosrae{
001{"Pacific/Kosrae"}
@ -478,9 +467,6 @@ metaZones:table(nofallback){
Line_Islands{
001{"Pacific/Kiritimati"}
}
Long_Shu{
001{"Asia/Chongqing"}
}
Lord_Howe{
001{"Australia/Lord_Howe"}
}
@ -514,6 +500,12 @@ metaZones:table(nofallback){
Mawson{
001{"Antarctica/Mawson"}
}
Mexico_Northwest{
001{"America/Santa_Isabel"}
}
Mexico_Pacific{
001{"America/Mazatlan"}
}
Mongolia{
001{"Asia/Ulaanbaatar"}
}
@ -590,6 +582,9 @@ metaZones:table(nofallback){
Ponape{
001{"Pacific/Ponape"}
}
Pyongyang{
001{"Asia/Pyongyang"}
}
Qyzylorda{
001{"Asia/Qyzylorda"}
}
@ -609,7 +604,7 @@ metaZones:table(nofallback){
001{"Asia/Samarkand"}
}
Samoa{
001{"Pacific/Apia"}
001{"Pacific/Pago_Pago"}
}
Seychelles{
001{"Indian/Mahe"}
@ -818,7 +813,7 @@ metaZones:table(nofallback){
{
"Europe_Western",
"1985-12-31 23:00",
"9999-12-31 23:59",
"2018-10-28 02:00",
}
}
"Africa:Ceuta"{
@ -867,7 +862,7 @@ metaZones:table(nofallback){
{
"Europe_Western",
"1976-04-14 01:00",
"9999-12-31 23:59",
"2018-10-28 02:00",
}
}
"Africa:Freetown"{
@ -916,6 +911,11 @@ metaZones:table(nofallback){
{
"Africa_Eastern",
"2000-01-15 10:00",
"2017-10-31 21:00",
}
{
"Africa_Central",
"2017-10-31 21:00",
"9999-12-31 23:59",
}
}
@ -1029,6 +1029,18 @@ metaZones:table(nofallback){
"Africa:Sao_Tome"{
{
"GMT",
"1970-01-01 00:00",
"2018-01-01 01:00",
}
{
"Africa_Western",
"2018-01-01 01:00",
"2019-01-01 01:00",
}
{
"GMT",
"2019-01-01 01:00",
"9999-12-31 23:59",
}
}
"Africa:Tripoli"{
@ -1055,6 +1067,16 @@ metaZones:table(nofallback){
{
"Europe_Eastern",
"1997-10-03 22:00",
"2012-11-10 00:00",
}
{
"Europe_Central",
"2012-11-10 00:00",
"2013-10-25 00:00",
}
{
"Europe_Eastern",
"2013-10-25 00:00",
"9999-12-31 23:59",
}
}
@ -1072,11 +1094,16 @@ metaZones:table(nofallback){
{
"Africa_Central",
"1990-03-20 22:00",
"1994-04-02 22:00",
"1994-03-20 22:00",
}
{
"Africa_Western",
"1994-04-02 22:00",
"1994-03-20 22:00",
"2017-10-23 22:00",
}
{
"Africa_Central",
"2017-10-23 22:00",
"9999-12-31 23:59",
}
}
@ -1401,6 +1428,11 @@ metaZones:table(nofallback){
{
"America_Central",
"1998-08-02 06:00",
"2015-02-01 08:00",
}
{
"America_Eastern",
"2015-02-01 08:00",
"9999-12-31 23:59",
}
}
@ -1453,7 +1485,7 @@ metaZones:table(nofallback){
"1998-04-05 09:00",
}
{
"America_Mountain",
"Mexico_Pacific",
"1998-04-05 09:00",
"9999-12-31 23:59",
}
@ -1560,6 +1592,11 @@ metaZones:table(nofallback){
{
"Amazon",
"2008-06-24 05:00",
"2013-11-10 04:00",
}
{
"Acre",
"2013-11-10 04:00",
"9999-12-31 23:59",
}
}
@ -1568,6 +1605,18 @@ metaZones:table(nofallback){
"America_Central",
}
}
"America:Fort_Nelson"{
{
"America_Pacific",
"1970-01-01 00:00",
"2015-03-08 10:00",
}
{
"America_Mountain",
"2015-03-08 10:00",
"9999-12-31 23:59",
}
}
"America:Fortaleza"{
{
"Brasilia",
@ -1603,6 +1652,18 @@ metaZones:table(nofallback){
"America:Grand_Turk"{
{
"America_Eastern",
"1970-01-01 00:00",
"2015-11-01 06:00",
}
{
"Atlantic",
"2015-11-01 06:00",
"2018-03-11 07:00",
}
{
"America_Eastern",
"2018-03-11 07:00",
"9999-12-31 23:59",
}
}
"America:Grenada"{
@ -1647,7 +1708,7 @@ metaZones:table(nofallback){
"1970-01-01 08:00",
}
{
"America_Mountain",
"Mexico_Pacific",
"1970-01-01 08:00",
"9999-12-31 23:59",
}
@ -1960,7 +2021,7 @@ metaZones:table(nofallback){
"1970-01-01 08:00",
}
{
"America_Mountain",
"Mexico_Pacific",
"1970-01-01 08:00",
"9999-12-31 23:59",
}
@ -2014,6 +2075,23 @@ metaZones:table(nofallback){
"America:Metlakatla"{
{
"America_Pacific",
"1970-01-01 00:00",
"2015-11-01 10:00",
}
{
"Alaska",
"2015-11-01 10:00",
"2018-11-04 10:00",
}
{
"America_Pacific",
"2018-11-04 10:00",
"2019-01-20 10:00",
}
{
"Alaska",
"2019-01-20 10:00",
"9999-12-31 23:59",
}
}
"America:Mexico_City"{
@ -2048,11 +2126,6 @@ metaZones:table(nofallback){
"Uruguay",
}
}
"America:Montreal"{
{
"America_Eastern",
}
}
"America:Montserrat"{
{
"Atlantic",
@ -2207,6 +2280,13 @@ metaZones:table(nofallback){
"Atlantic",
}
}
"America:Punta_Arenas"{
{
"Chile",
"1970-01-01 00:00",
"2016-12-03 23:00",
}
}
"America:Rainy_River"{
{
"America_Central",
@ -2275,12 +2355,17 @@ metaZones:table(nofallback){
{
"Amazon",
"2008-06-24 05:00",
"2013-11-10 04:00",
}
{
"Acre",
"2013-11-10 04:00",
"9999-12-31 23:59",
}
}
"America:Santa_Isabel"{
{
"America_Pacific",
"Mexico_Northwest",
}
}
"America:Santarem"{
@ -2339,11 +2424,6 @@ metaZones:table(nofallback){
"9999-12-31 23:59",
}
}
"America:Shiprock"{
{
"America_Mountain",
}
}
"America:Sitka"{
{
"America_Pacific",
@ -2489,6 +2569,16 @@ metaZones:table(nofallback){
{
"Australia_Western",
"2012-02-21 17:00",
"2016-10-21 16:00",
}
{
"Casey",
"2016-10-21 16:00",
"2018-03-10 17:00",
}
{
"Australia_Western",
"2018-03-10 17:00",
"9999-12-31 23:59",
}
}
@ -2533,7 +2623,7 @@ metaZones:table(nofallback){
{
"Chile",
"1982-05-01 03:00",
"9999-12-31 23:59",
"2016-12-03 23:00",
}
}
"Antarctica:Rothera"{
@ -2546,6 +2636,11 @@ metaZones:table(nofallback){
"Syowa",
}
}
"Antarctica:Troll"{
{
"GMT",
}
}
"Antarctica:Vostok"{
{
"Vostok",
@ -2565,11 +2660,11 @@ metaZones:table(nofallback){
{
"Almaty",
"1970-01-01 00:00",
"2005-03-14 18:00",
"2004-10-30 20:00",
}
{
"Kazakhstan_Eastern",
"2005-03-14 18:00",
"2004-10-30 20:00",
"9999-12-31 23:59",
}
}
@ -2587,6 +2682,11 @@ metaZones:table(nofallback){
{
"Magadan",
"2010-03-27 14:00",
"2014-10-25 14:00",
}
{
"Anadyr",
"2014-10-25 14:00",
"9999-12-31 23:59",
}
}
@ -2599,11 +2699,11 @@ metaZones:table(nofallback){
{
"Aqtau",
"1991-12-15 19:00",
"2005-03-14 20:00",
"2004-10-30 22:00",
}
{
"Kazakhstan_Western",
"2005-03-14 20:00",
"2004-10-30 22:00",
"9999-12-31 23:59",
}
}
@ -2616,11 +2716,11 @@ metaZones:table(nofallback){
{
"Aqtobe",
"1991-12-15 19:00",
"2005-03-14 19:00",
"2004-10-30 21:00",
}
{
"Kazakhstan_Western",
"2005-03-14 19:00",
"2005-10-30 21:00",
"9999-12-31 23:59",
}
}
@ -2636,6 +2736,13 @@ metaZones:table(nofallback){
"9999-12-31 23:59",
}
}
"Asia:Atyrau"{
{
"Kazakhstan_Western",
"2004-10-30 22:00",
"9999-12-31 23:59",
}
}
"Asia:Baghdad"{
{
"Arabian",
@ -2697,6 +2804,23 @@ metaZones:table(nofallback){
"India",
}
}
"Asia:Chita"{
{
"Yakutsk",
"1970-01-01 00:00",
"2014-10-25 16:00",
}
{
"Irkutsk",
"2014-10-25 16:00",
"2016-03-26 18:00",
}
{
"Yakutsk",
"2016-03-26 18:00",
"9999-12-31 23:59",
}
}
"Asia:Choibalsan"{
{
"Mongolia",
@ -2709,18 +2833,6 @@ metaZones:table(nofallback){
"9999-12-31 23:59",
}
}
"Asia:Chongqing"{
{
"Long_Shu",
"1970-01-01 00:00",
"1980-04-30 17:00",
}
{
"China",
"1980-04-30 17:00",
"9999-12-31 23:59",
}
}
"Asia:Colombo"{
{
"India",
@ -2789,6 +2901,13 @@ metaZones:table(nofallback){
"9999-12-31 23:59",
}
}
"Asia:Famagusta"{
{
"Europe_Eastern",
"1970-01-01 00:00",
"2016-09-07 21:00",
}
}
"Asia:Gaza"{
{
"Israel",
@ -2801,18 +2920,6 @@ metaZones:table(nofallback){
"9999-12-31 23:59",
}
}
"Asia:Harbin"{
{
"Changbai",
"1970-01-01 00:00",
"1980-04-30 15:30",
}
{
"China",
"1980-04-30 15:30",
"9999-12-31 23:59",
}
}
"Asia:Hebron"{
{
"Israel",
@ -2863,13 +2970,6 @@ metaZones:table(nofallback){
"Asia:Kamchatka"{
{
"Kamchatka",
"1970-01-01 00:00",
"2010-03-27 14:00",
}
{
"Magadan",
"2010-03-27 14:00",
"9999-12-31 23:59",
}
}
"Asia:Karachi"{
@ -2884,23 +2984,28 @@ metaZones:table(nofallback){
"9999-12-31 23:59",
}
}
"Asia:Kashgar"{
{
"Kashgar",
"1970-01-01 00:00",
"1980-04-30 19:00",
}
{
"China",
"1980-04-30 19:00",
"9999-12-31 23:59",
}
}
"Asia:Katmandu"{
{
"Nepal",
}
}
"Asia:Khandyga"{
{
"Yakutsk",
"1970-01-01 00:00",
"2003-12-31 15:00",
}
{
"Vladivostok",
"2003-12-31 15:00",
"2011-09-12 13:00",
}
{
"Yakutsk",
"2011-09-12 13:00",
"9999-12-31 23:59",
}
}
"Asia:Krasnoyarsk"{
{
"Krasnoyarsk",
@ -2981,6 +3086,11 @@ metaZones:table(nofallback){
{
"Novosibirsk",
"2010-03-27 19:00",
"2014-10-25 19:00",
}
{
"Krasnoyarsk",
"2014-10-25 19:00",
"9999-12-31 23:59",
}
}
@ -3003,11 +3113,11 @@ metaZones:table(nofallback){
{
"Oral",
"1991-12-15 20:00",
"2005-03-14 20:00",
"2004-10-30 22:00",
}
{
"Kazakhstan_Western",
"2005-03-14 20:00",
"2004-10-30 22:00",
"9999-12-31 23:59",
}
}
@ -3031,6 +3141,18 @@ metaZones:table(nofallback){
"Asia:Pyongyang"{
{
"Korea",
"1970-01-01 00:00",
"2015-08-14 15:00",
}
{
"Pyongyang",
"2015-08-14 15:00",
"2018-05-04 15:00",
}
{
"Korea",
"2018-05-04 15:00",
"9999-12-31 23:59",
}
}
"Asia:Qatar"{
@ -3045,6 +3167,13 @@ metaZones:table(nofallback){
"9999-12-31 23:59",
}
}
"Asia:Qostanay"{
{
"Kazakhstan_Eastern",
"2004-10-30 21:00",
"9999-12-31 23:59",
}
}
"Asia:Qyzylorda"{
{
"Kizilorda",
@ -3054,11 +3183,16 @@ metaZones:table(nofallback){
{
"Qyzylorda",
"1991-12-15 19:00",
"2005-03-14 18:00",
"2004-10-30 21:00",
}
{
"Kazakhstan_Eastern",
"2005-03-14 18:00",
"2004-10-30 21:00",
"2018-12-20 18:00",
}
{
"Kazakhstan_Western",
"2018-12-20 18:00",
"9999-12-31 23:59",
}
}
@ -3075,6 +3209,8 @@ metaZones:table(nofallback){
"Asia:Saigon"{
{
"Indochina",
"1975-06-12 16:00",
"9999-12-31 23:59",
}
}
"Asia:Sakhalin"{
@ -3119,6 +3255,13 @@ metaZones:table(nofallback){
"Singapore",
}
}
"Asia:Srednekolymsk"{
{
"Magadan",
"1970-01-01 00:00",
"2014-10-25 14:00",
}
}
"Asia:Taipei"{
{
"Taipei",
@ -3178,12 +3321,22 @@ metaZones:table(nofallback){
"Asia:Urumqi"{
{
"Urumqi",
}
}
"Asia:Ust-Nera"{
{
"Yakutsk",
"1970-01-01 00:00",
"1980-04-30 18:00",
"1981-03-31 15:00",
}
{
"China",
"1980-04-30 18:00",
"Magadan",
"1981-03-31 15:00",
"2011-09-12 12:00",
}
{
"Vladivostok",
"2011-09-12 12:00",
"9999-12-31 23:59",
}
}
@ -3365,6 +3518,11 @@ metaZones:table(nofallback){
"America_Eastern",
}
}
"Etc:GMT"{
{
"GMT",
}
}
"Europe:Amsterdam"{
{
"Europe_Central",
@ -3375,6 +3533,13 @@ metaZones:table(nofallback){
"Europe_Central",
}
}
"Europe:Astrakhan"{
{
"Moscow",
"1992-03-28 22:00",
"2016-03-26 23:00",
}
}
"Europe:Athens"{
{
"Europe_Eastern",
@ -3410,6 +3575,11 @@ metaZones:table(nofallback){
"Europe_Central",
}
}
"Europe:Busingen"{
{
"Europe_Central",
}
}
"Europe:Chisinau"{
{
"Moscow",
@ -3487,6 +3657,11 @@ metaZones:table(nofallback){
{
"Europe_Eastern",
"1985-04-19 21:00",
"2016-09-06 21:00",
}
{
"Turkey",
"2016-09-06 21:00",
"9999-12-31 23:59",
}
}
@ -3506,23 +3681,33 @@ metaZones:table(nofallback){
{
"Moscow",
"1970-01-01 00:00",
"1991-03-30 23:00",
"1989-03-25 23:00",
}
{
"Europe_Eastern",
"1991-03-30 23:00",
"1989-03-25 23:00",
"2011-03-27 00:00",
}
{
"Europe_Further_Eastern",
"2011-03-27 00:00",
"2014-10-25 23:00",
}
{
"Europe_Eastern",
"2014-10-25 23:00",
"9999-12-31 23:59",
}
}
"Europe:Kiev"{
{
"Moscow",
"1970-01-01 00:00",
"1990-06-30 23:00",
"1990-06-30 22:00",
}
{
"Europe_Eastern",
"1990-06-30 23:00",
"1990-06-30 22:00",
"9999-12-31 23:59",
}
}
@ -3596,6 +3781,16 @@ metaZones:table(nofallback){
"1991-03-30 23:00",
"2011-03-27 00:00",
}
{
"Europe_Further_Eastern",
"2011-03-27 00:00",
"2014-10-26 22:00",
}
{
"Moscow",
"2014-10-26 22:00",
"9999-12-31 23:59",
}
}
"Europe:Monaco"{
{
@ -3660,16 +3855,21 @@ metaZones:table(nofallback){
{
"Kuybyshev",
"1970-01-01 00:00",
"1991-10-20 00:00",
}
{
"Samara",
"1991-10-20 00:00",
"2010-03-27 22:00",
"1989-03-25 22:00",
}
{
"Moscow",
"2010-03-27 22:00",
"1989-03-25 22:00",
"1991-03-30 23:00",
}
{
"Europe_Eastern",
"1991-03-30 23:00",
"1991-09-29 00:00",
}
{
"Samara",
"1991-09-29 00:00",
"9999-12-31 23:59",
}
}
@ -3683,6 +3883,13 @@ metaZones:table(nofallback){
"Europe_Central",
}
}
"Europe:Saratov"{
{
"Moscow",
"1992-03-28 22:00",
"2016-12-03 23:00",
}
}
"Europe:Simferopol"{
{
"Moscow",
@ -3702,6 +3909,11 @@ metaZones:table(nofallback){
{
"Europe_Eastern",
"1997-03-30 01:00",
"2014-03-30 00:00",
}
{
"Moscow",
"2014-03-30 00:00",
"9999-12-31 23:59",
}
}
@ -3737,6 +3949,13 @@ metaZones:table(nofallback){
"Europe_Central",
}
}
"Europe:Ulyanovsk"{
{
"Moscow",
"1992-01-19 00:00",
"2016-03-26 23:00",
}
}
"Europe:Uzhgorod"{
{
"Moscow",
@ -3773,11 +3992,11 @@ metaZones:table(nofallback){
{
"Moscow",
"1970-01-01 00:00",
"1991-03-30 23:00",
"1989-03-25 23:00",
}
{
"Europe_Eastern",
"1991-03-30 23:00",
"1989-03-25 23:00",
"1998-03-29 01:00",
}
{
@ -3794,6 +4013,18 @@ metaZones:table(nofallback){
"Europe:Volgograd"{
{
"Volgograd",
"1970-01-01 00:00",
"1992-03-28 22:00",
}
{
"Moscow",
"1992-03-28 22:00",
"2018-10-27 23:00",
}
{
"Volgograd",
"2018-10-27 23:00",
"9999-12-31 23:59",
}
}
"Europe:Warsaw"{
@ -3890,14 +4121,7 @@ metaZones:table(nofallback){
}
"Pacific:Apia"{
{
"Bering",
"1970-01-01 00:00",
"1983-10-30 12:00",
}
{
"Samoa",
"1983-10-30 12:00",
"9999-12-31 23:59",
"Apia",
}
}
"Pacific:Auckland"{
@ -3905,6 +4129,13 @@ metaZones:table(nofallback){
"New_Zealand",
}
}
"Pacific:Bougainville"{
{
"Papua_New_Guinea",
"1970-01-01 00:00",
"2014-12-27 16:00",
}
}
"Pacific:Chatham"{
{
"Chatham",
@ -4012,11 +4243,11 @@ metaZones:table(nofallback){
{
"Kwajalein",
"1970-01-01 00:00",
"1993-08-20 12:00",
"1993-08-21 12:00",
}
{
"Marshall_Islands",
"1993-08-20 12:00",
"1993-08-21 12:00",
"9999-12-31 23:59",
}
}
@ -4142,4 +4373,17 @@ metaZones:table(nofallback){
}
}
}
primaryZones{
CL{"America/Santiago"}
CN{"Asia/Shanghai"}
DE{"Europe/Berlin"}
EC{"America/Guayaquil"}
ES{"Europe/Madrid"}
MH{"Pacific/Majuro"}
MY{"Asia/Kuala_Lumpur"}
NZ{"Pacific/Auckland"}
PT{"Europe/Lisbon"}
UA{"Europe/Kiev"}
UZ{"Asia/Tashkent"}
}
}

70
icu4c/source/data/misc/timezoneTypes.txt
View file

@ -1,12 +1,15 @@
// ***************************************************************************
// *
// * 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
// *
// ***************************************************************************
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
timezoneTypes:table(nofallback){
bcpTypeAlias{
tz{
aqams{"nzakl"}
cnckg{"cnsha"}
cnhrb{"cnsha"}
cnkhg{"cnurc"}
usnavajo{"usden"}
}
}
typeAlias{
timezone{
"Africa:Asmara"{"Africa/Asmera"}
@ -26,12 +29,17 @@ timezoneTypes:table(nofallback){
"America:Knox_IN"{"America/Indiana/Knox"}
"America:Porto_Acre"{"America/Rio_Branco"}
"America:Rosario"{"America/Cordoba"}
"America:Shiprock"{"America/Denver"}
"America:Virgin"{"America/St_Thomas"}
"Antarctica:South_Pole"{"Pacific/Auckland"}
"Asia:Ashkhabad"{"Asia/Ashgabat"}
"Asia:Chungking"{"Asia/Chongqing"}
"Asia:Chongqing"{"Asia/Shanghai"}
"Asia:Chungking"{"Asia/Shanghai"}
"Asia:Dacca"{"Asia/Dhaka"}
"Asia:Harbin"{"Asia/Shanghai"}
"Asia:Ho_Chi_Minh"{"Asia/Saigon"}
"Asia:Istanbul"{"Europe/Istanbul"}
"Asia:Kashgar"{"Asia/Urumqi"}
"Asia:Kathmandu"{"Asia/Katmandu"}
"Asia:Kolkata"{"Asia/Calcutta"}
"Asia:Macao"{"Asia/Macau"}
@ -39,6 +47,7 @@ timezoneTypes:table(nofallback){
"Asia:Thimbu"{"Asia/Thimphu"}
"Asia:Ujung_Pandang"{"Asia/Makassar"}
"Asia:Ulan_Bator"{"Asia/Ulaanbaatar"}
"Asia:Yangon"{"Asia/Rangoon"}
"Atlantic:Faroe"{"Atlantic/Faeroe"}
"Atlantic:Jan_Mayen"{"Arctic/Longyearbyen"}
"Australia:ACT"{"Australia/Sydney"}
@ -71,10 +80,9 @@ timezoneTypes:table(nofallback){
"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"}
"Etc:UCT"{"Etc/UTC"}
"Etc:Universal"{"Etc/UTC"}
"Etc:Zulu"{"Etc/UTC"}
"Europe:Belfast"{"Europe/London"}
"Europe:Nicosia"{"Asia/Nicosia"}
"Europe:Tiraspol"{"Europe/Chisinau"}
@ -121,7 +129,7 @@ timezoneTypes:table(nofallback){
MST{"Etc/GMT+7"}
NZ{"Pacific/Auckland"}
NZ-CHAT{"Pacific/Chatham"}
Navajo{"America/Shiprock"}
Navajo{"America/Denver"}
PRC{"Asia/Shanghai"}
Poland{"Europe/Warsaw"}
Portugal{"Europe/Lisbon"}
@ -129,11 +137,11 @@ timezoneTypes:table(nofallback){
ROK{"Asia/Seoul"}
Singapore{"Asia/Singapore"}
Turkey{"Europe/Istanbul"}
UCT{"Etc/GMT"}
UTC{"Etc/GMT"}
Universal{"Etc/GMT"}
UCT{"Etc/UTC"}
UTC{"Etc/UTC"}
Universal{"Etc/UTC"}
W-SU{"Europe/Moscow"}
Zulu{"Etc/GMT"}
Zulu{"Etc/UTC"}
}
}
typeMap{
@ -238,6 +246,7 @@ timezoneTypes:table(nofallback){
"America:Edmonton"{"caedm"}
"America:Eirunepe"{"brern"}
"America:El_Salvador"{"svsal"}
"America:Fort_Nelson"{"cafne"}
"America:Fortaleza"{"brfor"}
"America:Glace_Bay"{"caglb"}
"America:Godthab"{"glgoh"}
@ -306,6 +315,7 @@ timezoneTypes:table(nofallback){
"America:Port_of_Spain"{"ttpos"}
"America:Porto_Velho"{"brpvh"}
"America:Puerto_Rico"{"prsju"}
"America:Punta_Arenas"{"clpuq"}
"America:Rainy_River"{"caffs"}
"America:Rankin_Inlet"{"cayek"}
"America:Recife"{"brrec"}
@ -318,7 +328,6 @@ timezoneTypes:table(nofallback){
"America:Santo_Domingo"{"dosdq"}
"America:Sao_Paulo"{"brsao"}
"America:Scoresbysund"{"globy"}
"America:Shiprock"{"usnavajo"}
"America:Sitka"{"ussit"}
"America:St_Barthelemy"{"gpsbh"}
"America:St_Johns"{"casjf"}
@ -346,8 +355,8 @@ timezoneTypes:table(nofallback){
"Antarctica:McMurdo"{"aqmcm"}
"Antarctica:Palmer"{"aqplm"}
"Antarctica:Rothera"{"aqrot"}
"Antarctica:South_Pole"{"aqams"}
"Antarctica:Syowa"{"aqsyw"}
"Antarctica:Troll"{"aqtrl"}
"Antarctica:Vostok"{"aqvos"}
"Arctic:Longyearbyen"{"sjlyr"}
"Asia:Aden"{"yeade"}
@ -357,24 +366,26 @@ timezoneTypes:table(nofallback){
"Asia:Aqtau"{"kzaau"}
"Asia:Aqtobe"{"kzakx"}
"Asia:Ashgabat"{"tmasb"}
"Asia:Atyrau"{"kzguw"}
"Asia:Baghdad"{"iqbgw"}
"Asia:Bahrain"{"bhbah"}
"Asia:Baku"{"azbak"}
"Asia:Bangkok"{"thbkk"}
"Asia:Barnaul"{"rubax"}
"Asia:Beirut"{"lbbey"}
"Asia:Bishkek"{"kgfru"}
"Asia:Brunei"{"bnbwn"}
"Asia:Calcutta"{"inccu"}
"Asia:Chita"{"ruchita"}
"Asia:Choibalsan"{"mncoq"}
"Asia:Chongqing"{"cnckg"}
"Asia:Colombo"{"lkcmb"}
"Asia:Damascus"{"sydam"}
"Asia:Dhaka"{"bddac"}
"Asia:Dili"{"tldil"}
"Asia:Dubai"{"aedxb"}
"Asia:Dushanbe"{"tjdyu"}
"Asia:Famagusta"{"cyfmg"}
"Asia:Gaza"{"gaza"}
"Asia:Harbin"{"cnhrb"}
"Asia:Hebron"{"hebron"}
"Asia:Hong_Kong"{"hkhkg"}
"Asia:Hovd"{"mnhvd"}
@ -385,8 +396,8 @@ timezoneTypes:table(nofallback){
"Asia:Kabul"{"afkbl"}
"Asia:Kamchatka"{"rupkc"}
"Asia:Karachi"{"pkkhi"}
"Asia:Kashgar"{"cnkhg"}
"Asia:Katmandu"{"npktm"}
"Asia:Khandyga"{"rukhndg"}
"Asia:Krasnoyarsk"{"rukra"}
"Asia:Kuala_Lumpur"{"mykul"}
"Asia:Kuching"{"mykch"}
@ -405,6 +416,7 @@ timezoneTypes:table(nofallback){
"Asia:Pontianak"{"idpnk"}
"Asia:Pyongyang"{"kpfnj"}
"Asia:Qatar"{"qadoh"}
"Asia:Qostanay"{"kzksn"}
"Asia:Qyzylorda"{"kzkzo"}
"Asia:Rangoon"{"mmrgn"}
"Asia:Riyadh"{"saruh"}
@ -414,14 +426,17 @@ timezoneTypes:table(nofallback){
"Asia:Seoul"{"krsel"}
"Asia:Shanghai"{"cnsha"}
"Asia:Singapore"{"sgsin"}
"Asia:Srednekolymsk"{"rusred"}
"Asia:Taipei"{"twtpe"}
"Asia:Tashkent"{"uztas"}
"Asia:Tbilisi"{"getbs"}
"Asia:Tehran"{"irthr"}
"Asia:Thimphu"{"btthi"}
"Asia:Tokyo"{"jptyo"}
"Asia:Tomsk"{"rutof"}
"Asia:Ulaanbaatar"{"mnuln"}
"Asia:Urumqi"{"cnurc"}
"Asia:Ust-Nera"{"ruunera"}
"Asia:Vientiane"{"lavte"}
"Asia:Vladivostok"{"ruvvo"}
"Asia:Yakutsk"{"ruyks"}
@ -449,7 +464,7 @@ timezoneTypes:table(nofallback){
"Australia:Melbourne"{"aumel"}
"Australia:Perth"{"auper"}
"Australia:Sydney"{"ausyd"}
"Etc:GMT"{"utc"}
"Etc:GMT"{"gmt"}
"Etc:GMT+1"{"utcw01"}
"Etc:GMT+10"{"utcw10"}
"Etc:GMT+11"{"utcw11"}
@ -476,9 +491,11 @@ timezoneTypes:table(nofallback){
"Etc:GMT-7"{"utce07"}
"Etc:GMT-8"{"utce08"}
"Etc:GMT-9"{"utce09"}
"Etc:UTC"{"utc"}
"Etc:Unknown"{"unk"}
"Europe:Amsterdam"{"nlams"}
"Europe:Andorra"{"adalv"}
"Europe:Astrakhan"{"ruasf"}
"Europe:Athens"{"grath"}
"Europe:Belgrade"{"rsbeg"}
"Europe:Berlin"{"deber"}
@ -486,6 +503,7 @@ timezoneTypes:table(nofallback){
"Europe:Brussels"{"bebru"}
"Europe:Bucharest"{"robuh"}
"Europe:Budapest"{"hubud"}
"Europe:Busingen"{"debsngn"}
"Europe:Chisinau"{"mdkiv"}
"Europe:Copenhagen"{"dkcph"}
"Europe:Dublin"{"iedub"}
@ -497,6 +515,7 @@ timezoneTypes:table(nofallback){
"Europe:Jersey"{"jesth"}
"Europe:Kaliningrad"{"rukgd"}
"Europe:Kiev"{"uaiev"}
"Europe:Kirov"{"rukvx"}
"Europe:Lisbon"{"ptlis"}
"Europe:Ljubljana"{"silju"}
"Europe:London"{"gblon"}
@ -516,12 +535,14 @@ timezoneTypes:table(nofallback){
"Europe:Samara"{"rukuf"}
"Europe:San_Marino"{"smsai"}
"Europe:Sarajevo"{"basjj"}
"Europe:Saratov"{"rurtw"}
"Europe:Simferopol"{"uasip"}
"Europe:Skopje"{"mkskp"}
"Europe:Sofia"{"bgsof"}
"Europe:Stockholm"{"sesto"}
"Europe:Tallinn"{"eetll"}
"Europe:Tirane"{"altia"}
"Europe:Ulyanovsk"{"ruuly"}
"Europe:Uzhgorod"{"uauzh"}
"Europe:Vaduz"{"livdz"}
"Europe:Vatican"{"vavat"}
@ -545,6 +566,7 @@ timezoneTypes:table(nofallback){
"Indian:Reunion"{"rereu"}
"Pacific:Apia"{"wsapw"}
"Pacific:Auckland"{"nzakl"}
"Pacific:Bougainville"{"pgraw"}
"Pacific:Chatham"{"nzcht"}
"Pacific:Easter"{"clipc"}
"Pacific:Efate"{"vuvli"}

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

@ -1,309 +1,808 @@
// ***************************************************************************
// *
// * 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
// *
// ***************************************************************************
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html#License
windowsZones:table(nofallback){
mapTimezones{
AUS Central Standard Time{
"AUS Central Standard Time"{
001{"Australia/Darwin"}
AU{"Australia/Darwin"}
}
AUS Eastern Standard Time{
"AUS Eastern Standard Time"{
001{"Australia/Sydney"}
AU{"Australia/Sydney Australia/Melbourne"}
}
Afghanistan Standard Time{
"Afghanistan Standard Time"{
001{"Asia/Kabul"}
AF{"Asia/Kabul"}
}
Alaskan Standard Time{
"Alaskan Standard Time"{
001{"America/Anchorage"}
US{
"America/Anchorage America/Juneau America/Nome America/Sitka America/"
"Yakutat"
}
}
Arab Standard Time{
"Aleutian Standard Time"{
001{"America/Adak"}
US{"America/Adak"}
}
"Altai Standard Time"{
001{"Asia/Barnaul"}
RU{"Asia/Barnaul"}
}
"Arab Standard Time"{
001{"Asia/Riyadh"}
BH{"Asia/Bahrain"}
KW{"Asia/Kuwait"}
QA{"Asia/Qatar"}
SA{"Asia/Riyadh"}
YE{"Asia/Aden"}
}
Arabian Standard Time{
"Arabian Standard Time"{
001{"Asia/Dubai"}
AE{"Asia/Dubai"}
OM{"Asia/Muscat"}
ZZ{"Etc/GMT-4"}
}
Arabic Standard Time{
"Arabic Standard Time"{
001{"Asia/Baghdad"}
IQ{"Asia/Baghdad"}
}
Argentina Standard Time{
"Argentina Standard Time"{
001{"America/Buenos_Aires"}
AR{
"America/Buenos_Aires America/Argentina/La_Rioja America/Argentina/Ri"
"o_Gallegos America/Argentina/Salta America/Argentina/San_Juan Americ"
"a/Argentina/San_Luis America/Argentina/Tucuman America/Argentina/Ush"
"uaia America/Catamarca America/Cordoba America/Jujuy America/Mendoza"
}
}
Atlantic Standard Time{
"Astrakhan Standard Time"{
001{"Europe/Astrakhan"}
RU{"Europe/Astrakhan Europe/Ulyanovsk"}
}
"Atlantic Standard Time"{
001{"America/Halifax"}
BM{"Atlantic/Bermuda"}
CA{"America/Halifax America/Glace_Bay America/Goose_Bay America/Moncton"}
GL{"America/Thule"}
}
Azerbaijan Standard Time{
"Aus Central W. Standard Time"{
001{"Australia/Eucla"}
AU{"Australia/Eucla"}
}
"Azerbaijan Standard Time"{
001{"Asia/Baku"}
AZ{"Asia/Baku"}
}
Azores Standard Time{
"Azores Standard Time"{
001{"Atlantic/Azores"}
GL{"America/Scoresbysund"}
PT{"Atlantic/Azores"}
}
Bahia Standard Time{
"Bahia Standard Time"{
001{"America/Bahia"}
BR{"America/Bahia"}
}
Bangladesh Standard Time{
"Bangladesh Standard Time"{
001{"Asia/Dhaka"}
BD{"Asia/Dhaka"}
BT{"Asia/Thimphu"}
}
Canada Central Standard Time{
"Belarus Standard Time"{
001{"Europe/Minsk"}
BY{"Europe/Minsk"}
}
"Bougainville Standard Time"{
001{"Pacific/Bougainville"}
PG{"Pacific/Bougainville"}
}
"Canada Central Standard Time"{
001{"America/Regina"}
CA{"America/Regina America/Swift_Current"}
}
Cape Verde Standard Time{
"Cape Verde Standard Time"{
001{"Atlantic/Cape_Verde"}
CV{"Atlantic/Cape_Verde"}
ZZ{"Etc/GMT+1"}
}
Caucasus Standard Time{
"Caucasus Standard Time"{
001{"Asia/Yerevan"}
AM{"Asia/Yerevan"}
}
Cen. Australia Standard Time{
"Cen. Australia Standard Time"{
001{"Australia/Adelaide"}
AU{"Australia/Adelaide Australia/Broken_Hill"}
}
Central America Standard Time{
"Central America Standard Time"{
001{"America/Guatemala"}
BZ{"America/Belize"}
CR{"America/Costa_Rica"}
EC{"Pacific/Galapagos"}
GT{"America/Guatemala"}
HN{"America/Tegucigalpa"}
NI{"America/Managua"}
SV{"America/El_Salvador"}
ZZ{"Etc/GMT+6"}
}
Central Asia Standard Time{
"Central Asia Standard Time"{
001{"Asia/Almaty"}
AQ{"Antarctica/Vostok"}
CN{"Asia/Urumqi"}
IO{"Indian/Chagos"}
KG{"Asia/Bishkek"}
KZ{"Asia/Almaty Asia/Qostanay"}
ZZ{"Etc/GMT-6"}
}
Central Brazilian Standard Time{
"Central Brazilian Standard Time"{
001{"America/Cuiaba"}
BR{"America/Cuiaba America/Campo_Grande"}
}
Central Europe Standard Time{
"Central Europe Standard Time"{
001{"Europe/Budapest"}
AL{"Europe/Tirane"}
CZ{"Europe/Prague"}
HU{"Europe/Budapest"}
ME{"Europe/Podgorica"}
RS{"Europe/Belgrade"}
SI{"Europe/Ljubljana"}
SK{"Europe/Bratislava"}
}
Central European Standard Time{
"Central European Standard Time"{
001{"Europe/Warsaw"}
BA{"Europe/Sarajevo"}
HR{"Europe/Zagreb"}
MK{"Europe/Skopje"}
PL{"Europe/Warsaw"}
}
Central Pacific Standard Time{
"Central Pacific Standard Time"{
001{"Pacific/Guadalcanal"}
AU{"Antarctica/Macquarie"}
FM{"Pacific/Ponape Pacific/Kosrae"}
NC{"Pacific/Noumea"}
SB{"Pacific/Guadalcanal"}
VU{"Pacific/Efate"}
ZZ{"Etc/GMT-11"}
}
Central Standard Time{
001{"America/Chicago"}
}
Central Standard Time (Mexico){
"Central Standard Time (Mexico)"{
001{"America/Mexico_City"}
MX{
"America/Mexico_City America/Bahia_Banderas America/Merida America/Mo"
"nterrey"
}
}
China Standard Time{
"Central Standard Time"{
001{"America/Chicago"}
CA{
"America/Winnipeg America/Rainy_River America/Rankin_Inlet America/Re"
"solute"
}
MX{"America/Matamoros"}
US{
"America/Chicago America/Indiana/Knox America/Indiana/Tell_City Ameri"
"ca/Menominee America/North_Dakota/Beulah America/North_Dakota/Center"
" America/North_Dakota/New_Salem"
}
ZZ{"CST6CDT"}
}
"Chatham Islands Standard Time"{
001{"Pacific/Chatham"}
NZ{"Pacific/Chatham"}
}
"China Standard Time"{
001{"Asia/Shanghai"}
CN{"Asia/Shanghai"}
HK{"Asia/Hong_Kong"}
MO{"Asia/Macau"}
}
Dateline Standard Time{
"Cuba Standard Time"{
001{"America/Havana"}
CU{"America/Havana"}
}
"Dateline Standard Time"{
001{"Etc/GMT+12"}
ZZ{"Etc/GMT+12"}
}
E. Africa Standard Time{
"E. Africa Standard Time"{
001{"Africa/Nairobi"}
AQ{"Antarctica/Syowa"}
DJ{"Africa/Djibouti"}
ER{"Africa/Asmera"}
ET{"Africa/Addis_Ababa"}
KE{"Africa/Nairobi"}
KM{"Indian/Comoro"}
MG{"Indian/Antananarivo"}
SO{"Africa/Mogadishu"}
SS{"Africa/Juba"}
TZ{"Africa/Dar_es_Salaam"}
UG{"Africa/Kampala"}
YT{"Indian/Mayotte"}
ZZ{"Etc/GMT-3"}
}
E. Australia Standard Time{
"E. Australia Standard Time"{
001{"Australia/Brisbane"}
AU{"Australia/Brisbane Australia/Lindeman"}
}
E. Europe Standard Time{
001{"Asia/Nicosia"}
"E. Europe Standard Time"{
001{"Europe/Chisinau"}
MD{"Europe/Chisinau"}
}
E. South America Standard Time{
"E. South America Standard Time"{
001{"America/Sao_Paulo"}
BR{"America/Sao_Paulo"}
}
Eastern Standard Time{
"Easter Island Standard Time"{
001{"Pacific/Easter"}
CL{"Pacific/Easter"}
}
"Eastern Standard Time (Mexico)"{
001{"America/Cancun"}
MX{"America/Cancun"}
}
"Eastern Standard Time"{
001{"America/New_York"}
BS{"America/Nassau"}
CA{
"America/Toronto America/Iqaluit America/Montreal America/Nipigon Ame"
"rica/Pangnirtung America/Thunder_Bay"
}
US{
"America/New_York America/Detroit America/Indiana/Petersburg America/"
"Indiana/Vincennes America/Indiana/Winamac America/Kentucky/Monticell"
"o America/Louisville"
}
ZZ{"EST5EDT"}
}
Egypt Standard Time{
"Egypt Standard Time"{
001{"Africa/Cairo"}
EG{"Africa/Cairo"}
}
Ekaterinburg Standard Time{
"Ekaterinburg Standard Time"{
001{"Asia/Yekaterinburg"}
RU{"Asia/Yekaterinburg"}
}
FLE Standard Time{
"FLE Standard Time"{
001{"Europe/Kiev"}
AX{"Europe/Mariehamn"}
BG{"Europe/Sofia"}
EE{"Europe/Tallinn"}
FI{"Europe/Helsinki"}
LT{"Europe/Vilnius"}
LV{"Europe/Riga"}
UA{"Europe/Kiev Europe/Uzhgorod Europe/Zaporozhye"}
}
Fiji Standard Time{
"Fiji Standard Time"{
001{"Pacific/Fiji"}
FJ{"Pacific/Fiji"}
}
GMT Standard Time{
"GMT Standard Time"{
001{"Europe/London"}
ES{"Atlantic/Canary"}
FO{"Atlantic/Faeroe"}
GB{"Europe/London"}
GG{"Europe/Guernsey"}
IE{"Europe/Dublin"}
IM{"Europe/Isle_of_Man"}
JE{"Europe/Jersey"}
PT{"Europe/Lisbon Atlantic/Madeira"}
}
GTB Standard Time{
"GTB Standard Time"{
001{"Europe/Bucharest"}
CY{"Asia/Famagusta Asia/Nicosia"}
GR{"Europe/Athens"}
RO{"Europe/Bucharest"}
}
Georgian Standard Time{
"Georgian Standard Time"{
001{"Asia/Tbilisi"}
GE{"Asia/Tbilisi"}
}
Greenland Standard Time{
"Greenland Standard Time"{
001{"America/Godthab"}
GL{"America/Godthab"}
}
Greenwich Standard Time{
"Greenwich Standard Time"{
001{"Atlantic/Reykjavik"}
BF{"Africa/Ouagadougou"}
CI{"Africa/Abidjan"}
GH{"Africa/Accra"}
GM{"Africa/Banjul"}
GN{"Africa/Conakry"}
GW{"Africa/Bissau"}
IS{"Atlantic/Reykjavik"}
LR{"Africa/Monrovia"}
ML{"Africa/Bamako"}
MR{"Africa/Nouakchott"}
SH{"Atlantic/St_Helena"}
SL{"Africa/Freetown"}
SN{"Africa/Dakar"}
TG{"Africa/Lome"}
}
Hawaiian Standard Time{
"Haiti Standard Time"{
001{"America/Port-au-Prince"}
HT{"America/Port-au-Prince"}
}
"Hawaiian Standard Time"{
001{"Pacific/Honolulu"}
CK{"Pacific/Rarotonga"}
PF{"Pacific/Tahiti"}
UM{"Pacific/Johnston"}
US{"Pacific/Honolulu"}
ZZ{"Etc/GMT+10"}
}
India Standard Time{
"India Standard Time"{
001{"Asia/Calcutta"}
IN{"Asia/Calcutta"}
}
Iran Standard Time{
"Iran Standard Time"{
001{"Asia/Tehran"}
IR{"Asia/Tehran"}
}
Israel Standard Time{
"Israel Standard Time"{
001{"Asia/Jerusalem"}
IL{"Asia/Jerusalem"}
}
Jordan Standard Time{
"Jordan Standard Time"{
001{"Asia/Amman"}
JO{"Asia/Amman"}
}
Kaliningrad Standard Time{
"Kaliningrad Standard Time"{
001{"Europe/Kaliningrad"}
RU{"Europe/Kaliningrad"}
}
Korea Standard Time{
"Korea Standard Time"{
001{"Asia/Seoul"}
KR{"Asia/Seoul"}
}
Magadan Standard Time{
"Libya Standard Time"{
001{"Africa/Tripoli"}
LY{"Africa/Tripoli"}
}
"Line Islands Standard Time"{
001{"Pacific/Kiritimati"}
KI{"Pacific/Kiritimati"}
ZZ{"Etc/GMT-14"}
}
"Lord Howe Standard Time"{
001{"Australia/Lord_Howe"}
AU{"Australia/Lord_Howe"}
}
"Magadan Standard Time"{
001{"Asia/Magadan"}
RU{"Asia/Magadan"}
}
Mauritius Standard Time{
"Magallanes Standard Time"{
001{"America/Punta_Arenas"}
AQ{"Antarctica/Palmer"}
CL{"America/Punta_Arenas"}
}
"Marquesas Standard Time"{
001{"Pacific/Marquesas"}
PF{"Pacific/Marquesas"}
}
"Mauritius Standard Time"{
001{"Indian/Mauritius"}
MU{"Indian/Mauritius"}
RE{"Indian/Reunion"}
SC{"Indian/Mahe"}
}
Middle East Standard Time{
"Middle East Standard Time"{
001{"Asia/Beirut"}
LB{"Asia/Beirut"}
}
Montevideo Standard Time{
"Montevideo Standard Time"{
001{"America/Montevideo"}
UY{"America/Montevideo"}
}
Morocco Standard Time{
"Morocco Standard Time"{
001{"Africa/Casablanca"}
EH{"Africa/El_Aaiun"}
MA{"Africa/Casablanca"}
}
Mountain Standard Time{
001{"America/Denver"}
}
Mountain Standard Time (Mexico){
"Mountain Standard Time (Mexico)"{
001{"America/Chihuahua"}
MX{"America/Chihuahua America/Mazatlan"}
}
Myanmar Standard Time{
"Mountain Standard Time"{
001{"America/Denver"}
CA{
"America/Edmonton America/Cambridge_Bay America/Inuvik America/Yellow"
"knife"
}
MX{"America/Ojinaga"}
US{"America/Denver America/Boise"}
ZZ{"MST7MDT"}
}
"Myanmar Standard Time"{
001{"Asia/Rangoon"}
CC{"Indian/Cocos"}
MM{"Asia/Rangoon"}
}
N. Central Asia Standard Time{
"N. Central Asia Standard Time"{
001{"Asia/Novosibirsk"}
RU{"Asia/Novosibirsk"}
}
Namibia Standard Time{
"Namibia Standard Time"{
001{"Africa/Windhoek"}
NA{"Africa/Windhoek"}
}
Nepal Standard Time{
"Nepal Standard Time"{
001{"Asia/Katmandu"}
NP{"Asia/Katmandu"}
}
New Zealand Standard Time{
"New Zealand Standard Time"{
001{"Pacific/Auckland"}
AQ{"Antarctica/McMurdo"}
NZ{"Pacific/Auckland"}
}
Newfoundland Standard Time{
"Newfoundland Standard Time"{
001{"America/St_Johns"}
CA{"America/St_Johns"}
}
North Asia East Standard Time{
"Norfolk Standard Time"{
001{"Pacific/Norfolk"}
NF{"Pacific/Norfolk"}
}
"North Asia East Standard Time"{
001{"Asia/Irkutsk"}
RU{"Asia/Irkutsk"}
}
North Asia Standard Time{
"North Asia Standard Time"{
001{"Asia/Krasnoyarsk"}
RU{"Asia/Krasnoyarsk Asia/Novokuznetsk"}
}
Pacific SA Standard Time{
"North Korea Standard Time"{
001{"Asia/Pyongyang"}
KP{"Asia/Pyongyang"}
}
"Omsk Standard Time"{
001{"Asia/Omsk"}
RU{"Asia/Omsk"}
}
"Pacific SA Standard Time"{
001{"America/Santiago"}
CL{"America/Santiago"}
}
Pacific Standard Time{
"Pacific Standard Time (Mexico)"{
001{"America/Tijuana"}
MX{"America/Tijuana America/Santa_Isabel"}
}
"Pacific Standard Time"{
001{"America/Los_Angeles"}
CA{"America/Vancouver America/Dawson America/Whitehorse"}
US{"America/Los_Angeles America/Metlakatla"}
ZZ{"PST8PDT"}
}
Pacific Standard Time (Mexico){
001{"America/Santa_Isabel"}
}
Pakistan Standard Time{
"Pakistan Standard Time"{
001{"Asia/Karachi"}
PK{"Asia/Karachi"}
}
Paraguay Standard Time{
"Paraguay Standard Time"{
001{"America/Asuncion"}
PY{"America/Asuncion"}
}
Romance Standard Time{
"Romance Standard Time"{
001{"Europe/Paris"}
BE{"Europe/Brussels"}
DK{"Europe/Copenhagen"}
ES{"Europe/Madrid Africa/Ceuta"}
FR{"Europe/Paris"}
}
Russian Standard Time{
"Russia Time Zone 10"{
001{"Asia/Srednekolymsk"}
RU{"Asia/Srednekolymsk"}
}
"Russia Time Zone 11"{
001{"Asia/Kamchatka"}
RU{"Asia/Kamchatka Asia/Anadyr"}
}
"Russia Time Zone 3"{
001{"Europe/Samara"}
RU{"Europe/Samara"}
}
"Russian Standard Time"{
001{"Europe/Moscow"}
RU{"Europe/Moscow Europe/Kirov Europe/Volgograd"}
UA{"Europe/Simferopol"}
}
SA Eastern Standard Time{
"SA Eastern Standard Time"{
001{"America/Cayenne"}
AQ{"Antarctica/Rothera"}
BR{
"America/Fortaleza America/Belem America/Maceio America/Recife Americ"
"a/Santarem"
}
FK{"Atlantic/Stanley"}
GF{"America/Cayenne"}
SR{"America/Paramaribo"}
ZZ{"Etc/GMT+3"}
}
SA Pacific Standard Time{
"SA Pacific Standard Time"{
001{"America/Bogota"}
BR{"America/Rio_Branco America/Eirunepe"}
CA{"America/Coral_Harbour"}
CO{"America/Bogota"}
EC{"America/Guayaquil"}
JM{"America/Jamaica"}
KY{"America/Cayman"}
PA{"America/Panama"}
PE{"America/Lima"}
ZZ{"Etc/GMT+5"}
}
SA Western Standard Time{
"SA Western Standard Time"{
001{"America/La_Paz"}
AG{"America/Antigua"}
AI{"America/Anguilla"}
AW{"America/Aruba"}
BB{"America/Barbados"}
BL{"America/St_Barthelemy"}
BO{"America/La_Paz"}
BQ{"America/Kralendijk"}
BR{"America/Manaus America/Boa_Vista America/Porto_Velho"}
CA{"America/Blanc-Sablon"}
CW{"America/Curacao"}
DM{"America/Dominica"}
DO{"America/Santo_Domingo"}
GD{"America/Grenada"}
GP{"America/Guadeloupe"}
GY{"America/Guyana"}
KN{"America/St_Kitts"}
LC{"America/St_Lucia"}
MF{"America/Marigot"}
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"}
VI{"America/St_Thomas"}
ZZ{"Etc/GMT+4"}
}
SE Asia Standard Time{
"SE Asia Standard Time"{
001{"Asia/Bangkok"}
AQ{"Antarctica/Davis"}
CX{"Indian/Christmas"}
ID{"Asia/Jakarta Asia/Pontianak"}
KH{"Asia/Phnom_Penh"}
LA{"Asia/Vientiane"}
TH{"Asia/Bangkok"}
VN{"Asia/Saigon"}
ZZ{"Etc/GMT-7"}
}
Samoa Standard Time{
"Saint Pierre Standard Time"{
001{"America/Miquelon"}
PM{"America/Miquelon"}
}
"Sakhalin Standard Time"{
001{"Asia/Sakhalin"}
RU{"Asia/Sakhalin"}
}
"Samoa Standard Time"{
001{"Pacific/Apia"}
WS{"Pacific/Apia"}
}
Singapore Standard Time{
"Sao Tome Standard Time"{
001{"Africa/Sao_Tome"}
ST{"Africa/Sao_Tome"}
}
"Saratov Standard Time"{
001{"Europe/Saratov"}
RU{"Europe/Saratov"}
}
"Singapore Standard Time"{
001{"Asia/Singapore"}
BN{"Asia/Brunei"}
ID{"Asia/Makassar"}
MY{"Asia/Kuala_Lumpur Asia/Kuching"}
PH{"Asia/Manila"}
SG{"Asia/Singapore"}
ZZ{"Etc/GMT-8"}
}
South Africa Standard Time{
"South Africa Standard Time"{
001{"Africa/Johannesburg"}
BI{"Africa/Bujumbura"}
BW{"Africa/Gaborone"}
CD{"Africa/Lubumbashi"}
LS{"Africa/Maseru"}
MW{"Africa/Blantyre"}
MZ{"Africa/Maputo"}
RW{"Africa/Kigali"}
SZ{"Africa/Mbabane"}
ZA{"Africa/Johannesburg"}
ZM{"Africa/Lusaka"}
ZW{"Africa/Harare"}
ZZ{"Etc/GMT-2"}
}
Sri Lanka Standard Time{
"Sri Lanka Standard Time"{
001{"Asia/Colombo"}
LK{"Asia/Colombo"}
}
Syria Standard Time{
"Sudan Standard Time"{
001{"Africa/Khartoum"}
SD{"Africa/Khartoum"}
}
"Syria Standard Time"{
001{"Asia/Damascus"}
SY{"Asia/Damascus"}
}
Taipei Standard Time{
"Taipei Standard Time"{
001{"Asia/Taipei"}
TW{"Asia/Taipei"}
}
Tasmania Standard Time{
"Tasmania Standard Time"{
001{"Australia/Hobart"}
AU{"Australia/Hobart Australia/Currie"}
}
Tokyo Standard Time{
"Tocantins Standard Time"{
001{"America/Araguaina"}
BR{"America/Araguaina"}
}
"Tokyo Standard Time"{
001{"Asia/Tokyo"}
ID{"Asia/Jayapura"}
JP{"Asia/Tokyo"}
PW{"Pacific/Palau"}
TL{"Asia/Dili"}
ZZ{"Etc/GMT-9"}
}
Tonga Standard Time{
"Tomsk Standard Time"{
001{"Asia/Tomsk"}
RU{"Asia/Tomsk"}
}
"Tonga Standard Time"{
001{"Pacific/Tongatapu"}
TO{"Pacific/Tongatapu"}
}
Turkey Standard Time{
"Transbaikal Standard Time"{
001{"Asia/Chita"}
RU{"Asia/Chita"}
}
"Turkey Standard Time"{
001{"Europe/Istanbul"}
TR{"Europe/Istanbul"}
}
US Eastern Standard Time{
"Turks And Caicos Standard Time"{
001{"America/Grand_Turk"}
TC{"America/Grand_Turk"}
}
"US Eastern Standard Time"{
001{"America/Indianapolis"}
US{"America/Indianapolis America/Indiana/Marengo America/Indiana/Vevay"}
}
US Mountain Standard Time{
"US Mountain Standard Time"{
001{"America/Phoenix"}
CA{"America/Dawson_Creek America/Creston America/Fort_Nelson"}
MX{"America/Hermosillo"}
US{"America/Phoenix"}
ZZ{"Etc/GMT+7"}
}
UTC{
"UTC"{
001{"Etc/GMT"}
GL{"America/Danmarkshavn"}
ZZ{"Etc/GMT Etc/UTC"}
}
UTC+12{
"UTC+12"{
001{"Etc/GMT-12"}
KI{"Pacific/Tarawa"}
MH{"Pacific/Majuro Pacific/Kwajalein"}
NR{"Pacific/Nauru"}
TV{"Pacific/Funafuti"}
UM{"Pacific/Wake"}
WF{"Pacific/Wallis"}
ZZ{"Etc/GMT-12"}
}
UTC-02{
"UTC+13"{
001{"Etc/GMT-13"}
KI{"Pacific/Enderbury"}
TK{"Pacific/Fakaofo"}
ZZ{"Etc/GMT-13"}
}
"UTC-02"{
001{"Etc/GMT+2"}
BR{"America/Noronha"}
GS{"Atlantic/South_Georgia"}
ZZ{"Etc/GMT+2"}
}
UTC-11{
"UTC-08"{
001{"Etc/GMT+8"}
PN{"Pacific/Pitcairn"}
ZZ{"Etc/GMT+8"}
}
"UTC-09"{
001{"Etc/GMT+9"}
PF{"Pacific/Gambier"}
ZZ{"Etc/GMT+9"}
}
"UTC-11"{
001{"Etc/GMT+11"}
AS{"Pacific/Pago_Pago"}
NU{"Pacific/Niue"}
UM{"Pacific/Midway"}
ZZ{"Etc/GMT+11"}
}
Ulaanbaatar Standard Time{
"Ulaanbaatar Standard Time"{
001{"Asia/Ulaanbaatar"}
MN{"Asia/Ulaanbaatar Asia/Choibalsan"}
}
Venezuela Standard Time{
"Venezuela Standard Time"{
001{"America/Caracas"}
VE{"America/Caracas"}
}
Vladivostok Standard Time{
"Vladivostok Standard Time"{
001{"Asia/Vladivostok"}
RU{"Asia/Vladivostok Asia/Ust-Nera"}
}
W. Australia Standard Time{
"W. Australia Standard Time"{
001{"Australia/Perth"}
AQ{"Antarctica/Casey"}
AU{"Australia/Perth"}
}
W. Central Africa Standard Time{
"W. Central Africa Standard Time"{
001{"Africa/Lagos"}
AO{"Africa/Luanda"}
BJ{"Africa/Porto-Novo"}
CD{"Africa/Kinshasa"}
CF{"Africa/Bangui"}
CG{"Africa/Brazzaville"}
CM{"Africa/Douala"}
DZ{"Africa/Algiers"}
GA{"Africa/Libreville"}
GQ{"Africa/Malabo"}
NE{"Africa/Niamey"}
NG{"Africa/Lagos"}
TD{"Africa/Ndjamena"}
TN{"Africa/Tunis"}
ZZ{"Etc/GMT-1"}
}
W. Europe Standard Time{
"W. Europe Standard Time"{
001{"Europe/Berlin"}
AD{"Europe/Andorra"}
AT{"Europe/Vienna"}
CH{"Europe/Zurich"}
DE{"Europe/Berlin Europe/Busingen"}
GI{"Europe/Gibraltar"}
IT{"Europe/Rome"}
LI{"Europe/Vaduz"}
LU{"Europe/Luxembourg"}
MC{"Europe/Monaco"}
MT{"Europe/Malta"}
NL{"Europe/Amsterdam"}
NO{"Europe/Oslo"}
SE{"Europe/Stockholm"}
SJ{"Arctic/Longyearbyen"}
SM{"Europe/San_Marino"}
VA{"Europe/Vatican"}
}
West Asia Standard Time{
"W. Mongolia Standard Time"{
001{"Asia/Hovd"}
MN{"Asia/Hovd"}
}
"West Asia Standard Time"{
001{"Asia/Tashkent"}
AQ{"Antarctica/Mawson"}
KZ{"Asia/Oral Asia/Aqtau Asia/Aqtobe Asia/Atyrau Asia/Qyzylorda"}
MV{"Indian/Maldives"}
TF{"Indian/Kerguelen"}
TJ{"Asia/Dushanbe"}
TM{"Asia/Ashgabat"}
UZ{"Asia/Tashkent Asia/Samarkand"}
ZZ{"Etc/GMT-5"}
}
West Pacific Standard Time{
"West Bank Standard Time"{
001{"Asia/Hebron"}
PS{"Asia/Hebron Asia/Gaza"}
}
"West Pacific Standard Time"{
001{"Pacific/Port_Moresby"}
AQ{"Antarctica/DumontDUrville"}
FM{"Pacific/Truk"}
GU{"Pacific/Guam"}
MP{"Pacific/Saipan"}
PG{"Pacific/Port_Moresby"}
ZZ{"Etc/GMT-10"}
}
Yakutsk Standard Time{
"Yakutsk Standard Time"{
001{"Asia/Yakutsk"}
RU{"Asia/Yakutsk Asia/Khandyga"}
}
}
}

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

File diff suppressed because it is too large Load diff

4
icu4c/source/test/intltest/dtfmttst.cpp
View file

@ -3431,7 +3431,7 @@ void DateFormatTest::Test6880() {
if (failure(status, "construct GregorianCalendar", TRUE)) return;
gcal.clear();
gcal.set(1910, UCAL_JULY, 1, 12, 00); // offset 8:05:52
gcal.set(1900, UCAL_JULY, 1, 12, 00); // offset 8:05:43
d1 = gcal.getTime(status);
gcal.clear();
@ -3441,7 +3441,7 @@ void DateFormatTest::Test6880() {
gcal.clear();
gcal.set(1970, UCAL_JANUARY, 1, 12, 00);
dexp2 = gcal.getTime(status);
dexp1 = dexp2 - (5*60 + 52)*1000; // subtract 5m52s
dexp1 = dexp2 - (5*60 + 43)*1000; // subtract 5m43s
if (U_FAILURE(status)) {
errln("FAIL: Gregorian calendar error");

54
icu4c/source/test/intltest/tzfmttst.cpp
View file

@ -202,13 +202,18 @@ TimeZoneFormatTest::TestTimeZoneRoundTrip(void) {
} else {
// Check if localized GMT format or RFC format is used.
int32_t numDigits = 0;
for (int n = 0; n < tzstr.length(); n++) {
if (u_isdigit(tzstr.charAt(n))) {
numDigits++;
UBool isOffsetFormat = (*PATTERNS[patidx] == 'Z');
if (!isOffsetFormat) {
// Check if localized GMT format is used as a fallback of name styles
int32_t numDigits = 0;
for (int n = 0; n < tzstr.length(); n++) {
if (u_isdigit(tzstr.charAt(n))) {
numDigits++;
}
}
isOffsetFormat = (numDigits >= 3);
}
if (tzstr == localGMTString || numDigits >= 3) {
if (isOffsetFormat || tzstr == localGMTString) {
// Localized GMT or RFC: total offset (raw + dst) must be preserved.
int32_t inOffset = inRaw + inDst;
int32_t outOffset = outRaw + outDst;
@ -239,6 +244,40 @@ TimeZoneFormatTest::TestTimeZoneRoundTrip(void) {
delete tzids;
}
// Special exclusions in TestTimeZoneRoundTrip.
// These special cases do not round trip time as designed.
static UBool isSpecialTimeRoundTripCase(const char* loc,
const UnicodeString& id,
const char* pattern,
UDate time) {
struct {
const char* loc;
const char* id;
const char* pattern;
UDate time;
} EXCLUSIONS[] = {
{NULL, "Asia/Chita", "zzzz", 1414252800000.0},
{NULL, "Asia/Chita", "vvvv", 1414252800000.0},
{NULL, "Asia/Srednekolymsk", "zzzz", 1414241999999.0},
{NULL, "Asia/Srednekolymsk", "vvvv", 1414241999999.0},
{NULL, NULL, NULL, U_DATE_MIN}
};
UBool isExcluded = FALSE;
for (int32_t i = 0; EXCLUSIONS[i].id != NULL; i++) {
if (EXCLUSIONS[i].loc == NULL || uprv_strcmp(loc, EXCLUSIONS[i].loc) == 0) {
if (id.compare(EXCLUSIONS[i].id) == 0) {
if (EXCLUSIONS[i].pattern == NULL || uprv_strcmp(pattern, EXCLUSIONS[i].pattern) == 0) {
if (EXCLUSIONS[i].time == U_DATE_MIN || EXCLUSIONS[i].time == time) {
isExcluded = TRUE;
}
}
}
}
}
return isExcluded;
}
struct LocaleData {
int32_t index;
int32_t testCounts;
@ -398,7 +437,10 @@ public:
if (parsedDate != testTimes[testidx]) {
UnicodeString msg = (UnicodeString) "Time round trip failed for " + "tzid=" + *tzid + ", locale=" + data.locales[locidx].getName() + ", pattern=" + PATTERNS[patidx]
+ ", text=" + text + ", time=" + testTimes[testidx] + ", restime=" + parsedDate + ", diff=" + (parsedDate - testTimes[testidx]);
if (expectedRoundTrip[testidx]) {
// Timebomb for TZData update
if (expectedRoundTrip[testidx]
&& !isSpecialTimeRoundTripCase(data.locales[locidx].getName(), *tzid,
PATTERNS[patidx], testTimes[testidx])) {
log.errln((UnicodeString) "FAIL: " + msg);
} else if (REALLY_VERBOSE) {
log.logln(msg);

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

@ -1230,31 +1230,43 @@ TimeZoneTest::TestAliasedNames()
/* Generated by org.unicode.cldr.tool.CountItems */
/* zoneID, canonical zoneID */
{"Africa/Timbuktu", "Africa/Bamako"},
{"Africa/Asmara", "Africa/Addis_Ababa"},
{"Africa/Timbuktu", "Africa/Abidjan"},
{"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/Atikokan", "America/Coral_Harbour"},
{"America/Atka", "America/Adak"},
{"America/Ensenada", "America/Tijuana"},
{"America/Fort_Wayne", "America/Indiana/Indianapolis"},
{"America/Indianapolis", "America/Indiana/Indianapolis"},
{"America/Fort_Wayne", "America/Indianapolis"},
{"America/Indiana/Indianapolis", "America/Indianapolis"},
{"America/Kentucky/Louisville", "America/Louisville"},
{"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"},
{"America/Shiprock", "America/Denver"},
{"America/Virgin", "America/Anguilla"},
{"Antarctica/South_Pole", "Antarctica/McMurdo"},
{"Asia/Ashkhabad", "Asia/Ashgabat"},
{"Asia/Chungking", "Asia/Chongqing"},
{"Asia/Chongqing", "Asia/Shanghai"},
{"Asia/Chungking", "Asia/Shanghai"},
{"Asia/Dacca", "Asia/Dhaka"},
{"Asia/Harbin", "Asia/Shanghai"},
{"Asia/Ho_Chi_Minh", "Asia/Saigon"},
{"Asia/Istanbul", "Europe/Istanbul"},
{"Asia/Kashgar", "Asia/Urumqi"},
{"Asia/Kathmandu", "Asia/Katmandu"},
{"Asia/Kolkata", "Asia/Calcutta"},
{"Asia/Macao", "Asia/Macau"},
{"Asia/Tel_Aviv", "Asia/Jerusalem"},
{"Asia/Thimbu", "Asia/Thimphu"},
{"Asia/Ujung_Pandang", "Asia/Makassar"},
{"Asia/Ulan_Bator", "Asia/Ulaanbaatar"},
{"Atlantic/Faroe", "Atlantic/Faeroe"},
{"Atlantic/Jan_Mayen", "Arctic/Longyearbyen"},
{"Australia/ACT", "Australia/Sydney"},
{"Australia/Canberra", "Australia/Sydney"},
{"Australia/LHI", "Australia/Lord_Howe"},
@ -1282,16 +1294,16 @@ TimeZoneTest::TestAliasedNames()
{"Chile/Continental", "America/Santiago"},
{"Chile/EasterIsland", "Pacific/Easter"},
{"Cuba", "America/Havana"},
{"EST", "Etc/GMT+5"},
{"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"},
{"Etc/UCT", "Etc/UTC"},
{"Etc/Universal", "Etc/UTC"},
{"Etc/Zulu", "Etc/UTC"},
{"Europe/Belfast", "Europe/London"},
{"Europe/Nicosia", "Asia/Nicosia"},
{"Europe/Tiraspol", "Europe/Chisinau"},
@ -1302,6 +1314,7 @@ TimeZoneTest::TestAliasedNames()
{"GMT-0", "Etc/GMT"},
{"GMT0", "Etc/GMT"},
{"Greenwich", "Etc/GMT"},
{"HST", "Etc/GMT+10"},
{"Hongkong", "Asia/Hong_Kong"},
{"Iceland", "Atlantic/Reykjavik"},
{"Iran", "Asia/Tehran"},
@ -1310,27 +1323,37 @@ TimeZoneTest::TestAliasedNames()
{"Japan", "Asia/Tokyo"},
{"Kwajalein", "Pacific/Kwajalein"},
{"Libya", "Africa/Tripoli"},
{"MST", "Etc/GMT+7"},
{"Mexico/BajaNorte", "America/Tijuana"},
{"Mexico/BajaSur", "America/Mazatlan"},
{"Mexico/General", "America/Mexico_City"},
{"NZ", "Pacific/Auckland"},
{"NZ", "Antarctica/McMurdo"},
{"NZ-CHAT", "Pacific/Chatham"},
{"Navajo", "America/Shiprock"},
{"Navajo", "America/Denver"},
{"PRC", "Asia/Shanghai"},
{"Pacific/Samoa", "Pacific/Pago_Pago"},
{"Pacific/Chuuk", "Pacific/Truk"},
{"Pacific/Pohnpei", "Pacific/Ponape"},
{"Pacific/Samoa", "Pacific/Midway"},
{"Pacific/Yap", "Pacific/Truk"},
{"Poland", "Europe/Warsaw"},
{"Portugal", "Europe/Lisbon"},
{"ROC", "Asia/Taipei"},
{"ROK", "Asia/Seoul"},
{"Singapore", "Asia/Singapore"},
{"SystemV/AST4", "Etc/GMT+4"},
{"SystemV/CST6", "Etc/GMT+6"},
{"SystemV/EST5", "Etc/GMT+5"},
{"SystemV/HST10", "Etc/GMT+10"},
{"SystemV/MST7", "Etc/GMT+7"},
{"SystemV/PST8", "Etc/GMT+8"},
{"SystemV/YST9", "Etc/GMT+9"},
{"Turkey", "Europe/Istanbul"},
{"UCT", "Etc/GMT"},
{"UCT", "Etc/UTC"},
{"US/Alaska", "America/Anchorage"},
{"US/Aleutian", "America/Adak"},
{"US/Arizona", "America/Phoenix"},
{"US/Central", "America/Chicago"},
{"US/East-Indiana", "America/Indiana/Indianapolis"},
{"US/East-Indiana", "America/Indianapolis"},
{"US/Eastern", "America/New_York"},
{"US/Hawaii", "Pacific/Honolulu"},
{"US/Indiana-Starke", "America/Indiana/Knox"},
@ -1338,12 +1361,12 @@ TimeZoneTest::TestAliasedNames()
{"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"},
{"US/Samoa", "Pacific/Midway"},
{"UTC", "Etc/UTC"},
{"Universal", "Etc/UTC"},
{"W-SU", "Europe/Moscow"},
{"Zulu", "Etc/GMT"},
/* Total: 113 */
{"Zulu", "Etc/UTC"},
/* Total: 136 */
};
@ -1979,26 +2002,92 @@ void TimeZoneTest::TestCanonicalID() {
const char *alias;
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"},
{"Africa/Addis_Ababa", "Africa/Nairobi"},
{"Africa/Asmera", "Africa/Nairobi"},
{"Africa/Bamako", "Africa/Abidjan"},
{"Africa/Bangui", "Africa/Lagos"},
{"Africa/Banjul", "Africa/Abidjan"},
{"Africa/Blantyre", "Africa/Maputo"},
{"Africa/Brazzaville", "Africa/Lagos"},
{"Africa/Bujumbura", "Africa/Maputo"},
{"Africa/Conakry", "Africa/Abidjan"},
{"Africa/Dakar", "Africa/Abidjan"},
{"Africa/Dar_es_Salaam", "Africa/Nairobi"},
{"Africa/Djibouti", "Africa/Nairobi"},
{"Africa/Douala", "Africa/Lagos"},
{"Africa/Freetown", "Africa/Abidjan"},
{"Africa/Gaborone", "Africa/Maputo"},
{"Africa/Harare", "Africa/Maputo"},
{"Africa/Kampala", "Africa/Nairobi"},
{"Africa/Khartoum", "Africa/Juba"},
{"Africa/Kigali", "Africa/Maputo"},
{"Africa/Kinshasa", "Africa/Lagos"},
{"Africa/Libreville", "Africa/Lagos"},
{"Africa/Lome", "Africa/Abidjan"},
{"Africa/Luanda", "Africa/Lagos"},
{"Africa/Lubumbashi", "Africa/Maputo"},
{"Africa/Lusaka", "Africa/Maputo"},
{"Africa/Maseru", "Africa/Johannesburg"},
{"Africa/Malabo", "Africa/Lagos"},
{"Africa/Mbabane", "Africa/Johannesburg"},
{"Africa/Mogadishu", "Africa/Nairobi"},
{"Africa/Niamey", "Africa/Lagos"},
{"Africa/Nouakchott", "Africa/Abidjan"},
{"Africa/Ouagadougou", "Africa/Abidjan"},
{"Africa/Porto-Novo", "Africa/Lagos"},
{"Africa/Sao_Tome", "Africa/Abidjan"},
{"America/Antigua", "America/Port_of_Spain"},
{"America/Anguilla", "America/Port_of_Spain"},
{"America/Curacao", "America/Aruba"},
{"America/Dominica", "America/Port_of_Spain"},
{"America/Grenada", "America/Port_of_Spain"},
{"America/Guadeloupe", "America/Port_of_Spain"},
{"America/Kralendijk", "America/Aruba"},
{"America/Lower_Princes", "America/Aruba"},
{"America/Marigot", "America/Port_of_Spain"},
{"America/Montserrat", "America/Port_of_Spain"},
{"America/Panama", "America/Cayman"},
{"America/Santa_Isabel", "America/Tijuana"},
{"America/Shiprock", "America/Denver"},
{"America/St_Barthelemy", "America/Port_of_Spain"},
{"America/St_Kitts", "America/Port_of_Spain"},
{"America/St_Lucia", "America/Port_of_Spain"},
{"America/St_Thomas", "America/Port_of_Spain"},
{"America/St_Vincent", "America/Port_of_Spain"},
{"America/Toronto", "America/Montreal"},
{"America/Tortola", "America/Port_of_Spain"},
{"America/Virgin", "America/Port_of_Spain"},
{"Antarctica/South_Pole", "Antarctica/McMurdo"},
{"Atlantic/Jan_Mayen", "Europe/Oslo"},
{"Arctic/Longyearbyen", "Europe/Oslo"},
{"Asia/Kuwait", "Asia/Aden"},
{"Asia/Muscat", "Asia/Dubai"},
{"Asia/Phnom_Penh", "Asia/Bangkok"},
{"Asia/Qatar", "Asia/Bahrain"},
{"Asia/Riyadh", "Asia/Aden"},
{"Asia/Vientiane", "Asia/Bangkok"},
{"Atlantic/Jan_Mayen", "Europe/Oslo"},
{"Atlantic/St_Helena", "Africa/Abidjan"},
{"Europe/Bratislava", "Europe/Prague"},
{"Europe/Busingen", "Europe/Zurich"},
{"Europe/Guernsey", "Europe/London"},
{"Europe/Isle_of_Man", "Europe/London"},
{"Europe/Jersey", "Europe/London"},
{"Europe/Ljubljana", "Europe/Belgrade"},
{"Europe/Mariehamn", "Europe/Helsinki"},
{"Europe/Podgorica", "Europe/Belgrade"},
{"Europe/San_Marino", "Europe/Rome"},
{"Europe/Sarajevo", "Europe/Belgrade"},
{"Europe/Skopje", "Europe/Belgrade"},
{"Europe/Zagreb", "Europe/Belgrade"},
{"Europe/Bratislava", "Europe/Prague"},
{"Europe/Mariehamn", "Europe/Helsinki"},
{"Europe/San_Marino", "Europe/Rome"},
{"Europe/Vaduz", "Europe/Zurich"},
{"Europe/Vatican", "Europe/Rome"},
{"Europe/Zagreb", "Europe/Belgrade"},
{"Indian/Antananarivo", "Africa/Nairobi"},
{"Indian/Comoro", "Africa/Nairobi"},
{"Indian/Mayotte", "Africa/Nairobi"},
{"Pacific/Auckland", "Antarctica/McMurdo"},
{"Pacific/Johnston", "Pacific/Honolulu"},
{"Pacific/Midway", "Pacific/Pago_Pago"},
{"Pacific/Saipan", "Pacific/Guam"},
{0, 0}
};
@ -2241,7 +2330,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

4
icu4j/build.properties
View file

@ -2,7 +2,7 @@
#* Copyright (C) 2009-2011, International Business Machines Corporation and *
#* others. All Rights Reserved. *
#*******************************************************************************
api.report.version = 4811
api.report.version = 482
api.report.prev.version = 48
release.file.ver = 4_8_1_1
release.file.ver = 4_8_2

2
icu4j/build.xml
View file

@ -576,7 +576,7 @@
docencoding="UTF-8"
bottom="&lt;font size=-1&gt;Copyright (c) ${current.year} IBM Corporation and others.&lt;/font&gt;"
additionalparam="-breakiterator -use -tagletpath ${icu4j.build-tools.jar} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet"
link="http://java.sun.com/javase/6/docs/api/"
link="https://docs.oracle.com/javase/6/docs/api/"
source="1.5">
<packageset dir="${icu4j.core.dir}/src">
<include name="com/ibm/icu/lang/**"/>

2
icu4j/eclipse-build/build.properties
View file

@ -2,6 +2,6 @@
#* Copyright (C) 2010-2011, International Business Machines Corporation and *
#* others. All Rights Reserved. *
#*******************************************************************************
icu4j.plugin.impl.version.string=4.8.1
icu4j.plugin.impl.version.string=4.8.2
copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2011. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.
icu4j.data.version.number=48

4
icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
View file

@ -488,8 +488,8 @@ public final class VersionInfo implements Comparable<VersionInfo>
UNICODE_5_2 = getInstance(5, 2, 0, 0);
UNICODE_6_0 = getInstance(6, 0, 0, 0);
ICU_VERSION = getInstance(4, 8, 1, 1);
ICU_DATA_VERSION = getInstance(4, 8, 1, 0);
ICU_VERSION = getInstance(4, 8, 2, 0);
ICU_DATA_VERSION = getInstance(4, 8, 2, 0);
UNICODE_VERSION = UNICODE_6_0;
UCOL_RUNTIME_VERSION = getInstance(7);

4
icu4j/main/shared/data/icudata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b691dc0b0209976358d6a4c7d034d24973a7720b4faff8d506c8e2aab3051cd
size 7996157
oid sha256:5e3629f37d99d7c233184c439f4aca25eea5814099d56a291348f5726a861214
size 7997668

4
icu4j/main/shared/data/testdata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aedf1a1a084013b2db88dfb57cc83ad5d76c068981c556c70b3909e3e1069c82
size 719066
oid sha256:034d89d9ba15cca5014eb9268c8d922f5d80fa39c8f20fd8639f409774fa25c0
size 719063

4
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java
View file

@ -3610,7 +3610,7 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
GregorianCalendar gcal = new GregorianCalendar(tz);
gcal.clear();
gcal.set(1910, Calendar.JANUARY, 1, 12, 00); // offset 8:05:52
gcal.set(1900, Calendar.JANUARY, 1, 12, 00); // offset 8:05:43
d1 = gcal.getTime();
gcal.clear();
@ -3620,7 +3620,7 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
gcal.clear();
gcal.set(1970, Calendar.JANUARY, 1, 12, 00);
dexp2 = gcal.getTime();
dexp1 = new Date(dexp2.getTime() - (5*60 + 52)*1000); // subtract 5m52s
dexp1 = new Date(dexp2.getTime() - (5*60 + 43)*1000); // subtract 5m43s
DateFormat fmt = DateFormat.getTimeInstance(DateFormat.FULL, new ULocale("zh"));
fmt.setTimeZone(tz);

47
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java
View file

@ -144,15 +144,20 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
}
}
} else {
// Check if localized GMT format or RFC format is used.
int numDigits = 0;
for (int n = 0; n < tzstr.length(); n++) {
if (UCharacter.isDigit(tzstr.charAt(n))) {
numDigits++;
boolean isOffsetFormat = (PATTERNS[patidx].charAt(0) == 'Z');
if (!isOffsetFormat) {
// Check if localized GMT format is used as a fallback of name styles
int numDigits = 0;
for (int n = 0; n < tzstr.length(); n++) {
if (UCharacter.isDigit(tzstr.charAt(n))) {
numDigits++;
}
}
isOffsetFormat = (numDigits >= 3);
}
if (tzstr.equals(localGMTString) || numDigits >= 3) {
if (isOffsetFormat || tzstr.equals(localGMTString)) {
// Localized GMT or RFC: total offset (raw + dst) must be preserved.
int inOffset = inOffsets[0] + inOffsets[1];
int outOffset = outOffsets[0] + outOffsets[1];
@ -323,7 +328,8 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
.append(", time=").append(testTimes[testidx])
.append(", restime=").append(restime)
.append(", diff=").append(restime - testTimes[testidx]);
if (expectedRoundTrip[testidx]) {
if (expectedRoundTrip[testidx]
&& !isSpecialTimeRoundTripCase(LOCALES[locidx], id, PATTERNS[patidx], testTimes[testidx])) {
errln("FAIL: " + msg.toString());
} else if (REALLY_VERBOSE_LOG) {
logln(msg.toString());
@ -360,4 +366,29 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
logln("Total: " + total + "ms");
logln("Iteration: " + testCounts);
}
}
// Special exclusions in TestTimeZoneRoundTrip.
// These special cases do not round trip time as designed.
private boolean isSpecialTimeRoundTripCase(ULocale loc, String id, String pattern, long time) {
final Object[][] EXCLUSIONS = {
{null, "Asia/Chita", "zzzz", Long.valueOf(1414252800000L)},
{null, "Asia/Chita", "vvvv", Long.valueOf(1414252800000L)},
{null, "Asia/Srednekolymsk", "zzzz", Long.valueOf(1414241999999L)},
{null, "Asia/Srednekolymsk", "vvvv", Long.valueOf(1414241999999L)},
};
boolean isExcluded = false;
for (Object[] excl : EXCLUSIONS) {
if (excl[0] == null || loc.equals((ULocale)excl[0])) {
if (id.equals(excl[1])) {
if (excl[2] == null || pattern.equals((String)excl[2])) {
if (excl[3] == null || ((Long)excl[3]).compareTo(time) == 0) {
isExcluded = true;
break;
}
}
}
}
}
return isExcluded;
}
}

107
icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
View file

@ -1491,24 +1491,92 @@ public class TimeZoneTest extends TestFmwk
// Some canonical IDs in CLDR are defined as "Link"
// in Olson tzdata.
final String[][] excluded1 = {
{"America/Shiprock", "America/Denver"}, // America/Shiprock is defined as a Link to America/Denver in tzdata
{"America/Marigot", "America/Guadeloupe"},
{"America/St_Barthelemy", "America/Guadeloupe"},
{"Antarctica/South_Pole", "Antarctica/McMurdo"},
{"Atlantic/Jan_Mayen", "Europe/Oslo"},
{"Arctic/Longyearbyen", "Europe/Oslo"},
{"Europe/Guernsey", "Europe/London"},
{"Europe/Isle_of_Man", "Europe/London"},
{"Europe/Jersey", "Europe/London"},
{"Europe/Ljubljana", "Europe/Belgrade"},
{"Europe/Podgorica", "Europe/Belgrade"},
{"Europe/Sarajevo", "Europe/Belgrade"},
{"Europe/Skopje", "Europe/Belgrade"},
{"Europe/Zagreb", "Europe/Belgrade"},
{"Europe/Bratislava", "Europe/Prague"},
{"Europe/Mariehamn", "Europe/Helsinki"},
{"Europe/San_Marino", "Europe/Rome"},
{"Europe/Vatican", "Europe/Rome"},
{"Africa/Addis_Ababa", "Africa/Nairobi"},
{"Africa/Asmera", "Africa/Nairobi"},
{"Africa/Bamako", "Africa/Abidjan"},
{"Africa/Bangui", "Africa/Lagos"},
{"Africa/Banjul", "Africa/Abidjan"},
{"Africa/Blantyre", "Africa/Maputo"},
{"Africa/Brazzaville", "Africa/Lagos"},
{"Africa/Bujumbura", "Africa/Maputo"},
{"Africa/Conakry", "Africa/Abidjan"},
{"Africa/Dakar", "Africa/Abidjan"},
{"Africa/Dar_es_Salaam", "Africa/Nairobi"},
{"Africa/Djibouti", "Africa/Nairobi"},
{"Africa/Douala", "Africa/Lagos"},
{"Africa/Freetown", "Africa/Abidjan"},
{"Africa/Gaborone", "Africa/Maputo"},
{"Africa/Harare", "Africa/Maputo"},
{"Africa/Kampala", "Africa/Nairobi"},
{"Africa/Khartoum", "Africa/Juba"},
{"Africa/Kigali", "Africa/Maputo"},
{"Africa/Kinshasa", "Africa/Lagos"},
{"Africa/Libreville", "Africa/Lagos"},
{"Africa/Lome", "Africa/Abidjan"},
{"Africa/Luanda", "Africa/Lagos"},
{"Africa/Lubumbashi", "Africa/Maputo"},
{"Africa/Lusaka", "Africa/Maputo"},
{"Africa/Maseru", "Africa/Johannesburg"},
{"Africa/Malabo", "Africa/Lagos"},
{"Africa/Mbabane", "Africa/Johannesburg"},
{"Africa/Mogadishu", "Africa/Nairobi"},
{"Africa/Niamey", "Africa/Lagos"},
{"Africa/Nouakchott", "Africa/Abidjan"},
{"Africa/Ouagadougou", "Africa/Abidjan"},
{"Africa/Porto-Novo", "Africa/Lagos"},
{"Africa/Sao_Tome", "Africa/Abidjan"},
{"America/Antigua", "America/Port_of_Spain"},
{"America/Anguilla", "America/Port_of_Spain"},
{"America/Curacao", "America/Aruba"},
{"America/Dominica", "America/Port_of_Spain"},
{"America/Grenada", "America/Port_of_Spain"},
{"America/Guadeloupe", "America/Port_of_Spain"},
{"America/Kralendijk", "America/Aruba"},
{"America/Lower_Princes", "America/Aruba"},
{"America/Marigot", "America/Port_of_Spain"},
{"America/Montserrat", "America/Port_of_Spain"},
{"America/Panama", "America/Cayman"},
{"America/Santa_Isabel", "America/Tijuana"},
{"America/Shiprock", "America/Denver"},
{"America/St_Barthelemy", "America/Port_of_Spain"},
{"America/St_Kitts", "America/Port_of_Spain"},
{"America/St_Lucia", "America/Port_of_Spain"},
{"America/St_Thomas", "America/Port_of_Spain"},
{"America/St_Vincent", "America/Port_of_Spain"},
{"America/Toronto", "America/Montreal"},
{"America/Tortola", "America/Port_of_Spain"},
{"America/Virgin", "America/Port_of_Spain"},
{"Antarctica/South_Pole", "Antarctica/McMurdo"},
{"Arctic/Longyearbyen", "Europe/Oslo"},
{"Asia/Kuwait", "Asia/Aden"},
{"Asia/Muscat", "Asia/Dubai"},
{"Asia/Phnom_Penh", "Asia/Bangkok"},
{"Asia/Qatar", "Asia/Bahrain"},
{"Asia/Riyadh", "Asia/Aden"},
{"Asia/Vientiane", "Asia/Bangkok"},
{"Atlantic/Jan_Mayen", "Europe/Oslo"},
{"Atlantic/St_Helena", "Africa/Abidjan"},
{"Europe/Bratislava", "Europe/Prague"},
{"Europe/Busingen", "Europe/Zurich"},
{"Europe/Guernsey", "Europe/London"},
{"Europe/Isle_of_Man", "Europe/London"},
{"Europe/Jersey", "Europe/London"},
{"Europe/Ljubljana", "Europe/Belgrade"},
{"Europe/Mariehamn", "Europe/Helsinki"},
{"Europe/Podgorica", "Europe/Belgrade"},
{"Europe/San_Marino", "Europe/Rome"},
{"Europe/Sarajevo", "Europe/Belgrade"},
{"Europe/Skopje", "Europe/Belgrade"},
{"Europe/Vaduz", "Europe/Zurich"},
{"Europe/Vatican", "Europe/Rome"},
{"Europe/Zagreb", "Europe/Belgrade"},
{"Indian/Antananarivo", "Africa/Nairobi"},
{"Indian/Comoro", "Africa/Nairobi"},
{"Indian/Mayotte", "Africa/Nairobi"},
{"Pacific/Auckland", "Antarctica/McMurdo"},
{"Pacific/Johnston", "Pacific/Honolulu"},
{"Pacific/Midway", "Pacific/Pago_Pago"},
{"Pacific/Saipan", "Pacific/Guam"},
};
// Following IDs are aliases of Etc/GMT in CLDR,
@ -1791,7 +1859,8 @@ public class TimeZoneTest extends TestFmwk
{"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", null}, // CLDR canonical, but not a sysmte zone ID
{"bogus", null}, // bogus
{"GMT+08:00", null}, // a custom ID, not a system zone ID

2
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java
View file

@ -7,7 +7,7 @@
package com.ibm.icu.dev.test.util;
public class DebugUtilitiesData extends Object {
public static final String ICU4C_VERSION="4.8.1.1";
public static final String ICU4C_VERSION="4.8.2";
public static final int UDebugEnumType = 0;
public static final int UCalendarDateFields = 1;
public static final int UCalendarMonths = 2;

38
icu4j/pom.xml
View file

@ -1,7 +1,9 @@
<?xml version="1.0"?>
<!--
* © 2016 and later: Unicode, Inc. and others.
* License & terms of use: http://www.unicode.org/copyright.html#License
*******************************************************************************
* Copyright (C) 2010-2011, International Business Machines Corporation and *
* Copyright (C) 2010-2016, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
-->
@ -11,7 +13,7 @@
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>4.8.1.1</version>
<version>4.8.2</version>
<name>ICU4J</name>
<description>
@ -20,17 +22,18 @@
</description>
<url>http://icu-project.org/</url>
<inceptionYear>2001</inceptionYear>
<licenses>
<license>
<name>ICU License</name>
<url>http://source.icu-project.org/repos/icu/icu/trunk/license.html</url>
<name>Unicode/ICU License</name>
<url>https://raw.githubusercontent.com/unicode-org/icu/master/icu4c/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>mark</id>
<id>macchiati</id>
<name>Mark Davis</name>
<organization>Google</organization>
<roles>
@ -38,7 +41,7 @@
</roles>
</developer>
<developer>
<id>emmons</id>
<id>JCEmmons</id>
<name>John Emmons</name>
<organization>IBM Corporation</organization>
<roles>
@ -46,7 +49,7 @@
</roles>
</developer>
<developer>
<id>doug</id>
<id>dougfelt</id>
<name>Doug Felt</name>
<organization>Google</organization>
<roles>
@ -62,7 +65,7 @@
</roles>
</developer>
<developer>
<id>srl</id>
<id>srl295</id>
<name>Steven Loomis</name>
<organization>IBM Corporation</organization>
<roles>
@ -70,7 +73,7 @@
</roles>
</developer>
<developer>
<id>markus</id>
<id>markusicu</id>
<name>Markus Scherer</name>
<organization>Google</organization>
<roles>
@ -86,7 +89,7 @@
</roles>
</developer>
<developer>
<id>yoshito</id>
<id>yumaoka</id>
<name>Yoshito Umaoka</name>
<organization>IBM Corporation</organization>
<roles>
@ -120,25 +123,26 @@
</mailingLists>
<scm>
<connection>scm:svn:http://source.icu-project.org/repos/icu/icu4j/trunk/</connection>
<developerConnection>scm:svn:http://source.icu-project.org/repos/icu/icu4j/trunk/</developerConnection>
<url>http://source.icu-project.org/repos/icu/icu4j/trunk/</url>
<connection>scm:git:git://github.com/unicode-org/icu.git</connection>
<developerConnection>scm:git:git@github.com:unicode-org/icu.git</developerConnection>
<url>https://github.com/unicode-org/icu</url>
</scm>
<issueManagement>
<system>Trac</system>
<url>http://bugs.icu-project.org/trac/</url>
<system>JIRA</system>
<url>https://unicode-org.atlassian.net/projects/ICU</url>
</issueManagement>
<distributionManagement>
<repository>
<id>icu4j-releases</id>
<name>ICU4J Central Repository</name>
<url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
<snapshotRepository>
<id>icu4j-snapshots</id>
<name>ICU4J Central Development Repository</name>
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
</project>

15
icu4j/readme.html
View file

@ -13,8 +13,8 @@ h4.doc { text-decoration: underline }
<body style="background-color: rgb(255, 255, 255);" lang="EN-US"
link="#0000ff" vlink="#800080">
<h2>International Components for Unicode for Java (ICU4J)</h2>
<h3>Read Me for ICU4J 4.8.1.1</h3>
(Last Update: Aug 18, 2011)
<h3>Read Me for ICU4J 4.8.2</h3>
(Last Update: 2019-Apr-10)
<hr size="2" width="100%">
<p><b>Note:</b>This is an update release of ICU4J 4.8. This release contains bug fixes and updated data,
@ -141,6 +141,10 @@ with ID "GMT" (offset 0 and no daylight saving time). In ICU 4.8, the method use
time zone ID (but still offset 0 and no daylight saving time) for the case. Existing software checking
the returned time zone ID to validate the input ID may need to be updated to support the new behavior.
<h4 class="doc">Summary of updates in 4.8.2 (April 10, 2019)</h4>
<p><b>New Japanese Era</b></p>
<p>Added support for Japanese era Reiwa starting May 1, 2019.</p>
<h4 class="doc">Summary of updates in 4.8.1.1 (August 24, 2011)</h4>
<p><b>Java 7 Locale support</b></p>
<p>Java 7 was shipped in July 2011 including some enhancements in java.util.Locale class.
@ -983,6 +987,7 @@ in the build output directory by some build targets.
<h4><a name="resourcesICU4C">Building ICU4J Resources from ICU4C</a></h4>
ICU4J data is built by ICU4C tools. Please see "icu4j-readme.txt" in <I>$icu4c_root</I>/source/data for the procedures.
<h5> Generating Data from CLDR </h5>
<i> Note: The description below does not apply to ICU4J 4.8.2</i><br>
<I> Note: This procedure assumes that all 3 sources are present</I>
<ol>
<li>Checkout or download CLDR version 'release-2-0-1'</li>
@ -999,12 +1004,12 @@ ICU4J data is built by ICU4C tools. Please see "icu4j-readme.txt" in <I>$icu4c_r
</ol>
<h3 class="doc"><a name="timezone"></a>About ICU4J Time Zone</h3>
<p>ICU4J 4.8.1.1 includes time zone data version 2011h, which is the latest one as of
the release date. However, time zone data is frequently updated in response
<p>ICU4J library includes the latest time zone data, as of the release date.
However, time zone data is frequently updated in response
to changes made by local governments around the world. If you need to update
the time zone data, please refer the ICU user guide topic
<a href="http://userguide.icu-project.org/datetime/timezone#TOC-Updating-the-Time-Zone-Data">Updating the Time Zone Data</a>.</p>
<p>Starting with ICU4J 4.0, you can optionally configure ICU4J date and time
<p>You can optionally configure ICU4J date and time
service classes to use underlying JDK TimeZone implementation (see the ICU4J API reference
<a href="http://www.icu-project.org/apiref/icu4j/com/ibm/icu/util/TimeZone.html">TimeZone</a>
for the details). When this configuration is enabled, ICU's own time zone data