ICU-10898 tzdata2014f updates to ICU4C
X-SVN-Rev: 36138
This commit is contained in:
Yoshito Umaoka
parent
2e76b99357
commit
0de2d6e411
@ -105,6 +105,9 @@ metaZones:table(nofallback){
|
||||
Anadyr{
|
||||
001{"Asia/Anadyr"}
|
||||
}
|
||||
Apia{
|
||||
001{"Pacific/Apia"}
|
||||
}
|
||||
Aqtau{
|
||||
001{"Asia/Aqtau"}
|
||||
}
|
||||
@ -211,9 +214,6 @@ metaZones:table(nofallback){
|
||||
001{"Pacific/Saipan"}
|
||||
GU{"Pacific/Guam"}
|
||||
}
|
||||
Changbai{
|
||||
001{"Asia/Harbin"}
|
||||
}
|
||||
Chatham{
|
||||
001{"Pacific/Chatham"}
|
||||
}
|
||||
@ -315,6 +315,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"}
|
||||
@ -437,9 +441,6 @@ metaZones:table(nofallback){
|
||||
Karachi{
|
||||
001{"Asia/Karachi"}
|
||||
}
|
||||
Kashgar{
|
||||
001{"Asia/Kashgar"}
|
||||
}
|
||||
Kazakhstan_Eastern{
|
||||
001{"Asia/Almaty"}
|
||||
}
|
||||
@ -477,9 +478,6 @@ metaZones:table(nofallback){
|
||||
Line_Islands{
|
||||
001{"Pacific/Kiritimati"}
|
||||
}
|
||||
Long_Shu{
|
||||
001{"Asia/Chongqing"}
|
||||
}
|
||||
Lord_Howe{
|
||||
001{"Australia/Lord_Howe"}
|
||||
}
|
||||
@ -614,7 +612,7 @@ metaZones:table(nofallback){
|
||||
001{"Asia/Samarkand"}
|
||||
}
|
||||
Samoa{
|
||||
001{"Pacific/Apia"}
|
||||
001{"Pacific/Pago_Pago"}
|
||||
}
|
||||
Seychelles{
|
||||
001{"Indian/Mahe"}
|
||||
@ -2717,6 +2715,18 @@ metaZones:table(nofallback){
|
||||
"India",
|
||||
}
|
||||
}
|
||||
"Asia:Chita"{
|
||||
{
|
||||
"Yakutsk",
|
||||
"1970-01-01 00:00",
|
||||
"2014-10-25 16:00",
|
||||
}
|
||||
{
|
||||
"Irkutsk",
|
||||
"2014-10-25 16:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
"Asia:Choibalsan"{
|
||||
{
|
||||
"Mongolia",
|
||||
@ -2729,18 +2739,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",
|
||||
@ -2821,18 +2819,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",
|
||||
@ -2904,18 +2890,6 @@ 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",
|
||||
@ -3018,6 +2992,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",
|
||||
}
|
||||
}
|
||||
@ -3156,6 +3135,13 @@ metaZones:table(nofallback){
|
||||
"Singapore",
|
||||
}
|
||||
}
|
||||
"Asia:Srednekolymsk"{
|
||||
{
|
||||
"Magadan",
|
||||
"1970-01-01 00:00",
|
||||
"2014-10-25 14:00",
|
||||
}
|
||||
}
|
||||
"Asia:Taipei"{
|
||||
{
|
||||
"Taipei",
|
||||
@ -3215,13 +3201,6 @@ metaZones:table(nofallback){
|
||||
"Asia:Urumqi"{
|
||||
{
|
||||
"Urumqi",
|
||||
"1970-01-01 00:00",
|
||||
"1980-04-30 18:00",
|
||||
}
|
||||
{
|
||||
"China",
|
||||
"1980-04-30 18:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
"Asia:Ust-Nera"{
|
||||
@ -3572,6 +3551,16 @@ metaZones:table(nofallback){
|
||||
"1991-03-30 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"{
|
||||
{
|
||||
@ -3655,6 +3644,11 @@ metaZones:table(nofallback){
|
||||
"1991-03-30 23:00",
|
||||
"2011-03-27 00:00",
|
||||
}
|
||||
{
|
||||
"Europe_Further_Eastern",
|
||||
"2011-03-27 00:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
"Europe:Monaco"{
|
||||
{
|
||||
@ -3719,6 +3713,21 @@ metaZones:table(nofallback){
|
||||
{
|
||||
"Kuybyshev",
|
||||
"1970-01-01 00:00",
|
||||
"1989-03-25 22:00",
|
||||
}
|
||||
{
|
||||
"Moscow",
|
||||
"1989-03-25 22:00",
|
||||
"1991-03-30 23:00",
|
||||
}
|
||||
{
|
||||
"Europe_Eastern",
|
||||
"1991-03-30 23:00",
|
||||
"1991-09-29 00:00",
|
||||
}
|
||||
{
|
||||
"Kuybyshev",
|
||||
"1991-09-29 00:00",
|
||||
"1991-10-20 00:00",
|
||||
}
|
||||
{
|
||||
@ -3858,6 +3867,13 @@ metaZones:table(nofallback){
|
||||
"Europe:Volgograd"{
|
||||
{
|
||||
"Volgograd",
|
||||
"1970-01-01 00:00",
|
||||
"1992-03-28 22:00",
|
||||
}
|
||||
{
|
||||
"Moscow",
|
||||
"1992-03-28 22:00",
|
||||
"9999-12-31 23:59",
|
||||
}
|
||||
}
|
||||
"Europe:Warsaw"{
|
||||
@ -3954,14 +3970,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"{
|
||||
|
||||
@ -30,10 +30,13 @@ timezoneTypes:table(nofallback){
|
||||
"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"}
|
||||
@ -366,8 +369,8 @@ timezoneTypes:table(nofallback){
|
||||
"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"}
|
||||
@ -375,7 +378,6 @@ timezoneTypes:table(nofallback){
|
||||
"Asia:Dubai"{"aedxb"}
|
||||
"Asia:Dushanbe"{"tjdyu"}
|
||||
"Asia:Gaza"{"gaza"}
|
||||
"Asia:Harbin"{"cnhrb"}
|
||||
"Asia:Hebron"{"hebron"}
|
||||
"Asia:Hong_Kong"{"hkhkg"}
|
||||
"Asia:Hovd"{"mnhvd"}
|
||||
@ -386,7 +388,6 @@ timezoneTypes:table(nofallback){
|
||||
"Asia:Kabul"{"afkbl"}
|
||||
"Asia:Kamchatka"{"rupkc"}
|
||||
"Asia:Karachi"{"pkkhi"}
|
||||
"Asia:Kashgar"{"cnkhg"}
|
||||
"Asia:Katmandu"{"npktm"}
|
||||
"Asia:Khandyga"{"rukhndg"}
|
||||
"Asia:Krasnoyarsk"{"rukra"}
|
||||
@ -416,6 +417,7 @@ timezoneTypes:table(nofallback){
|
||||
"Asia:Seoul"{"krsel"}
|
||||
"Asia:Shanghai"{"cnsha"}
|
||||
"Asia:Singapore"{"sgsin"}
|
||||
"Asia:Srednekolymsk"{"rusred"}
|
||||
"Asia:Taipei"{"twtpe"}
|
||||
"Asia:Tashkent"{"uztas"}
|
||||
"Asia:Tbilisi"{"getbs"}
|
||||
|
||||
@ -109,6 +109,7 @@ windowsZones:table(nofallback){
|
||||
"Central Asia Standard Time"{
|
||||
001{"Asia/Almaty"}
|
||||
AQ{"Antarctica/Vostok"}
|
||||
CN{"Asia/Urumqi"}
|
||||
IO{"Indian/Chagos"}
|
||||
KG{"Asia/Bishkek"}
|
||||
KZ{"Asia/Almaty Asia/Qyzylorda"}
|
||||
@ -167,7 +168,7 @@ windowsZones:table(nofallback){
|
||||
}
|
||||
"China Standard Time"{
|
||||
001{"Asia/Shanghai"}
|
||||
CN{"Asia/Shanghai Asia/Chongqing Asia/Harbin Asia/Kashgar Asia/Urumqi"}
|
||||
CN{"Asia/Shanghai"}
|
||||
HK{"Asia/Hong_Kong"}
|
||||
MO{"Asia/Macau"}
|
||||
}
|
||||
@ -323,7 +324,7 @@ windowsZones:table(nofallback){
|
||||
}
|
||||
"Magadan Standard Time"{
|
||||
001{"Asia/Magadan"}
|
||||
RU{"Asia/Magadan Asia/Anadyr Asia/Kamchatka"}
|
||||
RU{"Asia/Magadan Asia/Anadyr Asia/Kamchatka Asia/Srednekolymsk"}
|
||||
}
|
||||
"Mauritius Standard Time"{
|
||||
001{"Indian/Mauritius"}
|
||||
@ -670,7 +671,7 @@ windowsZones:table(nofallback){
|
||||
}
|
||||
"Yakutsk Standard Time"{
|
||||
001{"Asia/Yakutsk"}
|
||||
RU{"Asia/Yakutsk Asia/Khandyga"}
|
||||
RU{"Asia/Yakutsk Asia/Chita Asia/Khandyga"}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2569,8 +2569,8 @@ void DateFormatTest::TestTimeZoneDisplayName()
|
||||
{ "en", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "India Standard Time", "Asia/Calcutta" },
|
||||
|
||||
// Proper CLDR primary zone support #9733
|
||||
{ "en", "Asia/Shanghai", "2013-01-01T00:00:00Z", "VVVV", "China Time", "Asia/Shanghai" },
|
||||
{ "en", "Asia/Harbin", "2013-01-01T00:00:00Z", "VVVV", "Harbin Time", "Asia/Harbin" },
|
||||
{ "en", "America/Santiago", "2013-01-01T00:00:00Z", "VVVV", "Chile Time", "America/Santiago" },
|
||||
{ "en", "Pacific/Easter", "2013-01-01T00:00:00Z", "VVVV", "Easter Time", "Pacific/Easter" },
|
||||
|
||||
// ==========
|
||||
|
||||
@ -2784,10 +2784,6 @@ void DateFormatTest::TestTimeZoneDisplayName()
|
||||
{ "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "\\u5370\\u5ea6\\u65f6\\u95f4", "Asia/Calcutta" },
|
||||
{ "zh", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "\\u5370\\u5ea6\\u65f6\\u95f4", "Asia/Calcutta" },
|
||||
|
||||
// Proper CLDR primary zone support #9733
|
||||
{ "zh", "Asia/Shanghai", "2013-01-01T00:00:00Z", "VVVV", "\\u4e2d\\u56fd\\u65f6\\u95f4", "Asia/Shanghai" },
|
||||
{ "zh", "Asia/Harbin", "2013-01-01T00:00:00Z", "VVVV", "\\u54c8\\u5c14\\u6ee8\\u65f6\\u95f4", "Asia/Harbin" },
|
||||
|
||||
// ==========
|
||||
|
||||
{ "hi", "America/Los_Angeles", "2004-01-15T00:00:00Z", "Z", "-0800", "-8:00" },
|
||||
@ -3590,7 +3586,7 @@ void DateFormatTest::Test6880() {
|
||||
if (failure(status, "construct GregorianCalendar", TRUE)) return;
|
||||
|
||||
gcal.clear();
|
||||
gcal.set(1910, UCAL_JULY, 1, 12, 00); // offset 8:05:57
|
||||
gcal.set(1900, UCAL_JULY, 1, 12, 00); // offset 8:05:43
|
||||
d1 = gcal.getTime(status);
|
||||
|
||||
gcal.clear();
|
||||
@ -3600,7 +3596,7 @@ void DateFormatTest::Test6880() {
|
||||
gcal.clear();
|
||||
gcal.set(1970, UCAL_JANUARY, 1, 12, 00);
|
||||
dexp2 = gcal.getTime(status);
|
||||
dexp1 = dexp2 - (5*60 + 57)*1000; // subtract 5m57s
|
||||
dexp1 = dexp2 - (5*60 + 43)*1000; // subtract 5m43s
|
||||
|
||||
if (U_FAILURE(status)) {
|
||||
errln("FAIL: Gregorian calendar error");
|
||||
|
||||
@ -335,6 +335,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;
|
||||
@ -458,6 +492,11 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
if (*tzid == "Pacific/Apia" && uprv_strcmp(PATTERNS[patidx], "vvvv") == 0
|
||||
&& log.logKnownIssue("11052", "Ambiguous zone name - Samoa Time")) {
|
||||
continue;
|
||||
}
|
||||
|
||||
BasicTimeZone *tz = (BasicTimeZone*) TimeZone::createTimeZone(*tzid);
|
||||
sdf->setTimeZone(*tz);
|
||||
|
||||
@ -527,7 +566,9 @@ public:
|
||||
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]);
|
||||
// Timebomb for TZData update
|
||||
if (expectedRoundTrip[testidx]) {
|
||||
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);
|
||||
|
||||
@ -1975,7 +1975,16 @@ void TimeZoneTest::TestCanonicalID() {
|
||||
const char *alias;
|
||||
const char *zone;
|
||||
} excluded1[] = {
|
||||
{"Africa/Bamako", "Africa/Abidjan"},
|
||||
{"Africa/Banjul", "Africa/Abidjan"},
|
||||
{"Africa/Conakry", "Africa/Abidjan"},
|
||||
{"Africa/Dakar", "Africa/Abidjan"},
|
||||
{"Africa/Freetown", "Africa/Abidjan"},
|
||||
{"Africa/Khartoum", "Africa/Juba"},
|
||||
{"Africa/Lome", "Africa/Abidjan"},
|
||||
{"Africa/Nouakchott", "Africa/Abidjan"},
|
||||
{"Africa/Ouagadougou", "Africa/Abidjan"},
|
||||
{"Africa/Sao_Tome", "Africa/Abidjan"},
|
||||
{"America/Shiprock", "America/Denver"}, // America/Shiprock is defined as a Link to America/Denver in tzdata
|
||||
{"America/Dominica", "America/Anguilla"},
|
||||
{"America/Grenada", "America/Anguilla"},
|
||||
@ -1995,6 +2004,7 @@ void TimeZoneTest::TestCanonicalID() {
|
||||
{"America/Lower_Princes", "America/Aruba"},
|
||||
{"Antarctica/South_Pole", "Antarctica/McMurdo"},
|
||||
{"Atlantic/Jan_Mayen", "Europe/Oslo"},
|
||||
{"Atlantic/St_Helena", "Africa/Abidjan"},
|
||||
{"Arctic/Longyearbyen", "Europe/Oslo"},
|
||||
{"Europe/Busingen", "Europe/Zurich"},
|
||||
{"Europe/Guernsey", "Europe/London"},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user