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

ICU-5495 update to tzdata2006o and support the Etc/Unknown time zone and the SystemV/XXX aliases

Browse source 
X-SVN-Rev: 20632
This commit is contained in:
Markus Scherer 2006-11-07 00:16:02 +00:00
parent ca17961558
commit 18645b2f6d
3 changed files with 500 additions and 412 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

847
icu4c/source/data/misc/zoneinfo.txt
View file

File diff suppressed because it is too large Load diff

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

@ -510,6 +510,9 @@ TimeZoneTest::TestGetAvailableIDs913()
* definition. This test has been updated to reflect this.
* 12/3/99 aliu
*
* Added tests for additional zones and aliases from the icuzones file.
* Markus Scherer 2006-nov-06
*
* [srl - from java - 7/5/1998]
* @bug 4130885
* Certain short zone IDs, used since 1.1.x, are incorrect.
@ -613,6 +616,30 @@ void TimeZoneTest::TestShortZoneIDs()
// "NST", 720, FALSE,
// As of bug 4130885, fix NST (New Zealand)
{"NST", 720, TRUE}, // Pacific/Auckland
// From icuzones:
{"Etc/Unknown", 0, FALSE},
{"SystemV/AST4ADT", -240, TRUE},
{"SystemV/EST5EDT", -300, TRUE},
{"SystemV/CST6CDT", -360, TRUE},
{"SystemV/MST7MDT", -420, TRUE},
{"SystemV/PST8PDT", -480, TRUE},
{"SystemV/YST9YDT", -540, TRUE},
{"SystemV/AST4", -240, FALSE},
#if U_ICU_VERSION_MAJOR_NUM>3 || U_ICU_VERSION_MINOR_NUM>=8
// CLDR 1.4.1 has an alias from SystemV/EST5 to America/Indianapolis
// which is incorrect because Indiana has started to observe DST.
// Re-enable this test once CLDR has fixed the alias.
// (For example, it could alias SystemV/EST5 to Etc/GMT+5.)
{"SystemV/EST5", -300, FALSE},
#endif
{"SystemV/CST6", -360, FALSE},
{"SystemV/MST7", -420, FALSE},
{"SystemV/PST8", -480, FALSE},
{"SystemV/YST9", -540, FALSE},
{"SystemV/HST10", -600, FALSE},
{"",0,FALSE}
};

38
icu4c/source/tools/tzcode/icuzones Normal file
View file

@ -0,0 +1,38 @@
######################################################################
# Copyright (C) 2006, International Business Machines
# Corporation and others. All Rights Reserved.
######################################################################
# This is an ICU-specific file with the same format as regular
# tzdata time zone files, for consistent parsing by the tools that
# turn "Olson" tzdata into ICU's zoneinfo.txt.
# The purpose of this file is to give ICU a superset of the time zones
# that are in CLDR.
# It would be possible with the existing tz.alias file to add more
# aliases, but it is not possible to add a new time zone like
# Etc/Unknown which wants to work like Etc/GMT but not be an alias.
# The aliases in tz.alias could probably be moved here.
# Add Etc/Unknown, defined by CLDR. Give it Etc/GMT behavior.
# Zone NAME GMTOFF RULES FORMAT
Zone Etc/Unknown 0 - Unknown
# Add SystemV/XXX time zones as aliases according to CLDR.
# The Olson systemv file has these commented out.
# An alternative to making these aliases according to CLDR would be
# to copy and un-comment the data from the systemv file.
# Link canonical alias
Link America/Halifax SystemV/AST4ADT
Link America/New_York SystemV/EST5EDT
Link America/Chicago SystemV/CST6CDT
Link America/Denver SystemV/MST7MDT
Link America/Los_Angeles SystemV/PST8PDT
Link America/Anchorage SystemV/YST9YDT
Link America/Puerto_Rico SystemV/AST4
Link America/Indianapolis SystemV/EST5
Link America/Regina SystemV/CST6
Link America/Phoenix SystemV/MST7
Link Pacific/Pitcairn SystemV/PST8
Link Pacific/Gambier SystemV/YST9
Link Pacific/Honolulu SystemV/HST10