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

ICU-8823 Merging tzdata2011k with the fix for #8864 (r30781) from trunk to maint-4-8.

Browse source 
X-SVN-Rev: 30847
This commit is contained in:
Yoshito Umaoka 2011-10-18 23:04:51 +00:00
parent 4e2cfda822
commit 4ef34e6655
4 changed files with 1556 additions and 1538 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
source/data/misc/metaZones.txt
View file

@ -888,6 +888,18 @@ metaZones:table(nofallback){
"Africa_Southern",
}
}
"Africa:Juba"{
{
"Africa_Central",
"1970-01-01 00:00",
"2000-01-15 10:00",
}
{
"Africa_Eastern",
"2000-01-15 10:00",
"9999-12-31 23:59",
}
}
"Africa:Kampala"{
{
"Africa_Eastern",
@ -2229,6 +2241,11 @@ metaZones:table(nofallback){
{
"America_Eastern",
"2006-10-29 07:00",
"2007-03-11 08:00",
}
{
"America_Central",
"2007-03-11 08:00",
"9999-12-31 23:59",
}
}
@ -2769,6 +2786,18 @@ metaZones:table(nofallback){
"9999-12-31 23:59",
}
}
"Asia:Hebron"{
{
"Israel",
"1970-01-01 00:00",
"1995-12-31 22:00",
}
{
"Europe_Eastern",
"1995-12-31 22:00",
"9999-12-31 23:59",
}
}
"Asia:Hong_Kong"{
{
"Hong_Kong",
@ -3467,7 +3496,7 @@ metaZones:table(nofallback){
{
"Europe_Eastern",
"1990-06-30 23:00",
"9999-12-31 23:59",
"2011-03-27 00:00",
}
}
"Europe:Lisbon"{
@ -3538,7 +3567,7 @@ metaZones:table(nofallback){
{
"Europe_Eastern",
"1991-03-30 23:00",
"9999-12-31 23:59",
"2011-03-27 00:00",
}
}
"Europe:Monaco"{
@ -3646,7 +3675,7 @@ metaZones:table(nofallback){
{
"Europe_Eastern",
"1997-03-30 01:00",
"9999-12-31 23:59",
"2011-03-27 01:00",
}
}
"Europe:Skopje"{
@ -3695,7 +3724,7 @@ metaZones:table(nofallback){
{
"Europe_Eastern",
"1991-03-31 02:00",
"9999-12-31 23:59",
"2011-03-27 01:00",
}
}
"Europe:Vaduz"{
@ -3759,7 +3788,7 @@ metaZones:table(nofallback){
{
"Europe_Eastern",
"1991-03-30 23:00",
"9999-12-31 23:59",
"2011-03-27 01:00",
}
}
"Europe:Zurich"{

2
source/data/misc/timezoneTypes.txt
View file

@ -163,6 +163,7 @@ timezoneTypes:table(nofallback){
"Africa:Gaborone"{"bwgbe"}
"Africa:Harare"{"zwhre"}
"Africa:Johannesburg"{"zajnb"}
"Africa:Juba"{"ssjub"}
"Africa:Kampala"{"ugkla"}
"Africa:Khartoum"{"sdkrt"}
"Africa:Kigali"{"rwkgl"}
@ -371,6 +372,7 @@ timezoneTypes:table(nofallback){
"Asia:Dushanbe"{"tjdyu"}
"Asia:Gaza"{"gaza"}
"Asia:Harbin"{"cnhrb"}
"Asia:Hebron"{"hebron"}
"Asia:Hong_Kong"{"hkhkg"}
"Asia:Hovd"{"mnhvd"}
"Asia:Irkutsk"{"ruikt"}

3051
source/data/misc/zoneinfo64.txt
View file

File diff suppressed because it is too large Load diff

2
source/i18n/locdspnm.cpp
View file

@ -120,7 +120,7 @@ ICUDataTable::get(const char* tableKey, const char* subTableKey, const char* ite
const UChar *s = uloc_getTableStringWithFallback(path, locale.getName(),
tableKey, subTableKey, itemKey,
&len, &status);
if (U_SUCCESS(status)) {
if (U_SUCCESS(status) && len > 0) {
return result.setTo(s, len);
}
return result.setTo(UnicodeString(itemKey, -1, US_INV));