Skip to content

Commit 754d5ad

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.4' into 7.3
* 6.4: [Intl] Take timezoneTypes’ ianaMap into account
2 parents d1197fb + 84dc64e commit 754d5ad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+2526
-4
lines changed

‎Data/Generator/TimezoneDataGenerator.php

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class TimezoneDataGenerator extends AbstractDataGenerator
3737
private array $zoneIds = [];
3838
private array $zoneToCountryMapping = [];
3939
private array $localeAliases = [];
40+
private array $ianaMap = [];
4041

4142
protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array
4243
{
@@ -64,8 +65,14 @@ protected function preGenerate(): void
6465

6566
protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale): ?array
6667
{
68+
if (!$this->ianaMap) {
69+
foreach ($reader->readEntry($tempDir, 'timezoneTypes', ['ianaMap', 'timezone']) as $cldr => $iana) {
70+
$this->ianaMap[str_replace(':', '/', $cldr)] = $iana;
71+
}
72+
}
73+
6774
if (!$this->zoneToCountryMapping) {
68-
$this->zoneToCountryMapping = self::generateZoneToCountryMapping($reader->read($tempDir, 'windowsZones'));
75+
$this->zoneToCountryMapping = $this->generateZoneToCountryMapping($reader->read($tempDir, 'windowsZones'));
6976
}
7077

7178
// Don't generate aliases, as they are resolved during runtime
@@ -76,7 +83,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
7683

7784
$localeBundle = $reader->read($tempDir, $displayLocale);
7885

79-
if (!isset($localeBundle['zoneStrings']) || null === $localeBundle['zoneStrings']) {
86+
if (!isset($localeBundle['zoneStrings'])) {
8087
return null;
8188
}
8289

@@ -217,6 +224,10 @@ private function generateZones(BundleEntryReaderInterface $reader, string $tempD
217224
}
218225

219226
$zones[$id] = $name;
227+
228+
if (isset($this->ianaMap[$id])) {
229+
$zones[$this->ianaMap[$id]] = $name;
230+
}
220231
}
221232

222233
return $zones;
@@ -237,14 +248,20 @@ private static function generateZoneMetadata(ArrayAccessibleResourceBundle $loca
237248
return $metadata;
238249
}
239250

240-
private static function generateZoneToCountryMapping(ArrayAccessibleResourceBundle $windowsZoneBundle): array
251+
private function generateZoneToCountryMapping(ArrayAccessibleResourceBundle $windowsZoneBundle): array
241252
{
242253
$mapping = [];
243254

244255
foreach ($windowsZoneBundle['mapTimezones'] as $zoneInfo) {
245256
foreach ($zoneInfo as $region => $zones) {
246257
if (RegionDataGenerator::isValidCountryCode($region)) {
247-
$mapping += array_fill_keys(explode(' ', $zones), $region);
258+
foreach (explode(' ', $zones) as $zone) {
259+
$mapping[$zone] = $region;
260+
261+
if (isset($this->ianaMap[$zone])) {
262+
$mapping[$this->ianaMap[$zone]] = $region;
263+
}
264+
}
248265
}
249266
}
250267
}

‎Resources/data/timezones/af.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
'Africa/Addis_Ababa' => 'Oos-Afrika-tyd (Addis Abeba)',
88
'Africa/Algiers' => 'Sentraal-Europese tyd (Algiers)',
99
'Africa/Asmera' => 'Oos-Afrika-tyd (Asmara)',
10+
'Africa/Asmara' => 'Oos-Afrika-tyd (Asmara)',
1011
'Africa/Bamako' => 'Greenwich-tyd (Bamako)',
1112
'Africa/Bangui' => 'Wes-Afrika-tyd (Bangui)',
1213
'Africa/Banjul' => 'Greenwich-tyd (Banjul)',
@@ -78,18 +79,22 @@
7879
'America/Bogota' => 'Colombië-tyd (Bogota)',
7980
'America/Boise' => 'Noord-Amerikaanse bergtyd (Boise)',
8081
'America/Buenos_Aires' => 'Argentinië-tyd (Buenos Aires)',
82+
'America/Argentina/Buenos_Aires' => 'Argentinië-tyd (Buenos Aires)',
8183
'America/Cambridge_Bay' => 'Noord-Amerikaanse bergtyd (Cambridgebaai)',
8284
'America/Campo_Grande' => 'Amasone-tyd (Campo Grande)',
8385
'America/Cancun' => 'Noord-Amerikaanse oostelike tyd (Cancún)',
8486
'America/Caracas' => 'Venezuela-tyd (Caracas)',
8587
'America/Catamarca' => 'Argentinië-tyd (Catamarca)',
88+
'America/Argentina/Catamarca' => 'Argentinië-tyd (Catamarca)',
8689
'America/Cayenne' => 'Frans-Guiana-tyd (Cayenne)',
8790
'America/Cayman' => 'Noord-Amerikaanse oostelike tyd (Kaaiman)',
8891
'America/Chicago' => 'Noord-Amerikaanse sentrale tyd (Chicago)',
8992
'America/Chihuahua' => 'Noord-Amerikaanse sentrale tyd (Chihuahua)',
9093
'America/Ciudad_Juarez' => 'Noord-Amerikaanse bergtyd (Ciudad Juárez)',
9194
'America/Coral_Harbour' => 'Noord-Amerikaanse oostelike tyd (Atikokan)',
95+
'America/Atikokan' => 'Noord-Amerikaanse oostelike tyd (Atikokan)',
9296
'America/Cordoba' => 'Argentinië-tyd (Cordoba)',
97+
'America/Argentina/Cordoba' => 'Argentinië-tyd (Cordoba)',
9398
'America/Costa_Rica' => 'Noord-Amerikaanse sentrale tyd (Costa Rica)',
9499
'America/Creston' => 'Noord-Amerikaanse bergtyd (Creston)',
95100
'America/Cuiaba' => 'Amasone-tyd (Cuiaba)',
@@ -107,6 +112,7 @@
107112
'America/Fortaleza' => 'Brasilia-tyd (Fortaleza)',
108113
'America/Glace_Bay' => 'Atlantiese tyd (Glacebaai)',
109114
'America/Godthab' => 'Groenland-tyd (Nuuk)',
115+
'America/Nuuk' => 'Groenland-tyd (Nuuk)',
110116
'America/Goose_Bay' => 'Atlantiese tyd (Goosebaai)',
111117
'America/Grand_Turk' => 'Noord-Amerikaanse oostelike tyd (Grand Turk)',
112118
'America/Grenada' => 'Atlantiese tyd (Grenada)',
@@ -125,17 +131,20 @@
125131
'America/Indiana/Vincennes' => 'Noord-Amerikaanse oostelike tyd (Vincennes, Indiana)',
126132
'America/Indiana/Winamac' => 'Noord-Amerikaanse oostelike tyd (Winamac, Indiana)',
127133
'America/Indianapolis' => 'Noord-Amerikaanse oostelike tyd (Indianapolis)',
134+
'America/Indiana/Indianapolis' => 'Noord-Amerikaanse oostelike tyd (Indianapolis)',
128135
'America/Inuvik' => 'Noord-Amerikaanse bergtyd (Inuvik)',
129136
'America/Iqaluit' => 'Noord-Amerikaanse oostelike tyd (Iqaluit)',
130137
'America/Jamaica' => 'Noord-Amerikaanse oostelike tyd (Jamaika)',
131138
'America/Jujuy' => 'Argentinië-tyd (Jujuy)',
139+
'America/Argentina/Jujuy' => 'Argentinië-tyd (Jujuy)',
132140
'America/Juneau' => 'Alaska-tyd (Juneau)',
133141
'America/Kentucky/Monticello' => 'Noord-Amerikaanse oostelike tyd (Monticello, Kentucky)',
134142
'America/Kralendijk' => 'Atlantiese tyd (Kralendijk)',
135143
'America/La_Paz' => 'Bolivië-tyd (La Paz)',
136144
'America/Lima' => 'Peru-tyd (Lima)',
137145
'America/Los_Angeles' => 'Pasifiese tyd (Los Angeles)',
138146
'America/Louisville' => 'Noord-Amerikaanse oostelike tyd (Louisville)',
147+
'America/Kentucky/Louisville' => 'Noord-Amerikaanse oostelike tyd (Louisville)',
139148
'America/Lower_Princes' => 'Atlantiese tyd (Lower Prince’s Quarter)',
140149
'America/Maceio' => 'Brasilia-tyd (Maceio)',
141150
'America/Managua' => 'Noord-Amerikaanse sentrale tyd (Managua)',
@@ -145,6 +154,7 @@
145154
'America/Matamoros' => 'Noord-Amerikaanse sentrale tyd (Matamoros)',
146155
'America/Mazatlan' => 'Meksikaanse Pasifiese tyd (Mazatlan)',
147156
'America/Mendoza' => 'Argentinië-tyd (Mendoza)',
157+
'America/Argentina/Mendoza' => 'Argentinië-tyd (Mendoza)',
148158
'America/Menominee' => 'Noord-Amerikaanse sentrale tyd (Menominee)',
149159
'America/Merida' => 'Noord-Amerikaanse sentrale tyd (Mérida)',
150160
'America/Metlakatla' => 'Alaska-tyd (Metlakatla)',
@@ -226,6 +236,7 @@
226236
'Asia/Bishkek' => 'Kirgistan-tyd (Bisjkek)',
227237
'Asia/Brunei' => 'Broenei Darussalam-tyd',
228238
'Asia/Calcutta' => 'Indië-standaardtyd (Kolkata)',
239+
'Asia/Kolkata' => 'Indië-standaardtyd (Kolkata)',
229240
'Asia/Chita' => 'Jakoetsk-tyd (Chita)',
230241
'Asia/Colombo' => 'Indië-standaardtyd (Colombo)',
231242
'Asia/Damascus' => 'Oos-Europese tyd (Damaskus)',
@@ -246,6 +257,7 @@
246257
'Asia/Kamchatka' => 'Petropavlovsk-Kamchatski-tyd (Kamtsjatka)',
247258
'Asia/Karachi' => 'Pakistan-tyd (Karatsji)',
248259
'Asia/Katmandu' => 'Nepal-tyd (Katmandoe)',
260+
'Asia/Kathmandu' => 'Nepal-tyd (Katmandoe)',
249261
'Asia/Khandyga' => 'Jakoetsk-tyd (Khandyga)',
250262
'Asia/Krasnoyarsk' => 'Krasnojarsk-tyd',
251263
'Asia/Kuala_Lumpur' => 'Maleisië-tyd (Koeala-Loempoer)',
@@ -268,8 +280,10 @@
268280
'Asia/Qostanay' => 'Kazakstan-tyd (Kostanay)',
269281
'Asia/Qyzylorda' => 'Kazakstan-tyd (Qyzylorda)',
270282
'Asia/Rangoon' => 'Mianmar-tyd (Yangon)',
283+
'Asia/Yangon' => 'Mianmar-tyd (Yangon)',
271284
'Asia/Riyadh' => 'Arabiese tyd (Riaad)',
272285
'Asia/Saigon' => 'Indosjina-tyd (Ho Tsji Minhstad)',
286+
'Asia/Ho_Chi_Minh' => 'Indosjina-tyd (Ho Tsji Minhstad)',
273287
'Asia/Sakhalin' => 'Sakhalin-tyd',
274288
'Asia/Samarkand' => 'Oesbekistan-tyd (Samarkand)',
275289
'Asia/Seoul' => 'Koreaanse tyd (Seoel)',
@@ -296,6 +310,7 @@
296310
'Atlantic/Canary' => 'Wes-Europese tyd (Kanarie)',
297311
'Atlantic/Cape_Verde' => 'Kaap Verde-tyd',
298312
'Atlantic/Faeroe' => 'Wes-Europese tyd (Faroe)',
313+
'Atlantic/Faroe' => 'Wes-Europese tyd (Faroe)',
299314
'Atlantic/Madeira' => 'Wes-Europese tyd (Madeira)',
300315
'Atlantic/Reykjavik' => 'Greenwich-tyd (Reykjavik)',
301316
'Atlantic/South_Georgia' => 'Suid-Georgië-tyd',
@@ -336,6 +351,7 @@
336351
'Europe/Jersey' => 'Greenwich-tyd (Jersey)',
337352
'Europe/Kaliningrad' => 'Oos-Europese tyd (Kaliningrad)',
338353
'Europe/Kiev' => 'Oos-Europese tyd (Kiëf)',
354+
'Europe/Kyiv' => 'Oos-Europese tyd (Kiëf)',
339355
'Europe/Kirov' => 'Rusland-tyd (Kirov)',
340356
'Europe/Lisbon' => 'Wes-Europese tyd (Lissabon)',
341357
'Europe/Ljubljana' => 'Sentraal-Europese tyd (Ljubljana)',
@@ -390,6 +406,7 @@
390406
'Pacific/Easter' => 'Paaseiland-tyd',
391407
'Pacific/Efate' => 'Vanuatu-tyd (Efate)',
392408
'Pacific/Enderbury' => 'Fenikseilande-tyd (Enderbury)',
409+
'Pacific/Kanton' => 'Fenikseilande-tyd (Enderbury)',
393410
'Pacific/Fakaofo' => 'Tokelau-tyd (Fakaofo)',
394411
'Pacific/Fiji' => 'Fidji-tyd',
395412
'Pacific/Funafuti' => 'Tuvalu-tyd (Funafuti)',
@@ -412,13 +429,15 @@
412429
'Pacific/Palau' => 'Palau-tyd',
413430
'Pacific/Pitcairn' => 'Pitcairn-tyd',
414431
'Pacific/Ponape' => 'Ponape-tyd (Pohnpei)',
432+
'Pacific/Pohnpei' => 'Ponape-tyd (Pohnpei)',
415433
'Pacific/Port_Moresby' => 'Papoea-Nieu-Guinee-tyd (Port Moresby)',
416434
'Pacific/Rarotonga' => 'Cookeilande-tyd (Rarotonga)',
417435
'Pacific/Saipan' => 'Chamorro-standaardtyd (Saipan)',
418436
'Pacific/Tahiti' => 'Tahiti-tyd',
419437
'Pacific/Tarawa' => 'Gilberteilande-tyd (Tarawa)',
420438
'Pacific/Tongatapu' => 'Tonga-tyd (Tongatapu)',
421439
'Pacific/Truk' => 'Chuuk-tyd',
440+
'Pacific/Chuuk' => 'Chuuk-tyd',
422441
'Pacific/Wake' => 'Wake-eiland-tyd',
423442
'Pacific/Wallis' => 'Wallis en Futuna-tyd (Mata-Utu)',
424443
],

‎Resources/data/timezones/ak.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
'Africa/Addis_Ababa' => 'Afrika Apueeɛ Berɛ (Addis Ababa)',
88
'Africa/Algiers' => 'Yuropu Mfinimfini Berɛ (Ɔlgyese)',
99
'Africa/Asmera' => 'Afrika Apueeɛ Berɛ (Asmara)',
10+
'Africa/Asmara' => 'Afrika Apueeɛ Berɛ (Asmara)',
1011
'Africa/Bamako' => 'Greenwich Mean Berɛ (Bamako)',
1112
'Africa/Bangui' => 'Afrika Atɔeɛ Berɛ (Bangui)',
1213
'Africa/Banjul' => 'Greenwich Mean Berɛ (Bandwuu)',
@@ -78,18 +79,22 @@
7879
'America/Bogota' => 'Kolombia Berɛ (Bogota)',
7980
'America/Boise' => 'Bepɔ Berɛ (Bɔisi)',
8081
'America/Buenos_Aires' => 'Agyɛntina Berɛ (Buenos Aires)',
82+
'America/Argentina/Buenos_Aires' => 'Agyɛntina Berɛ (Buenos Aires)',
8183
'America/Cambridge_Bay' => 'Bepɔ Berɛ (Kambrigyi Bay)',
8284
'America/Campo_Grande' => 'Amazon Berɛ (Kampo Grande)',
8385
'America/Cancun' => 'Apueeɛ Berɛ (Cancún)',
8486
'America/Caracas' => 'Venezuela Berɛ (Karakas)',
8587
'America/Catamarca' => 'Agyɛntina Berɛ (Katamaaka)',
88+
'America/Argentina/Catamarca' => 'Agyɛntina Berɛ (Katamaaka)',
8689
'America/Cayenne' => 'Frɛnkye Gayana Berɛ (Kayiini)',
8790
'America/Cayman' => 'Apueeɛ Berɛ (Kemanfo)',
8891
'America/Chicago' => 'Mfinimfini Berɛ (Kyikago)',
8992
'America/Chihuahua' => 'Mfinimfini Berɛ (Kyihuahua)',
9093
'America/Ciudad_Juarez' => 'Bepɔ Berɛ (Ciudad Juárez)',
9194
'America/Coral_Harbour' => 'Apueeɛ Berɛ (Atikokan)',
95+
'America/Atikokan' => 'Apueeɛ Berɛ (Atikokan)',
9296
'America/Cordoba' => 'Agyɛntina Berɛ (Kɔɔdɔba)',
97+
'America/Argentina/Cordoba' => 'Agyɛntina Berɛ (Kɔɔdɔba)',
9398
'America/Costa_Rica' => 'Mfinimfini Berɛ (Kɔsta Rika)',
9499
'America/Creston' => 'Bepɔ Berɛ (Krɛston)',
95100
'America/Cuiaba' => 'Amazon Berɛ (Kuiaba)',
@@ -107,6 +112,7 @@
107112
'America/Fortaleza' => 'Brasilia Berɛ (Fɔɔtalɛsa)',
108113
'America/Glace_Bay' => 'Atlantik Berɛ (Glace Bay)',
109114
'America/Godthab' => 'Berɛ Greenman (Nuuk)',
115+
'America/Nuuk' => 'Berɛ Greenman (Nuuk)',
110116
'America/Goose_Bay' => 'Atlantik Berɛ (Guus Bay)',
111117
'America/Grand_Turk' => 'Apueeɛ Berɛ (Grand Tuk)',
112118
'America/Grenada' => 'Atlantik Berɛ (Grenada)',
@@ -125,17 +131,20 @@
125131
'America/Indiana/Vincennes' => 'Apueeɛ Berɛ (Vincennes, Indiana)',
126132
'America/Indiana/Winamac' => 'Apueeɛ Berɛ (Winamak, Indiana)',
127133
'America/Indianapolis' => 'Apueeɛ Berɛ (Indianapɔlis)',
134+
'America/Indiana/Indianapolis' => 'Apueeɛ Berɛ (Indianapɔlis)',
128135
'America/Inuvik' => 'Bepɔ Berɛ (Inuvik)',
129136
'America/Iqaluit' => 'Apueeɛ Berɛ (Ikaluit)',
130137
'America/Jamaica' => 'Apueeɛ Berɛ (Gyameka)',
131138
'America/Jujuy' => 'Agyɛntina Berɛ (Dwudwui)',
139+
'America/Argentina/Jujuy' => 'Agyɛntina Berɛ (Dwudwui)',
132140
'America/Juneau' => 'Alaska Berɛ (Juneau)',
133141
'America/Kentucky/Monticello' => 'Apueeɛ Berɛ (Mɔntisɛlo, Kɛntɛki)',
134142
'America/Kralendijk' => 'Atlantik Berɛ (Kralɛngyik)',
135143
'America/La_Paz' => 'Bolivia Berɛ (La Paz)',
136144
'America/Lima' => 'Peru Berɛ (Lima)',
137145
'America/Los_Angeles' => 'Pasifik Berɛ (Lɔs Angyɛlis)',
138146
'America/Louisville' => 'Apueeɛ Berɛ (Louisville)',
147+
'America/Kentucky/Louisville' => 'Apueeɛ Berɛ (Louisville)',
139148
'America/Lower_Princes' => 'Atlantik Berɛ (Lowa Prinse Kɔta)',
140149
'America/Maceio' => 'Brasilia Berɛ (Makeio)',
141150
'America/Managua' => 'Mfinimfini Berɛ (Managua)',
@@ -145,6 +154,7 @@
145154
'America/Matamoros' => 'Mfinimfini Berɛ (Matamɔrɔso)',
146155
'America/Mazatlan' => 'Mɛksiko Pasifik Berɛ (Masatlan)',
147156
'America/Mendoza' => 'Agyɛntina Berɛ (Mɛndɔsa)',
157+
'America/Argentina/Mendoza' => 'Agyɛntina Berɛ (Mɛndɔsa)',
148158
'America/Menominee' => 'Mfinimfini Berɛ (Mɛnɔminee)',
149159
'America/Merida' => 'Mfinimfini Berɛ (Mérida)',
150160
'America/Metlakatla' => 'Alaska Berɛ (Mɛtlakatla)',
@@ -226,6 +236,7 @@
226236
'Asia/Bishkek' => 'Kɛɛgestan Berɛ (Bishkek)',
227237
'Asia/Brunei' => 'Brunei Darusalam Berɛ',
228238
'Asia/Calcutta' => 'India Susudua Berɛ (Kɔɔkata)',
239+
'Asia/Kolkata' => 'India Susudua Berɛ (Kɔɔkata)',
229240
'Asia/Chita' => 'Yakutsk Berɛ (Kyita)',
230241
'Asia/Colombo' => 'India Susudua Berɛ (Kolombo)',
231242
'Asia/Damascus' => 'Yuropu Apueeɛ Berɛ (Damaskɔso)',
@@ -246,6 +257,7 @@
246257
'Asia/Kamchatka' => 'Berɛ Rɔhyea (Kamkyatka)',
247258
'Asia/Karachi' => 'Pakistan Berɛ (Karakyi)',
248259
'Asia/Katmandu' => 'Nɛpal Berɛ (Katmandu)',
260+
'Asia/Kathmandu' => 'Nɛpal Berɛ (Katmandu)',
249261
'Asia/Khandyga' => 'Yakutsk Berɛ (Khandyga)',
250262
'Asia/Krasnoyarsk' => 'Krasnoyarsk Berɛ',
251263
'Asia/Kuala_Lumpur' => 'Malehyia Berɛ (Kuala Lumpur)',
@@ -268,8 +280,10 @@
268280
'Asia/Qostanay' => 'Kazakstan Berɛ (Kostanay)',
269281
'Asia/Qyzylorda' => 'Kazakstan Berɛ (Qyzylorda)',
270282
'Asia/Rangoon' => 'Mayaama Berɛ (Yangon)',
283+
'Asia/Yangon' => 'Mayaama Berɛ (Yangon)',
271284
'Asia/Riyadh' => 'Arabia Berɛ (Riyadh)',
272285
'Asia/Saigon' => 'Indɔkyina Berɛ (Ho Kyi Min)',
286+
'Asia/Ho_Chi_Minh' => 'Indɔkyina Berɛ (Ho Kyi Min)',
273287
'Asia/Sakhalin' => 'Sakhalin Berɛ',
274288
'Asia/Samarkand' => 'Usbɛkistan Berɛ (Samarkand)',
275289
'Asia/Seoul' => 'Korean Berɛ (Seoul)',
@@ -296,6 +310,7 @@
296310
'Atlantic/Canary' => 'Yuropu Atɔeeɛ Berɛ (Kanari)',
297311
'Atlantic/Cape_Verde' => 'Kepvɛde Berɛ',
298312
'Atlantic/Faeroe' => 'Yuropu Atɔeeɛ Berɛ (Faroe)',
313+
'Atlantic/Faroe' => 'Yuropu Atɔeeɛ Berɛ (Faroe)',
299314
'Atlantic/Madeira' => 'Yuropu Atɔeeɛ Berɛ (Madeira)',
300315
'Atlantic/Reykjavik' => 'Greenwich Mean Berɛ (Rɛɛkgyavik)',
301316
'Atlantic/South_Georgia' => 'Gyɔɔgyia Anaafoɔ Berɛ',
@@ -336,6 +351,7 @@
336351
'Europe/Jersey' => 'Greenwich Mean Berɛ (Jɛɛsi)',
337352
'Europe/Kaliningrad' => 'Yuropu Apueeɛ Berɛ (Kaliningrad)',
338353
'Europe/Kiev' => 'Yuropu Apueeɛ Berɛ (Kyiv)',
354+
'Europe/Kyiv' => 'Yuropu Apueeɛ Berɛ (Kyiv)',
339355
'Europe/Kirov' => 'Berɛ Rɔhyea (Kirov)',
340356
'Europe/Lisbon' => 'Yuropu Atɔeeɛ Berɛ (Lisbɔn)',
341357
'Europe/Ljubljana' => 'Yuropu Mfinimfini Berɛ (Ldwubdwana)',
@@ -390,6 +406,7 @@
390406
'Pacific/Easter' => 'Easta Aeland Berɛ',
391407
'Pacific/Efate' => 'Vanuatu Berɛ (Efate)',
392408
'Pacific/Enderbury' => 'Finise Aeland Berɛ (Enderbury)',
409+
'Pacific/Kanton' => 'Finise Aeland Berɛ (Enderbury)',
393410
'Pacific/Fakaofo' => 'Tokelau Berɛ (Fakaofo)',
394411
'Pacific/Fiji' => 'Figyi Berɛ',
395412
'Pacific/Funafuti' => 'Tuvalu Berɛ (Funafuti)',
@@ -412,13 +429,15 @@
412429
'Pacific/Palau' => 'Palau Berɛ',
413430
'Pacific/Pitcairn' => 'Pitkairn Berɛ (Pitkairne)',
414431
'Pacific/Ponape' => 'Ponape Berɛ (Pɔnpei)',
432+
'Pacific/Pohnpei' => 'Ponape Berɛ (Pɔnpei)',
415433
'Pacific/Port_Moresby' => 'Papua Gini Foforɔ Berɛ (Pɔt Morɛsbi)',
416434
'Pacific/Rarotonga' => 'Kuk Aeland Berɛ (Rarotonga)',
417435
'Pacific/Saipan' => 'Kyamoro Susudua Berɛ (Saipan)',
418436
'Pacific/Tahiti' => 'Tahiti Berɛ',
419437
'Pacific/Tarawa' => 'Geebɛt Aeland Berɛ (Tarawa)',
420438
'Pacific/Tongatapu' => 'Tonga Berɛ (Tongatapu)',
421439
'Pacific/Truk' => 'Kyuuk Berɛ',
440+
'Pacific/Chuuk' => 'Kyuuk Berɛ',
422441
'Pacific/Wake' => 'Wake Aeland Berɛ',
423442
'Pacific/Wallis' => 'Wallis ne Futuna Berɛ',
424443
],

0 commit comments

Comments
 (0)