Index: source/test/testdata/metaZones.txt |
diff --git a/source/data/misc/metaZones.txt b/source/test/testdata/metaZones.txt |
similarity index 98% |
copy from source/data/misc/metaZones.txt |
copy to source/test/testdata/metaZones.txt |
index 80e963a71dbfd20d446abfcba7e6d8a2c240926a..9efa9eafcb8d12bff5a9ccefef6c74ad4711d1b5 100644 |
--- a/source/data/misc/metaZones.txt |
+++ b/source/test/testdata/metaZones.txt |
@@ -105,9 +105,6 @@ metaZones:table(nofallback){ |
Anadyr{ |
001{"Asia/Anadyr"} |
} |
- Apia{ |
- 001{"Pacific/Apia"} |
- } |
Aqtau{ |
001{"Asia/Aqtau"} |
} |
@@ -214,6 +211,9 @@ metaZones:table(nofallback){ |
001{"Pacific/Saipan"} |
GU{"Pacific/Guam"} |
} |
+ Changbai{ |
+ 001{"Asia/Harbin"} |
+ } |
Chatham{ |
001{"Pacific/Chatham"} |
} |
@@ -315,10 +315,6 @@ 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"} |
@@ -441,6 +437,9 @@ metaZones:table(nofallback){ |
Karachi{ |
001{"Asia/Karachi"} |
} |
+ Kashgar{ |
+ 001{"Asia/Kashgar"} |
+ } |
Kazakhstan_Eastern{ |
001{"Asia/Almaty"} |
} |
@@ -478,6 +477,9 @@ metaZones:table(nofallback){ |
Line_Islands{ |
001{"Pacific/Kiritimati"} |
} |
+ Long_Shu{ |
+ 001{"Asia/Chongqing"} |
+ } |
Lord_Howe{ |
001{"Australia/Lord_Howe"} |
} |
@@ -612,7 +614,7 @@ metaZones:table(nofallback){ |
001{"Asia/Samarkand"} |
} |
Samoa{ |
- 001{"Pacific/Pago_Pago"} |
+ 001{"Pacific/Apia"} |
} |
Seychelles{ |
001{"Indian/Mahe"} |
@@ -2559,11 +2561,6 @@ metaZones:table(nofallback){ |
"Syowa", |
} |
} |
- "Antarctica:Troll"{ |
- { |
- "GMT", |
- } |
- } |
"Antarctica:Vostok"{ |
{ |
"Vostok", |
@@ -2715,27 +2712,27 @@ metaZones:table(nofallback){ |
"India", |
} |
} |
- "Asia:Chita"{ |
+ "Asia:Choibalsan"{ |
{ |
- "Yakutsk", |
+ "Mongolia", |
"1970-01-01 00:00", |
- "2014-10-25 16:00", |
+ "1983-03-31 16:00", |
} |
{ |
- "Irkutsk", |
- "2014-10-25 16:00", |
+ "Choibalsan", |
+ "1983-03-31 16:00", |
"9999-12-31 23:59", |
} |
} |
- "Asia:Choibalsan"{ |
+ "Asia:Chongqing"{ |
{ |
- "Mongolia", |
+ "Long_Shu", |
"1970-01-01 00:00", |
- "1983-03-31 16:00", |
+ "1980-04-30 17:00", |
} |
{ |
- "Choibalsan", |
- "1983-03-31 16:00", |
+ "China", |
+ "1980-04-30 17:00", |
"9999-12-31 23:59", |
} |
} |
@@ -2819,6 +2816,18 @@ 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", |
@@ -2890,6 +2899,18 @@ 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", |
@@ -2992,11 +3013,6 @@ 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", |
} |
} |
@@ -3135,13 +3151,6 @@ metaZones:table(nofallback){ |
"Singapore", |
} |
} |
- "Asia:Srednekolymsk"{ |
- { |
- "Magadan", |
- "1970-01-01 00:00", |
- "2014-10-25 14:00", |
- } |
- } |
"Asia:Taipei"{ |
{ |
"Taipei", |
@@ -3201,6 +3210,13 @@ 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"{ |
@@ -3551,16 +3567,6 @@ 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"{ |
{ |
@@ -3644,11 +3650,6 @@ 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"{ |
{ |
@@ -3713,21 +3714,6 @@ 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", |
} |
{ |
@@ -3770,11 +3756,6 @@ metaZones:table(nofallback){ |
{ |
"Europe_Eastern", |
"1997-03-30 01:00", |
- "2014-03-30 00:00", |
- } |
- { |
- "Moscow", |
- "2014-03-30 00:00", |
"9999-12-31 23:59", |
} |
} |
@@ -3867,13 +3848,6 @@ 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"{ |
@@ -3970,7 +3944,14 @@ metaZones:table(nofallback){ |
} |
"Pacific:Apia"{ |
{ |
- "Apia", |
+ "Bering", |
+ "1970-01-01 00:00", |
+ "1983-10-30 12:00", |
+ } |
+ { |
+ "Samoa", |
+ "1983-10-30 12:00", |
+ "9999-12-31 23:59", |
} |
} |
"Pacific:Auckland"{ |