avoid duplicate content pt.2

symfony · Apr 28, 2019 · 74f127b · 74f127b
1 parent b8040d2
commit 74f127b
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 777 deletions.
diff --git a/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php
@@ -138,14 +138,20 @@ protected function generateDataForMeta(BundleReaderInterface $reader, $tempDir)
 
     private function generateZones(string $locale, ArrayAccessibleResourceBundle $typeBundle, ArrayAccessibleResourceBundle $metaBundle, ArrayAccessibleResourceBundle $windowsZonesBundle, ArrayAccessibleResourceBundle ...$localeBundles): array
     {
-        $accessor = function (array $indices, &$inherited = false) use ($localeBundles) {
+        $accessor = function (ArrayAccessibleResourceBundle $resourceBundle, array $indices) {
+            $result = $resourceBundle;
+            foreach ($indices as $indice) {
+                $result = $result[$indice] ?? null;
+            }
+
+            return $result;
+        };
+        $accessor = function (array $indices, &$inherited = false) use ($localeBundles, $accessor) {
             $inherited = false;
             foreach ($localeBundles as $i => $localeBundle) {
-                $result = $localeBundle;
-                foreach ($indices as $indice) {
-                    $result = $result[$indice] ?? null;
-                }
-                if (null !== $result) {
+                $nextLocaleBundle = $localeBundles[$i + 1] ?? null;
+                $result = $accessor($localeBundle, $indices);
+                if (null !== $result && (null === $nextLocaleBundle || $result !== $accessor($nextLocaleBundle, $indices))) {
                     $inherited = 0 !== $i;
 
                     return $result;

diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/en_AU.json b/src/Symfony/Component/Intl/Resources/data/timezones/en_AU.json
@@ -14,16 +14,12 @@
         "Asia\/Aden": "Arabia Time (Aden)",
         "Asia\/Baghdad": "Arabia Time (Baghdad)",
         "Asia\/Bahrain": "Arabia Time (Bahrain)",
-        "Asia\/Jerusalem": "Israel Time (Jerusalem)",
         "Asia\/Kuwait": "Arabia Time (Kuwait)",
         "Asia\/Pyongyang": "Korea Time (Pyongyang)",
         "Asia\/Qatar": "Arabia Time (Qatar)",
         "Asia\/Rangoon": "Myanmar Time (Rangoon)",
         "Asia\/Riyadh": "Arabia Time (Riyadh)",
         "Asia\/Seoul": "Korea Time (Seoul)",
-        "Asia\/Taipei": "Taipei Time",
-        "Asia\/Tehran": "Iran Time (Tehran)",
-        "Asia\/Tokyo": "Japan Time (Tokyo)",
         "Australia\/Adelaide": "Australian Central Time (Adelaide)",
         "Australia\/Brisbane": "Australian Eastern Time (Brisbane)",
         "Australia\/Broken_Hill": "Australian Central Time (Broken Hill)",
@@ -34,17 +30,9 @@
         "Australia\/Melbourne": "Australian Eastern Time (Melbourne)",
         "Australia\/Perth": "Australian Western Time (Perth)",
         "Australia\/Sydney": "Australian Eastern Time (Sydney)",
-        "Europe\/Astrakhan": "Moscow Time (Astrakhan)",
-        "Europe\/Minsk": "Moscow Time (Minsk)",
-        "Europe\/Moscow": "Moscow Time",
-        "Europe\/Saratov": "Moscow Time (Saratov)",
-        "Europe\/Simferopol": "Moscow Time (Simferopol)",
-        "Europe\/Ulyanovsk": "Moscow Time (Ulyanovsk)",
         "Indian\/Antananarivo": "Eastern Africa Time (Antananarivo)",
         "Indian\/Comoro": "Eastern Africa Time (Comoro)",
         "Indian\/Mayotte": "Eastern Africa Time (Mayotte)",
-        "Pacific\/Midway": "Samoa Time (Midway)",
-        "Pacific\/Pago_Pago": "Samoa Time (Pago Pago)",
         "Pacific\/Rarotonga": "Cook Island Time (Rarotonga)"
     }
 }
diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/en_GB.json b/src/Symfony/Component/Intl/Resources/data/timezones/en_GB.json
@@ -8,9 +8,6 @@
         "America\/St_Lucia": "Atlantic Time (St Lucia)",
         "America\/St_Thomas": "Atlantic Time (St Thomas)",
         "America\/St_Vincent": "Atlantic Time (St Vincent)",
-        "Atlantic\/St_Helena": "Greenwich Mean Time (St Helena)",
-        "Australia\/Adelaide": "Central Australia Time (Adelaide)",
-        "Australia\/Broken_Hill": "Central Australia Time (Broken Hill)",
-        "Australia\/Darwin": "Central Australia Time (Darwin)"
+        "Atlantic\/St_Helena": "Greenwich Mean Time (St Helena)"
     }
 }
diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/es_MX.json b/src/Symfony/Component/Intl/Resources/data/timezones/es_MX.json
@@ -1,66 +1,22 @@
 {
     "Version": "2.1.47.96",
     "Names": {
-        "Africa\/Accra": "hora del meridiano de Greenwich (Acra)",
         "Africa\/Bujumbura": "hora de África central (Buyumbura)",
-        "Africa\/Cairo": "hora de Europa oriental (El Cairo)",
-        "Africa\/Casablanca": "hora de Europa occidental (Casablanca)",
         "Africa\/Conakry": "hora del meridiano de Greenwich (Conakri)",
         "Africa\/Dar_es_Salaam": "hora de África oriental (Dar es-Salaam)",
-        "Africa\/El_Aaiun": "hora de Europa occidental (El Aaiún)",
         "Africa\/Khartoum": "hora de África central (Jartum)",
-        "Africa\/Tripoli": "hora de Europa oriental (Trípoli)",
-        "America\/Argentina\/San_Luis": "hora de Argentina occidental (San Luis)",
-        "America\/Fort_Nelson": "hora de las Montañas Rocosas (Fort Nelson)",
-        "America\/Nassau": "hora oriental (Nassau)",
         "America\/Rio_Branco": "Hora de Acre (Rio Branco)",
-        "America\/Sao_Paulo": "hora de Brasilia (São Paulo)",
-        "America\/St_Thomas": "hora del Atlántico (St. Thomas)",
-        "Antarctica\/Macquarie": "hora de la isla Macquarie (Macquarie)",
         "Asia\/Almaty": "hora de Kazajistán oriental (Almatý)",
-        "Asia\/Amman": "hora de Europa oriental (Ammán)",
         "Asia\/Aqtobe": "hora de Kazajistán occidental (Aktobé)",
         "Asia\/Atyrau": "hora de Kazajistán occidental (Atirau)",
-        "Asia\/Beirut": "hora de Europa oriental (Beirut)",
-        "Asia\/Damascus": "hora de Europa oriental (Damasco)",
-        "Asia\/Dushanbe": "hora de Tayikistán (Dusambé)",
-        "Asia\/Famagusta": "hora de Europa oriental (Famagusta)",
-        "Asia\/Gaza": "hora de Europa oriental (Gaza)",
-        "Asia\/Hebron": "hora de Europa oriental (Hebrón)",
-        "Asia\/Irkutsk": "hora de Irkutsk",
-        "Asia\/Nicosia": "hora de Europa oriental (Nicosia)",
         "Asia\/Pyongyang": "hora de Corea (Piongyang)",
         "Asia\/Qatar": "hora de Arabia (Qatar)",
-        "Atlantic\/Canary": "hora de Europa occidental (Islas Canarias)",
-        "Atlantic\/Faeroe": "hora de Europa occidental (Islas Feroe)",
-        "Atlantic\/Madeira": "hora de Europa occidental (Madeira)",
         "Atlantic\/Stanley": "hora de Islas Malvinas (Stanley)",
         "Etc\/UTC": "Tiempo Universal Coordinado",
-        "Europe\/Athens": "hora de Europa oriental (Atenas)",
-        "Europe\/Bucharest": "hora de Europa oriental (Bucarest)",
-        "Europe\/Chisinau": "hora de Europa oriental (Chisináu)",
-        "Europe\/Helsinki": "hora de Europa oriental (Helsinki)",
-        "Europe\/Kaliningrad": "hora de Europa oriental (Kaliningrado)",
-        "Europe\/Kiev": "hora de Europa oriental (Kiev)",
         "Europe\/Kirov": "hora de Rusia (Kirov)",
-        "Europe\/Lisbon": "hora de Europa occidental (Lisboa)",
-        "Europe\/Mariehamn": "hora de Europa oriental (Mariehamn)",
-        "Europe\/Riga": "hora de Europa oriental (Riga)",
-        "Europe\/Sofia": "hora de Europa oriental (Sofía)",
-        "Europe\/Tallinn": "hora de Europa oriental (Tallin)",
-        "Europe\/Uzhgorod": "hora de Europa oriental (Úzhgorod)",
-        "Europe\/Vilnius": "hora de Europa oriental (Vilna)",
-        "Europe\/Zaporozhye": "hora de Europa oriental (Zaporiyia)",
         "Indian\/Christmas": "hora de la isla de Navidad (Navidad)",
-        "Indian\/Cocos": "hora de las Islas Cocos (Cocos)",
-        "Pacific\/Apia": "hora de Apia",
         "Pacific\/Easter": "hora de Isla de Pascua",
-        "Pacific\/Guadalcanal": "hora de las Islas Salomón (Guadalcanal)",
         "Pacific\/Honolulu": "hora de Hawái-Aleutianas (Honolulu)",
-        "Pacific\/Kwajalein": "hora de las Islas Marshall (Kwajalein)",
-        "Pacific\/Majuro": "hora de las Islas Marshall (Majuro)",
-        "Pacific\/Norfolk": "hora de la isla Norfolk (Norfolk)",
-        "Pacific\/Rarotonga": "hora de las Islas Cook (Rarotonga)",
         "Pacific\/Tarawa": "hora de las Islas Gilbert (Tarawa)",
         "Pacific\/Wake": "hora de la Isla Wake (Wake)"
     }

diff --git a/src/Symfony/Component/Intl/Resources/data/timezones/es_US.json b/src/Symfony/Component/Intl/Resources/data/timezones/es_US.json
@@ -1,70 +1,15 @@
 {
     "Version": "2.1.47.86",
     "Names": {
-        "Africa\/Accra": "hora del meridiano de Greenwich (Acra)",
-        "Africa\/Cairo": "hora de Europa oriental (El Cairo)",
-        "Africa\/Casablanca": "hora de Europa occidental (Casablanca)",
-        "Africa\/El_Aaiun": "hora de Europa occidental (El Aaiún)",
-        "Africa\/Tripoli": "hora de Europa oriental (Trípoli)",
-        "America\/Boise": "hora de las Montañas Rocosas (Boise)",
-        "America\/Cambridge_Bay": "hora de las Montañas Rocosas (Cambridge Bay)",
-        "America\/Creston": "hora de las Montañas Rocosas (Creston)",
-        "America\/Dawson_Creek": "hora de las Montañas Rocosas (Dawson Creek)",
-        "America\/Denver": "hora de las Montañas Rocosas (Denver)",
-        "America\/Edmonton": "hora de las Montañas Rocosas (Edmonton)",
-        "America\/Fort_Nelson": "hora de las Montañas Rocosas (Fort Nelson)",
-        "America\/Inuvik": "hora de las Montañas Rocosas (Inuvik)",
-        "America\/Nassau": "hora oriental (Nassau)",
-        "America\/Ojinaga": "hora de las Montañas Rocosas (Ojinaga)",
-        "America\/Phoenix": "hora de las Montañas Rocosas (Phoenix)",
-        "America\/Sao_Paulo": "hora de Brasilia (São Paulo)",
-        "America\/St_Thomas": "hora del Atlántico (St. Thomas)",
-        "America\/Yellowknife": "hora de las Montañas Rocosas (Yellowknife)",
-        "Antarctica\/Macquarie": "hora de la isla Macquarie (Macquarie)",
-        "Asia\/Amman": "hora de Europa oriental (Ammán)",
         "Asia\/Barnaul": "hora de Rusia (Barnaul)",
-        "Asia\/Beirut": "hora de Europa oriental (Beirut)",
-        "Asia\/Damascus": "hora de Europa oriental (Damasco)",
-        "Asia\/Dushanbe": "hora de Tayikistán (Dusambé)",
-        "Asia\/Famagusta": "hora de Europa oriental (Famagusta)",
-        "Asia\/Gaza": "hora de Europa oriental (Gaza)",
-        "Asia\/Hebron": "hora de Europa oriental (Hebrón)",
-        "Asia\/Nicosia": "hora de Europa oriental (Nicosia)",
-        "Atlantic\/Canary": "hora de Europa occidental (Islas Canarias)",
-        "Atlantic\/Faeroe": "hora de Europa occidental (Islas Feroe)",
-        "Atlantic\/Madeira": "hora de Europa occidental (Madeira)",
-        "Atlantic\/Stanley": "hora de las islas Malvinas (Stanley)",
         "Etc\/UTC": "hora universal coordinada",
         "Europe\/Astrakhan": "hora de Moscú (Astrakhan)",
-        "Europe\/Athens": "hora de Europa oriental (Atenas)",
-        "Europe\/Bucharest": "hora de Europa oriental (Bucarest)",
-        "Europe\/Chisinau": "hora de Europa oriental (Chisináu)",
-        "Europe\/Helsinki": "hora de Europa oriental (Helsinki)",
-        "Europe\/Kaliningrad": "hora de Europa oriental (Kaliningrado)",
-        "Europe\/Kiev": "hora de Europa oriental (Kiev)",
         "Europe\/Kirov": "hora de Rusia (Kirov)",
-        "Europe\/Lisbon": "hora de Europa occidental (Lisboa)",
-        "Europe\/Mariehamn": "hora de Europa oriental (Mariehamn)",
-        "Europe\/Riga": "hora de Europa oriental (Riga)",
-        "Europe\/Sofia": "hora de Europa oriental (Sofía)",
-        "Europe\/Tallinn": "hora de Europa oriental (Tallin)",
         "Europe\/Ulyanovsk": "hora de Moscú (Ulyanovsk)",
-        "Europe\/Uzhgorod": "hora de Europa oriental (Úzhgorod)",
-        "Europe\/Vilnius": "hora de Europa oriental (Vilna)",
-        "Europe\/Zaporozhye": "hora de Europa oriental (Zaporiyia)",
         "Indian\/Chagos": "hora del Océano Índico (Chagos)",
-        "Indian\/Cocos": "hora de las Islas Cocos (Cocos)",
-        "MST7MDT": "hora de las Montañas Rocosas",
-        "Pacific\/Easter": "hora de la isla de Pascua (Isla de Pascua)",
         "Pacific\/Enderbury": "hora de las islas Fénix (Enderbury)",
-        "Pacific\/Guadalcanal": "hora de las Islas Salomón (Guadalcanal)",
         "Pacific\/Guam": "hora de Chamorro (Guam)",
-        "Pacific\/Kwajalein": "hora de las Islas Marshall (Kwajalein)",
-        "Pacific\/Majuro": "hora de las Islas Marshall (Majuro)",
         "Pacific\/Marquesas": "hora de las islas Marquesas (Marquesas)",
-        "Pacific\/Norfolk": "hora de la isla Norfolk (Norfolk)",
-        "Pacific\/Saipan": "hora de Chamorro (Saipán)",
-        "Pacific\/Tarawa": "hora de las islas Gilbert (Tarawa)",
-        "Pacific\/Wake": "hora de la isla Wake (Wake)"
+        "Pacific\/Saipan": "hora de Chamorro (Saipán)"
     }
 }