mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-11 16:03:20 +00:00
ICU-20536 ICU 54.2 release tasks
This commit is contained in:
yumaoka
Yoshito Umaoka
parent
8c7e827079
commit
434a3b4763
21 changed files with 2204 additions and 1878 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -900,6 +900,7 @@ icu4c/source/tools/tzcode/Makefile
|
|||
icu4c/source/uconfig.h.prepend
|
||||
icu4j/*.jar
|
||||
icu4j/.project
|
||||
icu4j/build-local.properties
|
||||
icu4j/demos/out
|
||||
icu4j/doc
|
||||
icu4j/eclipse-build/out
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
<html lang="en-US" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
|
||||
<head>
|
||||
<title>ReadMe for ICU 54.1</title>
|
||||
<title>ReadMe for ICU 54.2</title>
|
||||
<meta name="COPYRIGHT" content=
|
||||
"Copyright (c) 1997-2014 IBM Corporation and others. All Rights Reserved." />
|
||||
<meta name="KEYWORDS" content=
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
<span class="only-rc">Release Candidate</span>
|
||||
<span class="only-milestone">(Milestone Release)</span>
|
||||
<abbr title="International Components for Unicode">ICU</abbr> 54.1 ReadMe
|
||||
<abbr title="International Components for Unicode">ICU</abbr> 54.2 ReadMe
|
||||
</h1>
|
||||
|
||||
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
<p class="note only-rc">This is a release candidate version of ICU4C.
|
||||
It is not recommended for production use.</p>
|
||||
|
||||
<p>Last updated: 2014-September-24<br />
|
||||
<p>Last updated: 2019-Apr-10<br />
|
||||
Copyright © 1997-2014 International Business Machines Corporation and
|
||||
others. All Rights Reserved.</p>
|
||||
<!-- Remember that there is a copyright at the end too -->
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
* This value will change in the subsequent releases of ICU
|
||||
* @stable ICU 2.6
|
||||
*/
|
||||
#define U_ICU_VERSION_MINOR_NUM 1
|
||||
#define U_ICU_VERSION_MINOR_NUM 2
|
||||
|
||||
/** The current ICU patchlevel version as an integer.
|
||||
* This value will change in the subsequent releases of ICU
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
* This value will change in the subsequent releases of ICU
|
||||
* @stable ICU 2.4
|
||||
*/
|
||||
#define U_ICU_VERSION "54.1"
|
||||
#define U_ICU_VERSION "54.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
|
||||
|
|
@ -130,7 +130,7 @@
|
|||
/** Data version in ICU4C.
|
||||
* @internal ICU 4.4 Internal Use Only
|
||||
**/
|
||||
#define U_ICU_DATA_VERSION "54.1"
|
||||
#define U_ICU_DATA_VERSION "54.2"
|
||||
#endif /* U_HIDE_INTERNAL_API */
|
||||
|
||||
/*===========================================================================
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
// ***************************************************************************
|
||||
|
||||
icuver:table(nofallback){
|
||||
DataVersion { "54.0.1.0" }
|
||||
ICUVersion { "54.0.1.0" }
|
||||
DataVersion { "54.2.0.0" }
|
||||
ICUVersion { "54.2.0.0" }
|
||||
}
|
||||
|
|
|
|||
262
icu4c/source/data/misc/metaZones.txt
Normal file → Executable file
262
icu4c/source/data/misc/metaZones.txt
Normal file → Executable file
|
|
@ -1,11 +1,5 @@
|
|||
// ***************************************************************************
|
||||
// *
|
||||
// * Copyright (C) 2014 International Business Machines
|
||||
// * Corporation and others. All Rights Reserved.
|
||||
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
|
||||
// * 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{
|
||||
|
|
@ -137,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"}
|
||||
|
|
@ -218,7 +212,6 @@ metaZones:table(nofallback){
|
|||
}
|
||||
Chile{
|
||||
001{"America/Santiago"}
|
||||
AQ{"Antarctica/Palmer"}
|
||||
}
|
||||
China{
|
||||
001{"Asia/Shanghai"}
|
||||
|
|
@ -351,7 +344,6 @@ metaZones:table(nofallback){
|
|||
SH{"Atlantic/St_Helena"}
|
||||
SL{"Africa/Freetown"}
|
||||
SN{"Africa/Dakar"}
|
||||
ST{"Africa/Sao_Tome"}
|
||||
TG{"Africa/Lome"}
|
||||
}
|
||||
Galapagos{
|
||||
|
|
@ -405,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"}
|
||||
|
|
@ -451,7 +442,6 @@ metaZones:table(nofallback){
|
|||
}
|
||||
Korea{
|
||||
001{"Asia/Seoul"}
|
||||
KP{"Asia/Pyongyang"}
|
||||
}
|
||||
Kosrae{
|
||||
001{"Pacific/Kosrae"}
|
||||
|
|
@ -592,6 +582,9 @@ metaZones:table(nofallback){
|
|||
Ponape{
|
||||
001{"Pacific/Ponape"}
|
||||
}
|
||||
Pyongyang{
|
||||
001{"Asia/Pyongyang"}
|
||||
}
|
||||
Qyzylorda{
|
||||
001{"Asia/Qyzylorda"}
|
||||
}
|
||||
|
|
@ -820,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"{
|
||||
|
|
@ -869,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"{
|
||||
|
|
@ -918,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",
|
||||
}
|
||||
}
|
||||
|
|
@ -1031,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"{
|
||||
|
|
@ -1084,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",
|
||||
}
|
||||
}
|
||||
|
|
@ -1413,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",
|
||||
}
|
||||
}
|
||||
|
|
@ -1585,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",
|
||||
|
|
@ -1621,11 +1653,16 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"America_Eastern",
|
||||
"1970-01-01 00:00",
|
||||
"2014-11-02 06:00",
|
||||
"2015-11-01 06:00",
|
||||
}
|
||||
{
|
||||
"Atlantic",
|
||||
"2014-11-02 06:00",
|
||||
"2015-11-01 06:00",
|
||||
"2018-03-11 07:00",
|
||||
}
|
||||
{
|
||||
"America_Eastern",
|
||||
"2018-03-11 07:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
|
|
@ -2038,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"{
|
||||
|
|
@ -2226,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",
|
||||
|
|
@ -2508,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",
|
||||
}
|
||||
}
|
||||
|
|
@ -2552,7 +2623,7 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Chile",
|
||||
"1982-05-01 03:00",
|
||||
"9999-12-31 23:59",
|
||||
"2016-12-03 23:00",
|
||||
}
|
||||
}
|
||||
"Antarctica:Rothera"{
|
||||
|
|
@ -2589,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",
|
||||
}
|
||||
}
|
||||
|
|
@ -2611,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",
|
||||
}
|
||||
}
|
||||
|
|
@ -2623,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",
|
||||
}
|
||||
}
|
||||
|
|
@ -2640,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",
|
||||
}
|
||||
}
|
||||
|
|
@ -2660,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",
|
||||
|
|
@ -2730,6 +2813,11 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Irkutsk",
|
||||
"2014-10-25 16:00",
|
||||
"2016-03-26 18:00",
|
||||
}
|
||||
{
|
||||
"Yakutsk",
|
||||
"2016-03-26 18:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
|
|
@ -2813,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",
|
||||
|
|
@ -2875,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"{
|
||||
|
|
@ -3025,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",
|
||||
}
|
||||
}
|
||||
|
|
@ -3053,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"{
|
||||
|
|
@ -3067,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",
|
||||
|
|
@ -3076,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",
|
||||
}
|
||||
}
|
||||
|
|
@ -3097,6 +3209,8 @@ metaZones:table(nofallback){
|
|||
"Asia:Saigon"{
|
||||
{
|
||||
"Indochina",
|
||||
"1975-06-12 16:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
"Asia:Sakhalin"{
|
||||
|
|
@ -3404,6 +3518,11 @@ metaZones:table(nofallback){
|
|||
"America_Eastern",
|
||||
}
|
||||
}
|
||||
"Etc:GMT"{
|
||||
{
|
||||
"GMT",
|
||||
}
|
||||
}
|
||||
"Europe:Amsterdam"{
|
||||
{
|
||||
"Europe_Central",
|
||||
|
|
@ -3414,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",
|
||||
|
|
@ -3531,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",
|
||||
}
|
||||
}
|
||||
|
|
@ -3550,11 +3681,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",
|
||||
"2011-03-27 00:00",
|
||||
}
|
||||
{
|
||||
|
|
@ -3653,6 +3784,11 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Europe_Further_Eastern",
|
||||
"2011-03-27 00:00",
|
||||
"2014-10-26 22:00",
|
||||
}
|
||||
{
|
||||
"Moscow",
|
||||
"2014-10-26 22:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
|
|
@ -3731,19 +3867,9 @@ metaZones:table(nofallback){
|
|||
"1991-03-30 23:00",
|
||||
"1991-09-29 00:00",
|
||||
}
|
||||
{
|
||||
"Kuybyshev",
|
||||
"1991-09-29 00:00",
|
||||
"1991-10-20 00:00",
|
||||
}
|
||||
{
|
||||
"Samara",
|
||||
"1991-10-20 00:00",
|
||||
"2010-03-27 22:00",
|
||||
}
|
||||
{
|
||||
"Moscow",
|
||||
"2010-03-27 22:00",
|
||||
"1991-09-29 00:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
|
|
@ -3757,6 +3883,13 @@ metaZones:table(nofallback){
|
|||
"Europe_Central",
|
||||
}
|
||||
}
|
||||
"Europe:Saratov"{
|
||||
{
|
||||
"Moscow",
|
||||
"1992-03-28 22:00",
|
||||
"2016-12-03 23:00",
|
||||
}
|
||||
}
|
||||
"Europe:Simferopol"{
|
||||
{
|
||||
"Moscow",
|
||||
|
|
@ -3816,6 +3949,13 @@ metaZones:table(nofallback){
|
|||
"Europe_Central",
|
||||
}
|
||||
}
|
||||
"Europe:Ulyanovsk"{
|
||||
{
|
||||
"Moscow",
|
||||
"1992-01-19 00:00",
|
||||
"2016-03-26 23:00",
|
||||
}
|
||||
}
|
||||
"Europe:Uzhgorod"{
|
||||
{
|
||||
"Moscow",
|
||||
|
|
@ -3852,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",
|
||||
}
|
||||
{
|
||||
|
|
@ -3879,6 +4019,11 @@ metaZones:table(nofallback){
|
|||
{
|
||||
"Moscow",
|
||||
"1992-03-28 22:00",
|
||||
"2018-10-27 23:00",
|
||||
}
|
||||
{
|
||||
"Volgograd",
|
||||
"2018-10-27 23:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
|
|
@ -3984,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",
|
||||
|
|
@ -4091,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",
|
||||
}
|
||||
}
|
||||
|
|
|
|||
41
icu4c/source/data/misc/timezoneTypes.txt
Normal file → Executable file
41
icu4c/source/data/misc/timezoneTypes.txt
Normal file → Executable file
|
|
@ -1,11 +1,5 @@
|
|||
// ***************************************************************************
|
||||
// *
|
||||
// * Copyright (C) 2014 International Business Machines
|
||||
// * Corporation and others. All Rights Reserved.
|
||||
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
|
||||
// * Source File: <path>/common/bcp47/timezone.xml
|
||||
// *
|
||||
// ***************************************************************************
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html#License
|
||||
timezoneTypes:table(nofallback){
|
||||
bcpTypeAlias{
|
||||
tz{
|
||||
|
|
@ -53,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"}
|
||||
|
|
@ -85,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"}
|
||||
|
|
@ -143,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{
|
||||
|
|
@ -252,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"}
|
||||
|
|
@ -320,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"}
|
||||
|
|
@ -370,10 +366,12 @@ 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"}
|
||||
|
|
@ -386,6 +384,7 @@ timezoneTypes:table(nofallback){
|
|||
"Asia:Dili"{"tldil"}
|
||||
"Asia:Dubai"{"aedxb"}
|
||||
"Asia:Dushanbe"{"tjdyu"}
|
||||
"Asia:Famagusta"{"cyfmg"}
|
||||
"Asia:Gaza"{"gaza"}
|
||||
"Asia:Hebron"{"hebron"}
|
||||
"Asia:Hong_Kong"{"hkhkg"}
|
||||
|
|
@ -417,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"}
|
||||
|
|
@ -433,6 +433,7 @@ timezoneTypes:table(nofallback){
|
|||
"Asia:Tehran"{"irthr"}
|
||||
"Asia:Thimphu"{"btthi"}
|
||||
"Asia:Tokyo"{"jptyo"}
|
||||
"Asia:Tomsk"{"rutof"}
|
||||
"Asia:Ulaanbaatar"{"mnuln"}
|
||||
"Asia:Urumqi"{"cnurc"}
|
||||
"Asia:Ust-Nera"{"ruunera"}
|
||||
|
|
@ -463,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"}
|
||||
|
|
@ -490,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"}
|
||||
|
|
@ -512,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"}
|
||||
|
|
@ -531,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"}
|
||||
|
|
@ -560,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"}
|
||||
|
|
|
|||
206
icu4c/source/data/misc/windowsZones.txt
Normal file → Executable file
206
icu4c/source/data/misc/windowsZones.txt
Normal file → Executable file
|
|
@ -1,11 +1,5 @@
|
|||
// ***************************************************************************
|
||||
// *
|
||||
// * Copyright (C) 2014 International Business Machines
|
||||
// * Corporation and others. All Rights Reserved.
|
||||
// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
|
||||
// * 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"{
|
||||
|
|
@ -27,6 +21,14 @@ windowsZones:table(nofallback){
|
|||
"Yakutat"
|
||||
}
|
||||
}
|
||||
"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"}
|
||||
|
|
@ -54,12 +56,20 @@ windowsZones:table(nofallback){
|
|||
"uaia America/Catamarca America/Cordoba America/Jujuy America/Mendoza"
|
||||
}
|
||||
}
|
||||
"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"}
|
||||
}
|
||||
"Aus Central W. Standard Time"{
|
||||
001{"Australia/Eucla"}
|
||||
AU{"Australia/Eucla"}
|
||||
}
|
||||
"Azerbaijan Standard Time"{
|
||||
001{"Asia/Baku"}
|
||||
AZ{"Asia/Baku"}
|
||||
|
|
@ -78,6 +88,14 @@ windowsZones:table(nofallback){
|
|||
BD{"Asia/Dhaka"}
|
||||
BT{"Asia/Thimphu"}
|
||||
}
|
||||
"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"}
|
||||
|
|
@ -112,7 +130,7 @@ windowsZones:table(nofallback){
|
|||
CN{"Asia/Urumqi"}
|
||||
IO{"Indian/Chagos"}
|
||||
KG{"Asia/Bishkek"}
|
||||
KZ{"Asia/Almaty Asia/Qyzylorda"}
|
||||
KZ{"Asia/Almaty Asia/Qostanay"}
|
||||
ZZ{"Etc/GMT-6"}
|
||||
}
|
||||
"Central Brazilian Standard Time"{
|
||||
|
|
@ -148,8 +166,8 @@ windowsZones:table(nofallback){
|
|||
"Central Standard Time (Mexico)"{
|
||||
001{"America/Mexico_City"}
|
||||
MX{
|
||||
"America/Mexico_City America/Bahia_Banderas America/Cancun America/Me"
|
||||
"rida America/Monterrey"
|
||||
"America/Mexico_City America/Bahia_Banderas America/Merida America/Mo"
|
||||
"nterrey"
|
||||
}
|
||||
}
|
||||
"Central Standard Time"{
|
||||
|
|
@ -166,12 +184,20 @@ windowsZones:table(nofallback){
|
|||
}
|
||||
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"}
|
||||
}
|
||||
"Cuba Standard Time"{
|
||||
001{"America/Havana"}
|
||||
CU{"America/Havana"}
|
||||
}
|
||||
"Dateline Standard Time"{
|
||||
001{"Etc/GMT+12"}
|
||||
ZZ{"Etc/GMT+12"}
|
||||
|
|
@ -185,7 +211,6 @@ windowsZones:table(nofallback){
|
|||
KE{"Africa/Nairobi"}
|
||||
KM{"Indian/Comoro"}
|
||||
MG{"Indian/Antananarivo"}
|
||||
SD{"Africa/Khartoum"}
|
||||
SO{"Africa/Mogadishu"}
|
||||
SS{"Africa/Juba"}
|
||||
TZ{"Africa/Dar_es_Salaam"}
|
||||
|
|
@ -197,10 +222,22 @@ windowsZones:table(nofallback){
|
|||
001{"Australia/Brisbane"}
|
||||
AU{"Australia/Brisbane Australia/Lindeman"}
|
||||
}
|
||||
"E. Europe Standard Time"{
|
||||
001{"Europe/Chisinau"}
|
||||
MD{"Europe/Chisinau"}
|
||||
}
|
||||
"E. South America Standard Time"{
|
||||
001{"America/Sao_Paulo"}
|
||||
BR{"America/Sao_Paulo"}
|
||||
}
|
||||
"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"}
|
||||
|
|
@ -208,8 +245,6 @@ windowsZones:table(nofallback){
|
|||
"America/Toronto America/Iqaluit America/Montreal America/Nipigon Ame"
|
||||
"rica/Pangnirtung America/Thunder_Bay"
|
||||
}
|
||||
CU{"America/Havana"}
|
||||
HT{"America/Port-au-Prince"}
|
||||
US{
|
||||
"America/New_York America/Detroit America/Indiana/Petersburg America/"
|
||||
"Indiana/Vincennes America/Indiana/Winamac America/Kentucky/Monticell"
|
||||
|
|
@ -252,9 +287,8 @@ windowsZones:table(nofallback){
|
|||
}
|
||||
"GTB Standard Time"{
|
||||
001{"Europe/Bucharest"}
|
||||
CY{"Asia/Nicosia"}
|
||||
CY{"Asia/Famagusta Asia/Nicosia"}
|
||||
GR{"Europe/Athens"}
|
||||
MD{"Europe/Chisinau"}
|
||||
RO{"Europe/Bucharest"}
|
||||
}
|
||||
"Georgian Standard Time"{
|
||||
|
|
@ -280,9 +314,12 @@ windowsZones:table(nofallback){
|
|||
SH{"Atlantic/St_Helena"}
|
||||
SL{"Africa/Freetown"}
|
||||
SN{"Africa/Dakar"}
|
||||
ST{"Africa/Sao_Tome"}
|
||||
TG{"Africa/Lome"}
|
||||
}
|
||||
"Haiti Standard Time"{
|
||||
001{"America/Port-au-Prince"}
|
||||
HT{"America/Port-au-Prince"}
|
||||
}
|
||||
"Hawaiian Standard Time"{
|
||||
001{"Pacific/Honolulu"}
|
||||
CK{"Pacific/Rarotonga"}
|
||||
|
|
@ -309,12 +346,10 @@ windowsZones:table(nofallback){
|
|||
}
|
||||
"Kaliningrad Standard Time"{
|
||||
001{"Europe/Kaliningrad"}
|
||||
BY{"Europe/Minsk"}
|
||||
RU{"Europe/Kaliningrad"}
|
||||
}
|
||||
"Korea Standard Time"{
|
||||
001{"Asia/Seoul"}
|
||||
KP{"Asia/Pyongyang"}
|
||||
KR{"Asia/Seoul"}
|
||||
}
|
||||
"Libya Standard Time"{
|
||||
|
|
@ -326,9 +361,22 @@ windowsZones:table(nofallback){
|
|||
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 Asia/Anadyr Asia/Kamchatka Asia/Srednekolymsk"}
|
||||
RU{"Asia/Magadan"}
|
||||
}
|
||||
"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"}
|
||||
|
|
@ -370,7 +418,7 @@ windowsZones:table(nofallback){
|
|||
}
|
||||
"N. Central Asia Standard Time"{
|
||||
001{"Asia/Novosibirsk"}
|
||||
RU{"Asia/Novosibirsk Asia/Novokuznetsk Asia/Omsk"}
|
||||
RU{"Asia/Novosibirsk"}
|
||||
}
|
||||
"Namibia Standard Time"{
|
||||
001{"Africa/Windhoek"}
|
||||
|
|
@ -389,28 +437,38 @@ windowsZones:table(nofallback){
|
|||
001{"America/St_Johns"}
|
||||
CA{"America/St_Johns"}
|
||||
}
|
||||
"Norfolk Standard Time"{
|
||||
001{"Pacific/Norfolk"}
|
||||
NF{"Pacific/Norfolk"}
|
||||
}
|
||||
"North Asia East Standard Time"{
|
||||
001{"Asia/Irkutsk"}
|
||||
RU{"Asia/Irkutsk"}
|
||||
}
|
||||
"North Asia Standard Time"{
|
||||
001{"Asia/Krasnoyarsk"}
|
||||
RU{"Asia/Krasnoyarsk"}
|
||||
RU{"Asia/Krasnoyarsk Asia/Novokuznetsk"}
|
||||
}
|
||||
"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"}
|
||||
AQ{"Antarctica/Palmer"}
|
||||
CL{"America/Santiago"}
|
||||
}
|
||||
"Pacific Standard Time (Mexico)"{
|
||||
001{"America/Santa_Isabel"}
|
||||
MX{"America/Santa_Isabel"}
|
||||
001{"America/Tijuana"}
|
||||
MX{"America/Tijuana America/Santa_Isabel"}
|
||||
}
|
||||
"Pacific Standard Time"{
|
||||
001{"America/Los_Angeles"}
|
||||
CA{"America/Vancouver America/Dawson America/Whitehorse"}
|
||||
MX{"America/Tijuana"}
|
||||
US{"America/Los_Angeles"}
|
||||
US{"America/Los_Angeles America/Metlakatla"}
|
||||
ZZ{"PST8PDT"}
|
||||
}
|
||||
"Pakistan Standard Time"{
|
||||
|
|
@ -428,16 +486,29 @@ windowsZones:table(nofallback){
|
|||
ES{"Europe/Madrid Africa/Ceuta"}
|
||||
FR{"Europe/Paris"}
|
||||
}
|
||||
"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/Samara Europe/Simferopol Europe/Volgograd"}
|
||||
RU{"Europe/Moscow Europe/Kirov Europe/Volgograd"}
|
||||
UA{"Europe/Simferopol"}
|
||||
}
|
||||
"SA Eastern Standard Time"{
|
||||
001{"America/Cayenne"}
|
||||
AQ{"Antarctica/Rothera"}
|
||||
BR{
|
||||
"America/Fortaleza America/Araguaina America/Belem America/Maceio Ame"
|
||||
"rica/Recife America/Santarem"
|
||||
"America/Fortaleza America/Belem America/Maceio America/Recife Americ"
|
||||
"a/Santarem"
|
||||
}
|
||||
FK{"Atlantic/Stanley"}
|
||||
GF{"America/Cayenne"}
|
||||
|
|
@ -480,7 +551,6 @@ windowsZones:table(nofallback){
|
|||
MS{"America/Montserrat"}
|
||||
PR{"America/Puerto_Rico"}
|
||||
SX{"America/Lower_Princes"}
|
||||
TC{"America/Grand_Turk"}
|
||||
TT{"America/Port_of_Spain"}
|
||||
VC{"America/St_Vincent"}
|
||||
VG{"America/Tortola"}
|
||||
|
|
@ -494,15 +564,30 @@ windowsZones:table(nofallback){
|
|||
ID{"Asia/Jakarta Asia/Pontianak"}
|
||||
KH{"Asia/Phnom_Penh"}
|
||||
LA{"Asia/Vientiane"}
|
||||
MN{"Asia/Hovd"}
|
||||
TH{"Asia/Bangkok"}
|
||||
VN{"Asia/Saigon"}
|
||||
ZZ{"Etc/GMT-7"}
|
||||
}
|
||||
"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"}
|
||||
}
|
||||
"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"}
|
||||
|
|
@ -531,6 +616,10 @@ windowsZones:table(nofallback){
|
|||
001{"Asia/Colombo"}
|
||||
LK{"Asia/Colombo"}
|
||||
}
|
||||
"Sudan Standard Time"{
|
||||
001{"Africa/Khartoum"}
|
||||
SD{"Africa/Khartoum"}
|
||||
}
|
||||
"Syria Standard Time"{
|
||||
001{"Asia/Damascus"}
|
||||
SY{"Asia/Damascus"}
|
||||
|
|
@ -543,6 +632,10 @@ windowsZones:table(nofallback){
|
|||
001{"Australia/Hobart"}
|
||||
AU{"Australia/Hobart Australia/Currie"}
|
||||
}
|
||||
"Tocantins Standard Time"{
|
||||
001{"America/Araguaina"}
|
||||
BR{"America/Araguaina"}
|
||||
}
|
||||
"Tokyo Standard Time"{
|
||||
001{"Asia/Tokyo"}
|
||||
ID{"Asia/Jayapura"}
|
||||
|
|
@ -551,24 +644,33 @@ windowsZones:table(nofallback){
|
|||
TL{"Asia/Dili"}
|
||||
ZZ{"Etc/GMT-9"}
|
||||
}
|
||||
"Tomsk Standard Time"{
|
||||
001{"Asia/Tomsk"}
|
||||
RU{"Asia/Tomsk"}
|
||||
}
|
||||
"Tonga Standard Time"{
|
||||
001{"Pacific/Tongatapu"}
|
||||
KI{"Pacific/Enderbury"}
|
||||
TK{"Pacific/Fakaofo"}
|
||||
TO{"Pacific/Tongatapu"}
|
||||
ZZ{"Etc/GMT-13"}
|
||||
}
|
||||
"Transbaikal Standard Time"{
|
||||
001{"Asia/Chita"}
|
||||
RU{"Asia/Chita"}
|
||||
}
|
||||
"Turkey Standard Time"{
|
||||
001{"Europe/Istanbul"}
|
||||
TR{"Europe/Istanbul"}
|
||||
}
|
||||
"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"{
|
||||
001{"America/Phoenix"}
|
||||
CA{"America/Dawson_Creek America/Creston"}
|
||||
CA{"America/Dawson_Creek America/Creston America/Fort_Nelson"}
|
||||
MX{"America/Hermosillo"}
|
||||
US{"America/Phoenix"}
|
||||
ZZ{"Etc/GMT+7"}
|
||||
|
|
@ -576,7 +678,7 @@ windowsZones:table(nofallback){
|
|||
"UTC"{
|
||||
001{"Etc/GMT"}
|
||||
GL{"America/Danmarkshavn"}
|
||||
ZZ{"Etc/GMT"}
|
||||
ZZ{"Etc/GMT Etc/UTC"}
|
||||
}
|
||||
"UTC+12"{
|
||||
001{"Etc/GMT-12"}
|
||||
|
|
@ -588,12 +690,28 @@ windowsZones:table(nofallback){
|
|||
WF{"Pacific/Wallis"}
|
||||
ZZ{"Etc/GMT-12"}
|
||||
}
|
||||
"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-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"}
|
||||
|
|
@ -611,7 +729,7 @@ windowsZones:table(nofallback){
|
|||
}
|
||||
"Vladivostok Standard Time"{
|
||||
001{"Asia/Vladivostok"}
|
||||
RU{"Asia/Vladivostok Asia/Sakhalin Asia/Ust-Nera"}
|
||||
RU{"Asia/Vladivostok Asia/Ust-Nera"}
|
||||
}
|
||||
"W. Australia Standard Time"{
|
||||
001{"Australia/Perth"}
|
||||
|
|
@ -654,10 +772,14 @@ windowsZones:table(nofallback){
|
|||
SM{"Europe/San_Marino"}
|
||||
VA{"Europe/Vatican"}
|
||||
}
|
||||
"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"}
|
||||
KZ{"Asia/Oral Asia/Aqtau Asia/Aqtobe Asia/Atyrau Asia/Qyzylorda"}
|
||||
MV{"Indian/Maldives"}
|
||||
TF{"Indian/Kerguelen"}
|
||||
TJ{"Asia/Dushanbe"}
|
||||
|
|
@ -665,6 +787,10 @@ windowsZones:table(nofallback){
|
|||
UZ{"Asia/Tashkent Asia/Samarkand"}
|
||||
ZZ{"Etc/GMT-5"}
|
||||
}
|
||||
"West Bank Standard Time"{
|
||||
001{"Asia/Hebron"}
|
||||
PS{"Asia/Hebron Asia/Gaza"}
|
||||
}
|
||||
"West Pacific Standard Time"{
|
||||
001{"Pacific/Port_Moresby"}
|
||||
AQ{"Antarctica/DumontDUrville"}
|
||||
|
|
@ -676,7 +802,7 @@ windowsZones:table(nofallback){
|
|||
}
|
||||
"Yakutsk Standard Time"{
|
||||
001{"Asia/Yakutsk"}
|
||||
RU{"Asia/Yakutsk Asia/Chita Asia/Khandyga"}
|
||||
RU{"Asia/Yakutsk Asia/Khandyga"}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
3308
icu4c/source/data/misc/zoneinfo64.txt
Normal file → Executable file
3308
icu4c/source/data/misc/zoneinfo64.txt
Normal file → Executable file
File diff suppressed because it is too large
Load diff
|
|
@ -1196,31 +1196,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"},
|
||||
|
|
@ -1248,16 +1260,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"},
|
||||
|
|
@ -1268,6 +1280,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"},
|
||||
|
|
@ -1276,27 +1289,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"},
|
||||
|
|
@ -1304,12 +1327,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 */
|
||||
|
||||
};
|
||||
|
||||
|
|
@ -1973,6 +1996,8 @@ void TimeZoneTest::TestCanonicalID() {
|
|||
const char *alias;
|
||||
const char *zone;
|
||||
} excluded1[] = {
|
||||
{"Africa/Addis_Ababa", "Africa/Nairobi"},
|
||||
{"Africa/Asmera", "Africa/Nairobi"},
|
||||
{"Africa/Bamako", "Africa/Abidjan"},
|
||||
{"Africa/Bangui", "Africa/Lagos"},
|
||||
{"Africa/Banjul", "Africa/Abidjan"},
|
||||
|
|
@ -1981,10 +2006,13 @@ void TimeZoneTest::TestCanonicalID() {
|
|||
{"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"},
|
||||
|
|
@ -1996,30 +2024,41 @@ void TimeZoneTest::TestCanonicalID() {
|
|||
{"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/Anguilla"},
|
||||
{"America/Grenada", "America/Anguilla"},
|
||||
{"America/Guadeloupe", "America/Anguilla"},
|
||||
{"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/Anguilla"},
|
||||
{"America/Montserrat", "America/Anguilla"},
|
||||
{"America/Port_of_Spain", "America/Anguilla"},
|
||||
{"America/Shiprock", "America/Denver"}, // America/Shiprock is defined as a Link to America/Denver in tzdata
|
||||
{"America/St_Barthelemy", "America/Anguilla"},
|
||||
{"America/St_Kitts", "America/Anguilla"},
|
||||
{"America/St_Lucia", "America/Anguilla"},
|
||||
{"America/St_Thomas", "America/Anguilla"},
|
||||
{"America/St_Vincent", "America/Anguilla"},
|
||||
{"America/Tortola", "America/Anguilla"},
|
||||
{"America/Virgin", "America/Anguilla"},
|
||||
{"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"},
|
||||
|
|
@ -2036,8 +2075,13 @@ void TimeZoneTest::TestCanonicalID() {
|
|||
{"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}
|
||||
};
|
||||
|
||||
|
|
@ -2379,7 +2423,7 @@ void TimeZoneTest::TestGetWindowsID(void) {
|
|||
{"America/Indianapolis", "US Eastern Standard Time"}, // CLDR canonical name
|
||||
{"America/Indiana/Indianapolis", "US Eastern Standard Time"}, // tzdb canonical name
|
||||
{"Asia/Khandyga", "Yakutsk Standard Time"},
|
||||
{"Australia/Eucla", ""}, // No Windows ID mapping
|
||||
{"Australia/Eucla", "Aus Central W. Standard Time"}, // formerly no Windows ID mapping, now has one
|
||||
{"Bogus", ""},
|
||||
{0, 0},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
#*******************************************************************************
|
||||
api.report.version = 54
|
||||
api.report.prev.version = 53
|
||||
release.file.ver = 54_1_1
|
||||
api.doc.version = 54.1
|
||||
release.file.ver = 54_2
|
||||
api.doc.version = 54.2
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
<property name="icu4j.api.doc.title" value="ICU4J ${api.doc.version} API Specification"/>
|
||||
<property name="icu4j.api.doc.window.title" value="ICU4J ${api.doc.version}"/>
|
||||
<property name="icu4j.api.doc.header" value="ICU4J ${api.doc.version}"/>
|
||||
<property name="icu4j.api.doc.jdk.link" value="http://docs.oracle.com/javase/7/docs/api/"/>
|
||||
<property name="icu4j.api.doc.jdk.link" value="https://docs.oracle.com/javase/7/docs/api/"/>
|
||||
|
||||
<!-- directories -->
|
||||
<property name="release.dir" value="release"/>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
#* Copyright (C) 2010-2014, International Business Machines Corporation and *
|
||||
#* others. All Rights Reserved. *
|
||||
#*******************************************************************************
|
||||
icu4j.plugin.impl.version.string=54.1.0
|
||||
icu4j.plugin.impl.version.string=54.2.0
|
||||
copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2014. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.
|
||||
icu4j.data.version.number=54
|
||||
|
|
|
|||
|
|
@ -525,8 +525,8 @@ public final class VersionInfo implements Comparable<VersionInfo>
|
|||
UNICODE_6_3 = getInstance(6, 3, 0, 0);
|
||||
UNICODE_7_0 = getInstance(7, 0, 0, 0);
|
||||
|
||||
ICU_VERSION = getInstance(54, 1, 1, 0);
|
||||
ICU_DATA_VERSION = getInstance(54, 1, 0, 0);
|
||||
ICU_VERSION = getInstance(54, 2, 0, 0);
|
||||
ICU_DATA_VERSION = getInstance(54, 2, 0, 0);
|
||||
UNICODE_VERSION = UNICODE_7_0;
|
||||
|
||||
UCOL_RUNTIME_VERSION = getInstance(8);
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
# Version numbers, etc.
|
||||
icu4j.spec.version = 54
|
||||
icu4j.impl.version = 54.1.1
|
||||
icu4j.impl.version = 54.2
|
||||
icu4j.data.version = 54
|
||||
current.year = 2014
|
||||
default.exec.env = J2SE-1.5
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:176d69bb42bb1e6b2e32f70b7926468ec71f8b593d43c6c570237a935905634e
|
||||
size 11809750
|
||||
oid sha256:39ea99edec1ce59168c0dabfa2f58386c43db38c49025d5508c753e8fff5f5a6
|
||||
size 11809464
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f58b8b830db226d44f8c2b9605079fc9aaf9b811850ab9cef1d629adced5ce21
|
||||
size 90610
|
||||
oid sha256:0c1f16445aa3975f74c01df917cae9141fcb409e6a77b1c41cc322f152b570ce
|
||||
size 94310
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:106f8fb6e409df5e4987d22739ed1ae23cb95ef844515e98e3dc67ec03b98ff7
|
||||
size 812400
|
||||
oid sha256:07d5373a18d9f9fc49d61bea26feb45ec77e3c5fd5426f573a713c5e1de085fa
|
||||
size 812391
|
||||
|
|
|
|||
|
|
@ -1475,6 +1475,8 @@ public class TimeZoneTest extends TestFmwk
|
|||
// Some canonical IDs in CLDR are defined as "Link"
|
||||
// in Olson tzdata.
|
||||
final String[][] excluded1 = {
|
||||
{"Africa/Addis_Ababa", "Africa/Nairobi"},
|
||||
{"Africa/Asmera", "Africa/Nairobi"},
|
||||
{"Africa/Bamako", "Africa/Abidjan"},
|
||||
{"Africa/Bangui", "Africa/Lagos"},
|
||||
{"Africa/Banjul", "Africa/Abidjan"},
|
||||
|
|
@ -1483,10 +1485,13 @@ public class TimeZoneTest extends TestFmwk
|
|||
{"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"},
|
||||
|
|
@ -1498,30 +1503,41 @@ public class TimeZoneTest extends TestFmwk
|
|||
{"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/Anguilla"},
|
||||
{"America/Grenada", "America/Anguilla"},
|
||||
{"America/Guadeloupe", "America/Anguilla"},
|
||||
{"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/Anguilla"},
|
||||
{"America/Montserrat", "America/Anguilla"},
|
||||
{"America/Port_of_Spain", "America/Anguilla"},
|
||||
{"America/Shiprock", "America/Denver"}, // America/Shiprock is defined as a Link to America/Denver in tzdata
|
||||
{"America/St_Barthelemy", "America/Anguilla"},
|
||||
{"America/St_Kitts", "America/Anguilla"},
|
||||
{"America/St_Lucia", "America/Anguilla"},
|
||||
{"America/St_Thomas", "America/Anguilla"},
|
||||
{"America/St_Vincent", "America/Anguilla"},
|
||||
{"America/Tortola", "America/Anguilla"},
|
||||
{"America/Virgin", "America/Anguilla"},
|
||||
{"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"},
|
||||
|
|
@ -1538,8 +1554,13 @@ public class TimeZoneTest extends TestFmwk
|
|||
{"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,
|
||||
|
|
@ -2216,7 +2237,7 @@ public class TimeZoneTest extends TestFmwk
|
|||
{"America/Indianapolis", "US Eastern Standard Time"}, // CLDR canonical name
|
||||
{"America/Indiana/Indianapolis", "US Eastern Standard Time"}, // tzdb canonical name
|
||||
{"Asia/Khandyga", "Yakutsk Standard Time"},
|
||||
{"Australia/Eucla", null}, // No Windows ID mapping
|
||||
{"Australia/Eucla", "Aus Central W. Standard Time"}, // Now Windows does have a mapping
|
||||
{"Bogus", null},
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
package com.ibm.icu.dev.test.util;
|
||||
|
||||
public class DebugUtilitiesData extends Object {
|
||||
public static final String ICU4C_VERSION="54.1";
|
||||
public static final String ICU4C_VERSION="54.2";
|
||||
public static final int UDebugEnumType = 0;
|
||||
public static final int UCalendarDateFields = 1;
|
||||
public static final int UCalendarMonths = 2;
|
||||
|
|
|
|||
34
icu4j/pom.xml
Normal file → Executable file
34
icu4j/pom.xml
Normal file → Executable 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-2014, 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>54.1.1</version>
|
||||
<version>54.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,13 +123,14 @@
|
|||
</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>
|
||||
|
|
|
|||
|
|
@ -14,14 +14,13 @@ h4.doc { text-decoration: underline }
|
|||
<body style="background-color: rgb(255, 255, 255);" lang="EN-US"
|
||||
link="#0000ff" vlink="#800080">
|
||||
<h1>International Components for Unicode for Java (ICU4J)</h1>
|
||||
<h2>Read Me for ICU4J 54.1.1</h2>
|
||||
(Last Update: 2014-Oct-9)
|
||||
<h2>Read Me for ICU4J 54.2</h2>
|
||||
(Last Update: 2019-Apr-10)
|
||||
<hr size="2" width="100%">
|
||||
|
||||
<p>
|
||||
<b>Note:</b> This is an update release of ICU4J 54.1. This release fixes
|
||||
a critical problem on JRE 5 and 6 caused by a deficient build script. It
|
||||
does not include any new APIs, functional bug fixes and data changes.
|
||||
<b>Note:</b> This is an update release of ICU4J 54. This release contains bug
|
||||
fixes and updated data, but does not introduce any new APIs for functionatlites.
|
||||
<!-- <b>Note:</b> This is a development release of ICU4J 54.
|
||||
The contents of this document may not reflect the recent changes done
|
||||
for ICU 54 development. This milestone is intended for those wishing
|
||||
|
|
@ -142,6 +141,9 @@ about new features in this release.
|
|||
The list of API changes since the previous ICU4J release is available
|
||||
<a href="http://source.icu-project.org/repos/icu/icu4j/tags/release-54-rc/APIChangeReport.html">here</a>.</p>
|
||||
|
||||
<h4>Summary of updates in 54.2 (2019-04-10)</h4>
|
||||
Added support for Japanese era Reiwa.
|
||||
|
||||
<h4>Summary of updates in 54.1.1 (2014-10-09)</h4>
|
||||
Fixed a resource loading problem on JRE 5 and 6. The ICU4J class files
|
||||
in the previous release were compiled with Java 7 system library. The
|
||||
|
|
@ -819,7 +821,7 @@ how to configure Eclipse</a> to build and develop ICU4J on Eclipse IDE.</p>
|
|||
page <a href="http://userguide.icu-project.org/icu4j-locale-service-provider">ICU4J Locale
|
||||
Service Provider</a>.</p>
|
||||
|
||||
<p><b>Note:</b> ICU4J 54.1 does not support JDK 8 javadoc tool yet. The build targets "doc" and
|
||||
<p><b>Note:</b> ICU4J 54 does not support JDK 8 javadoc tool yet. The build targets "doc" and
|
||||
"docs" will fail when JDK 8 javadoc tool is used.</p>
|
||||
|
||||
<h2 class="doc"><a name="HowToModularize"></a>How to modularize ICU4J</h2>
|
||||
|
|
@ -1005,6 +1007,7 @@ in the build output directory by some build targets.
|
|||
<h3><a name="resourcesICU4C">Building ICU4J Resources from ICU4C</a></h3>
|
||||
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 54.2</i><br>
|
||||
<I> Note: This procedure assumes that all 3 sources are present</I>
|
||||
<ol>
|
||||
<li>Checkout or download CLDR version 'release-26'</li>
|
||||
|
|
@ -1021,12 +1024,12 @@ ICU4J data is built by ICU4C tools. Please see "icu4j-readme.txt" in <I>$icu4c_r
|
|||
</ol>
|
||||
|
||||
<h2 class="doc"><a name="timezone"></a>About ICU4J Time Zone</h2>
|
||||
<p>ICU4J 54 RC includes time zone data version 2014h, 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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue