organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-10898 Updated tzdbNames.txt based on tzdata2014f.

Browse source 
X-SVN-Rev: 36144
This commit is contained in:
Yoshito Umaoka 2014-08-12 16:37:22 +00:00
parent 5cf61097e7
commit 37d4e68cd4
2 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
icu4c/source/data/zone/tzdbNames.txt
View file

@ -12,6 +12,7 @@ tzdbNames{
"meta:Acre"{
sd{"ACST"}
ss{"ACT"}
parseRegions{"BR"}
}
"meta:Afghanistan"{
ss{"AFT"}
@ -76,6 +77,10 @@ tzdbNames{
sd{"ANAST"}
ss{"ANAT"}
}
"meta:Apia"{
sd{"WSDT"}
ss{"WST"}
}
"meta:Aqtau"{
sd{"AQTST"}
ss{"AQTT"}
@ -113,22 +118,20 @@ tzdbNames{
ss{"AST"}
}
"meta:Australia_Central"{
sd{"CST"}
ss{"CST"}
parseRegions{"AU"}
sd{"ACDT"}
ss{"ACST"}
}
"meta:Australia_CentralWestern"{
sd{"CWST"}
ss{"CWST"}
sd{"ACWDT"}
ss{"ACWST"}
}
"meta:Australia_Eastern"{
sd{"EST"}
ss{"EST"}
parseRegions{"AU"}
sd{"AEDT"}
ss{"AEST"}
}
"meta:Australia_Western"{
sd{"WST"}
ss{"WST"}
sd{"AWDT"}
ss{"AWST"}
}
"meta:Azerbaijan"{
sd{"AZT"}
@ -378,9 +381,6 @@ tzdbNames{
"meta:Karachi"{
ss{"KART"}
}
"meta:Kashgar"{
ss{"KAST"}
}
"meta:Kazakhstan_Eastern"{
sd{"ALMST"}
ss{"ALMT"}
@ -424,9 +424,6 @@ tzdbNames{
"meta:Line_Islands"{
ss{"LINT"}
}
"meta:Long_Shu"{
ss{"LONT"}
}
"meta:Lord_Howe"{
ss{"LHST"}
}
@ -659,7 +656,7 @@ tzdbNames{
ss{"UYT"}
}
"meta:Urumqi"{
ss{"URUT"}
ss{"XJT"}
}
"meta:Uzbekistan"{
sd{"UZST"}

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

@ -807,8 +807,8 @@ TimeZoneFormatTest::TestParse(void) {
{"CST", 0, "zh_CN", UTZFMT_STYLE_SPECIFIC_SHORT,
UTZFMT_PARSE_OPTION_TZ_DATABASE_ABBREVIATIONS, "Asia/Shanghai", 3, UTZFMT_TIME_TYPE_STANDARD},
{"EST", 0, "en_AU", UTZFMT_STYLE_SPECIFIC_SHORT,
UTZFMT_PARSE_OPTION_TZ_DATABASE_ABBREVIATIONS, "Australia/Sydney", 3, UTZFMT_TIME_TYPE_UNKNOWN},
{"AEST", 0, "en_AU", UTZFMT_STYLE_SPECIFIC_SHORT,
UTZFMT_PARSE_OPTION_TZ_DATABASE_ABBREVIATIONS, "Australia/Sydney", 4, UTZFMT_TIME_TYPE_STANDARD},
{"AST", 0, "ar_SA", UTZFMT_STYLE_SPECIFIC_SHORT,
UTZFMT_PARSE_OPTION_TZ_DATABASE_ABBREVIATIONS, "Asia/Riyadh", 3, UTZFMT_TIME_TYPE_STANDARD},
@ -1185,7 +1185,7 @@ TimeZoneFormatTest::TestFormatTZDBNames(void) {
"Australia/Sydney",
dateJan,
UTZFMT_STYLE_SPECIFIC_SHORT,
"EST",
"AEDT",
UTZFMT_TIME_TYPE_DAYLIGHT
},
{
@ -1193,7 +1193,7 @@ TimeZoneFormatTest::TestFormatTZDBNames(void) {
"Australia/Sydney",
dateJul,
UTZFMT_STYLE_SPECIFIC_SHORT,
"EST",
"AEST",
UTZFMT_TIME_TYPE_STANDARD
},