From e2e4049721fa038ecf503ea71d74e06f2872c331 Mon Sep 17 00:00:00 2001 From: Vlad Gregurco Date: Sat, 8 Sep 2018 00:29:46 +0300 Subject: [PATCH 1/4] [Intl] Blacklist Eurozone and United Nations in Region Data Generator --- .../Component/Intl/Data/Generator/RegionDataGenerator.php | 4 ++++ src/Symfony/Component/Intl/Resources/data/regions/af.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/am.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/ar.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/as.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/az.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/be.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/bg.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/bn.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/br.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/bs.json | 2 -- .../Component/Intl/Resources/data/regions/bs_Cyrl.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/ca.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/ce.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/cs.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/cy.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/da.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/de.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/el.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/en.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/es.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/es_419.json | 1 - src/Symfony/Component/Intl/Resources/data/regions/es_MX.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/es_US.json | 1 - src/Symfony/Component/Intl/Resources/data/regions/et.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/eu.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/fa.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/fi.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/fo.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/fr.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/ga.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/gd.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/gl.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/gu.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/he.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/hi.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/hr.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/hu.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/hy.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/id.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/in.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/is.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/it.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/iw.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/ja.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/ka.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/kk.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/km.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/kn.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/ko.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/ky.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/lo.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/lt.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/lv.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/meta.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/mk.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/ml.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/mn.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/mr.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/ms.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/my.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/nb.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/ne.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/nl.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/nn.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/no.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/or.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/pa.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/pl.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/ps.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/pt.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/pt_PT.json | 1 - src/Symfony/Component/Intl/Resources/data/regions/ro.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/ru.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/se_FI.json | 4 +--- src/Symfony/Component/Intl/Resources/data/regions/sh.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/si.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/sk.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/sl.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/sq.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/sr.json | 2 -- .../Component/Intl/Resources/data/regions/sr_Latn.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/sv.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/sw.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/ta.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/te.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/th.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/tl.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/to.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/tr.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/uk.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/ur.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/uz.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/vi.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/zh.json | 2 -- .../Component/Intl/Resources/data/regions/zh_Hant.json | 2 -- src/Symfony/Component/Intl/Resources/data/regions/zu.json | 2 -- .../Tests/Data/Provider/AbstractRegionDataProviderTest.php | 2 -- 98 files changed, 5 insertions(+), 192 deletions(-) diff --git a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php index e1265b3a1b..920e2e311b 100644 --- a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php @@ -34,6 +34,8 @@ class RegionDataGenerator extends AbstractDataGenerator const BOUVET_ISLAND_ID = 'BV'; const HEARD_MCDONALD_ISLANDS_ID = 'HM'; const CLIPPERTON_ISLAND_ID = 'CP'; + const EUROZONE_ID = 'EZ'; + const UNITED_NATIONS_ID = 'UN'; /** * Regions excluded from generation. @@ -43,6 +45,8 @@ class RegionDataGenerator extends AbstractDataGenerator // Look like countries, but are sub-continents self::OUTLYING_OCEANIA_REGION_ID => true, self::EUROPEAN_UNION_ID => true, + self::EUROZONE_ID => true, + self::UNITED_NATIONS_ID => true, // No longer exists self::NETHERLANDS_ANTILLES_ID => true, // Uninhabited islands diff --git a/src/Symfony/Component/Intl/Resources/data/regions/af.json b/src/Symfony/Component/Intl/Resources/data/regions/af.json index 2b280fd249..726c035079 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/af.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/af.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spanje", "ET": "Ethiopië", - "EZ": "Eurosone", "FI": "Finland", "FJ": "Fidji", "FK": "Falklandeilande", @@ -237,7 +236,6 @@ "UA": "Oekraïne", "UG": "Uganda", "UM": "Klein afgeleë eilande van die VSA", - "UN": "Verenigde Nasies", "US": "Verenigde State van Amerika", "UY": "Uruguay", "UZ": "Oesbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/am.json b/src/Symfony/Component/Intl/Resources/data/regions/am.json index 0936881e34..929f7797e8 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/am.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/am.json @@ -72,7 +72,6 @@ "ER": "ኤርትራ", "ES": "ስፔን", "ET": "ኢትዮጵያ", - "EZ": "የአውሮፓ ዞን", "FI": "ፊንላንድ", "FJ": "ፊጂ", "FK": "የፎክላንድ ደሴቶች", @@ -237,7 +236,6 @@ "UA": "ዩክሬን", "UG": "ዩጋንዳ", "UM": "የዩ ኤስ ጠረፍ ላይ ያሉ ደሴቶች", - "UN": "የተባበሩት መንግስታት", "US": "ዩናይትድ ስቴትስ", "UY": "ኡራጓይ", "UZ": "ኡዝቤኪስታን", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ar.json b/src/Symfony/Component/Intl/Resources/data/regions/ar.json index 93ce837ca1..989681613e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ar.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ar.json @@ -72,7 +72,6 @@ "ER": "إريتريا", "ES": "إسبانيا", "ET": "إثيوبيا", - "EZ": "منطقة اليورو", "FI": "فنلندا", "FJ": "فيجي", "FK": "جزر فوكلاند", @@ -237,7 +236,6 @@ "UA": "أوكرانيا", "UG": "أوغندا", "UM": "جزر الولايات المتحدة النائية", - "UN": "الأمم المتحدة", "US": "الولايات المتحدة", "UY": "أورغواي", "UZ": "أوزبكستان", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/as.json b/src/Symfony/Component/Intl/Resources/data/regions/as.json index 50baeecf10..2a61a13138 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/as.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/as.json @@ -72,7 +72,6 @@ "ER": "এৰিত্ৰিয়া", "ES": "স্পেইন", "ET": "ইথিঅ’পিয়া", - "EZ": "ইউৰোজ’ন", "FI": "ফিনলেণ্ড", "FJ": "ফিজি", "FK": "ফকলেণ্ড দ্বীপপুঞ্জ", @@ -237,7 +236,6 @@ "UA": "ইউক্ৰেইন", "UG": "উগাণ্ডা", "UM": "ইউ. এছ. আউটলায়িং দ্বীপপুঞ্জ", - "UN": "ৰাষ্ট্ৰসংঘ", "US": "মাৰ্কিন যুক্তৰাষ্ট্ৰ", "UY": "উৰুগুৱে", "UZ": "উজবেকিস্তান", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/az.json b/src/Symfony/Component/Intl/Resources/data/regions/az.json index 2bc9b27e4b..217a2f3883 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/az.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/az.json @@ -72,7 +72,6 @@ "ER": "Eritreya", "ES": "İspaniya", "ET": "Efiopiya", - "EZ": "Avrozona", "FI": "Finlandiya", "FJ": "Fici", "FK": "Folklend adaları", @@ -237,7 +236,6 @@ "UA": "Ukrayna", "UG": "Uqanda", "UM": "ABŞ-a bağlı kiçik adacıqlar", - "UN": "Birləşmiş Millətlər Təşkilatı", "US": "Amerika Birləşmiş Ştatları", "UY": "Uruqvay", "UZ": "Özbəkistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/be.json b/src/Symfony/Component/Intl/Resources/data/regions/be.json index 916a0653e7..f117642b14 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/be.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/be.json @@ -72,7 +72,6 @@ "ER": "Эрытрэя", "ES": "Іспанія", "ET": "Эфіопія", - "EZ": "Еўразона", "FI": "Фінляндыя", "FJ": "Фіджы", "FK": "Фалклендскія астравы", @@ -237,7 +236,6 @@ "UA": "Украіна", "UG": "Уганда", "UM": "Малыя Аддаленыя астравы ЗША", - "UN": "ААН", "US": "Злучаныя Штаты Амерыкі", "UY": "Уругвай", "UZ": "Узбекістан", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bg.json b/src/Symfony/Component/Intl/Resources/data/regions/bg.json index 0a4de0c69e..8d46867ad9 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/bg.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/bg.json @@ -72,7 +72,6 @@ "ER": "Еритрея", "ES": "Испания", "ET": "Етиопия", - "EZ": "Еврозона", "FI": "Финландия", "FJ": "Фиджи", "FK": "Фолклендски острови", @@ -237,7 +236,6 @@ "UA": "Украйна", "UG": "Уганда", "UM": "Отдалечени острови на САЩ", - "UN": "Организация на обединените нации", "US": "Съединени щати", "UY": "Уругвай", "UZ": "Узбекистан", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bn.json b/src/Symfony/Component/Intl/Resources/data/regions/bn.json index 35626e5519..8a0ec061f1 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/bn.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/bn.json @@ -72,7 +72,6 @@ "ER": "ইরিত্রিয়া", "ES": "স্পেন", "ET": "ইথিওপিয়া", - "EZ": "ইউরোজোন", "FI": "ফিনল্যান্ড", "FJ": "ফিজি", "FK": "ফকল্যান্ড দ্বীপপুঞ্জ", @@ -237,7 +236,6 @@ "UA": "ইউক্রেন", "UG": "উগান্ডা", "UM": "যুক্তরাষ্ট্রের পার্শ্ববর্তী দ্বীপপুঞ্জ", - "UN": "জাতিসংঘ", "US": "মার্কিন যুক্তরাষ্ট্র", "UY": "উরুগুয়ে", "UZ": "উজবেকিস্তান", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/br.json b/src/Symfony/Component/Intl/Resources/data/regions/br.json index 5f1bdd1812..ad7fd7262d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/br.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/br.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spagn", "ET": "Etiopia", - "EZ": "takad an euro", "FI": "Finland", "FJ": "Fidji", "FK": "Inizi Falkland", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Ouganda", "UM": "Inizi diabell ar Stadoù-Unanet", - "UN": "Broadoù unanet", "US": "Stadoù-Unanet", "UY": "Uruguay", "UZ": "Ouzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bs.json b/src/Symfony/Component/Intl/Resources/data/regions/bs.json index a923f5fd90..387c866323 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/bs.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/bs.json @@ -72,7 +72,6 @@ "ER": "Eritreja", "ES": "Španija", "ET": "Etiopija", - "EZ": "Eurozona", "FI": "Finska", "FJ": "Fidži", "FK": "Folklandska ostrva", @@ -237,7 +236,6 @@ "UA": "Ukrajina", "UG": "Uganda", "UM": "Američka Vanjska Ostrva", - "UN": "Ujedinjene Nacije", "US": "Sjedinjene Američke Države", "UY": "Urugvaj", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/bs_Cyrl.json b/src/Symfony/Component/Intl/Resources/data/regions/bs_Cyrl.json index 76c673b03b..a31e2b35bf 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/bs_Cyrl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/bs_Cyrl.json @@ -72,7 +72,6 @@ "ER": "Еритреја", "ES": "Шпанија", "ET": "Етиопија", - "EZ": "Еурозона", "FI": "Финска", "FJ": "Фиџи", "FK": "Фокландска острва", @@ -236,7 +235,6 @@ "UA": "Украјина", "UG": "Уганда", "UM": "Мања удаљена острва САД", - "UN": "Уједињене нације", "US": "Сједињене Америчке Државе", "UY": "Уругвај", "UZ": "Узбекистан", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ca.json b/src/Symfony/Component/Intl/Resources/data/regions/ca.json index 50a0177b4d..2336686f51 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ca.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ca.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Espanya", "ET": "Etiòpia", - "EZ": "zona euro", "FI": "Finlàndia", "FJ": "Fiji", "FK": "Illes Malvines", @@ -237,7 +236,6 @@ "UA": "Ucraïna", "UG": "Uganda", "UM": "Illes Perifèriques Menors dels EUA", - "UN": "Nacions Unides", "US": "Estats Units", "UY": "Uruguai", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ce.json b/src/Symfony/Component/Intl/Resources/data/regions/ce.json index 934580a099..e86ed1000e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ce.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ce.json @@ -72,7 +72,6 @@ "ER": "Эритрей", "ES": "Испани", "ET": "Эфиопи", - "EZ": "еврозона", "FI": "Финлянди", "FJ": "Фиджи", "FK": "Фолклендан гӀайренаш", @@ -237,7 +236,6 @@ "UA": "Украина", "UG": "Уганда", "UM": "АЦШн арахьара кегийн гӀайренаш", - "UN": "Вовшахкхетта Къаьмнийн Организаци", "US": "Цхьанатоьхна Штаташ", "UY": "Уругвай", "UZ": "Узбекистан", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/cs.json b/src/Symfony/Component/Intl/Resources/data/regions/cs.json index 68eea5b4ac..375a62819d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/cs.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/cs.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Španělsko", "ET": "Etiopie", - "EZ": "eurozóna", "FI": "Finsko", "FJ": "Fidži", "FK": "Falklandské ostrovy", @@ -237,7 +236,6 @@ "UA": "Ukrajina", "UG": "Uganda", "UM": "Menší odlehlé ostrovy USA", - "UN": "Organizace spojených národů", "US": "Spojené státy", "UY": "Uruguay", "UZ": "Uzbekistán", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/cy.json b/src/Symfony/Component/Intl/Resources/data/regions/cy.json index caa829ed16..2fd5967749 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/cy.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/cy.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Sbaen", "ET": "Ethiopia", - "EZ": "Ardal yr Ewro", "FI": "Y Ffindir", "FJ": "Fiji", "FK": "Ynysoedd y Falkland\/Malvinas", @@ -237,7 +236,6 @@ "UA": "Wcráin", "UG": "Uganda", "UM": "Ynysoedd Pellennig UDA", - "UN": "y Cenhedloedd Unedig", "US": "Yr Unol Daleithiau", "UY": "Uruguay", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/da.json b/src/Symfony/Component/Intl/Resources/data/regions/da.json index ef8b2658a8..ddda65b193 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/da.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/da.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spanien", "ET": "Etiopien", - "EZ": "eurozonen", "FI": "Finland", "FJ": "Fiji", "FK": "Falklandsøerne", @@ -237,7 +236,6 @@ "UA": "Ukraine", "UG": "Uganda", "UM": "Amerikanske oversøiske øer", - "UN": "De Forenede Nationer", "US": "USA", "UY": "Uruguay", "UZ": "Usbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/de.json b/src/Symfony/Component/Intl/Resources/data/regions/de.json index b521ae4bc5..38e353f6a3 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/de.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/de.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spanien", "ET": "Äthiopien", - "EZ": "Eurozone", "FI": "Finnland", "FJ": "Fidschi", "FK": "Falklandinseln", @@ -237,7 +236,6 @@ "UA": "Ukraine", "UG": "Uganda", "UM": "Amerikanische Überseeinseln", - "UN": "Vereinte Nationen", "US": "Vereinigte Staaten", "UY": "Uruguay", "UZ": "Usbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/el.json b/src/Symfony/Component/Intl/Resources/data/regions/el.json index 447264e8c6..8387c53c91 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/el.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/el.json @@ -72,7 +72,6 @@ "ER": "Ερυθραία", "ES": "Ισπανία", "ET": "Αιθιοπία", - "EZ": "Ευρωζώνη", "FI": "Φινλανδία", "FJ": "Φίτζι", "FK": "Νήσοι Φόκλαντ", @@ -237,7 +236,6 @@ "UA": "Ουκρανία", "UG": "Ουγκάντα", "UM": "Απομακρυσμένες Νησίδες ΗΠΑ", - "UN": "Ηνωμένα Έθνη", "US": "Ηνωμένες Πολιτείες", "UY": "Ουρουγουάη", "UZ": "Ουζμπεκιστάν", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/en.json b/src/Symfony/Component/Intl/Resources/data/regions/en.json index 7466307524..7b053c475c 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/en.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/en.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spain", "ET": "Ethiopia", - "EZ": "Eurozone", "FI": "Finland", "FJ": "Fiji", "FK": "Falkland Islands", @@ -237,7 +236,6 @@ "UA": "Ukraine", "UG": "Uganda", "UM": "U.S. Outlying Islands", - "UN": "United Nations", "US": "United States", "UY": "Uruguay", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es.json b/src/Symfony/Component/Intl/Resources/data/regions/es.json index 3369ed0e0b..451b4a7de6 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "España", "ET": "Etiopía", - "EZ": "zona euro", "FI": "Finlandia", "FJ": "Fiyi", "FK": "Islas Malvinas", @@ -237,7 +236,6 @@ "UA": "Ucrania", "UG": "Uganda", "UM": "Islas menores alejadas de EE. UU.", - "UN": "Naciones Unidas", "US": "Estados Unidos", "UY": "Uruguay", "UZ": "Uzbekistán", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_419.json b/src/Symfony/Component/Intl/Resources/data/regions/es_419.json index 3b0afed924..9b25f033b2 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_419.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_419.json @@ -4,7 +4,6 @@ "AC": "Isla Ascensión", "BA": "Bosnia-Herzegovina", "CI": "Costa de Marfil", - "EZ": "Eurozona", "GG": "Guernesey", "IC": "Islas Canarias", "TA": "Tristán da Cunha", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_MX.json b/src/Symfony/Component/Intl/Resources/data/regions/es_MX.json index 6b0c66ccfc..63cc2187ad 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_MX.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_MX.json @@ -3,12 +3,10 @@ "Names": { "BA": "Bosnia y Herzegovina", "CI": "Côte d’Ivoire", - "EZ": "zona euro", "GG": "Guernsey", "TA": "Tristán de Acuña", "TL": "Timor-Leste", "UM": "Islas menores alejadas de EE. UU.", - "UN": "UN", "VI": "Islas Vírgenes de EE. UU." } } diff --git a/src/Symfony/Component/Intl/Resources/data/regions/es_US.json b/src/Symfony/Component/Intl/Resources/data/regions/es_US.json index b1325a4b7d..3c694616bc 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/es_US.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/es_US.json @@ -3,7 +3,6 @@ "Names": { "AC": "Isla de la Ascensión", "CI": "Côte d’Ivoire", - "EZ": "zona euro", "GG": "Guernsey", "TL": "Timor-Leste", "UM": "Islas menores alejadas de EE. UU.", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/et.json b/src/Symfony/Component/Intl/Resources/data/regions/et.json index e22adf5ffd..61008dc9e1 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/et.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/et.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Hispaania", "ET": "Etioopia", - "EZ": "euroala", "FI": "Soome", "FJ": "Fidži", "FK": "Falklandi saared", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Uganda", "UM": "Ühendriikide hajasaared", - "UN": "Ühendatud Rahvaste Organisatsioon", "US": "Ameerika Ühendriigid", "UY": "Uruguay", "UZ": "Usbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/eu.json b/src/Symfony/Component/Intl/Resources/data/regions/eu.json index 9df3ed11c0..795a63a14a 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/eu.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/eu.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Espainia", "ET": "Etiopia", - "EZ": "Eurogunea", "FI": "Finlandia", "FJ": "Fiji", "FK": "Malvinak", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Uganda", "UM": "Ameriketako Estatu Batuetako Kanpoaldeko Uharte Txikiak", - "UN": "Nazio Batuak", "US": "Ameriketako Estatu Batuak", "UY": "Uruguai", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/fa.json b/src/Symfony/Component/Intl/Resources/data/regions/fa.json index fb2ac4af4c..d62eb92a0e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/fa.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/fa.json @@ -72,7 +72,6 @@ "ER": "اریتره", "ES": "اسپانیا", "ET": "اتیوپی", - "EZ": "منطقه یورو", "FI": "فنلاند", "FJ": "فیجی", "FK": "جزایر فالکلند", @@ -237,7 +236,6 @@ "UA": "اوکراین", "UG": "اوگاندا", "UM": "جزایر دورافتادهٔ ایالات متحده", - "UN": "سازمان ملل متحد", "US": "ایالات متحده", "UY": "اروگوئه", "UZ": "ازبکستان", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/fi.json b/src/Symfony/Component/Intl/Resources/data/regions/fi.json index 4ba9dcd1e7..a46d8175c7 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/fi.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/fi.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Espanja", "ET": "Etiopia", - "EZ": "euroalue", "FI": "Suomi", "FJ": "Fidži", "FK": "Falklandinsaaret", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Uganda", "UM": "Yhdysvaltain erillissaaret", - "UN": "Yhdistyneet kansakunnat", "US": "Yhdysvallat", "UY": "Uruguay", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/fo.json b/src/Symfony/Component/Intl/Resources/data/regions/fo.json index 8459fc4314..649d9bc1bc 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/fo.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/fo.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spania", "ET": "Etiopia", - "EZ": "Evrasona", "FI": "Finnland", "FJ": "Fiji", "FK": "Falklandsoyggjar", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Uganda", "UM": "Sambandsríki Amerikas fjarskotnu oyggjar", - "UN": "Sameindu Tjóðir", "US": "Sambandsríki Amerika", "UY": "Uruguai", "UZ": "Usbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/fr.json b/src/Symfony/Component/Intl/Resources/data/regions/fr.json index 17184b5d4f..466fd46366 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/fr.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/fr.json @@ -72,7 +72,6 @@ "ER": "Érythrée", "ES": "Espagne", "ET": "Éthiopie", - "EZ": "zone euro", "FI": "Finlande", "FJ": "Fidji", "FK": "Îles Malouines", @@ -237,7 +236,6 @@ "UA": "Ukraine", "UG": "Ouganda", "UM": "Îles mineures éloignées des États-Unis", - "UN": "Nations Unies", "US": "États-Unis", "UY": "Uruguay", "UZ": "Ouzbékistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ga.json b/src/Symfony/Component/Intl/Resources/data/regions/ga.json index ba938a53c1..6ca450d3aa 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ga.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ga.json @@ -72,7 +72,6 @@ "ER": "an Eiritré", "ES": "an Spáinn", "ET": "an Aetóip", - "EZ": "Limistéar an euro", "FI": "an Fhionlainn", "FJ": "Fidsí", "FK": "Oileáin Fháclainne", @@ -237,7 +236,6 @@ "UA": "an Úcráin", "UG": "Uganda", "UM": "Oileáin Imeallacha S.A.M.", - "UN": "na Náisiúin Aontaiteh", "US": "Stáit Aontaithe Mheiriceá", "UY": "Uragua", "UZ": "an Úisbéiceastáin", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/gd.json b/src/Symfony/Component/Intl/Resources/data/regions/gd.json index 6844ad29d3..88ebf40449 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/gd.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/gd.json @@ -72,7 +72,6 @@ "ER": "Eartra", "ES": "An Spàinnt", "ET": "An Itiop", - "EZ": "Raon an Eòro", "FI": "An Fhionnlann", "FJ": "Fìdi", "FK": "Na h-Eileanan Fàclannach", @@ -237,7 +236,6 @@ "UA": "An Ucràin", "UG": "Uganda", "UM": "Meanbh-Eileanan Iomallach nan SA", - "UN": "Na Dùthchannan Aonaichte", "US": "Na Stàitean Aonaichte", "UY": "Uruguaidh", "UZ": "Usbagastàn", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/gl.json b/src/Symfony/Component/Intl/Resources/data/regions/gl.json index e6f23e88f5..1cdd8900e1 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/gl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/gl.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "España", "ET": "Etiopía", - "EZ": "Eurozona", "FI": "Finlandia", "FJ": "Fidxi", "FK": "Illas Malvinas", @@ -237,7 +236,6 @@ "UA": "Ucraína", "UG": "Uganda", "UM": "Illas Ultramarinas dos EUA", - "UN": "Nacións Unidas", "US": "Estados Unidos de América", "UY": "Uruguai", "UZ": "Uzbequistán", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/gu.json b/src/Symfony/Component/Intl/Resources/data/regions/gu.json index d3e310380b..83e9ba7a62 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/gu.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/gu.json @@ -72,7 +72,6 @@ "ER": "એરિટ્રિયા", "ES": "સ્પેન", "ET": "ઇથિઓપિયા", - "EZ": "યુરોઝોન", "FI": "ફિનલેન્ડ", "FJ": "ફીજી", "FK": "ફૉકલેન્ડ આઇલેન્ડ્સ", @@ -237,7 +236,6 @@ "UA": "યુક્રેન", "UG": "યુગાંડા", "UM": "યુ.એસ. આઉટલાઇનિંગ આઇલેન્ડ્સ", - "UN": "સંયુક્ત રાષ્ટ્ર", "US": "યુનાઇટેડ સ્ટેટ્સ", "UY": "ઉરુગ્વે", "UZ": "ઉઝ્બેકિસ્તાન", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/he.json b/src/Symfony/Component/Intl/Resources/data/regions/he.json index ce12c7030e..1bbfb96d1f 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/he.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/he.json @@ -72,7 +72,6 @@ "ER": "אריתריאה", "ES": "ספרד", "ET": "אתיופיה", - "EZ": "גוש האירו", "FI": "פינלנד", "FJ": "פיג׳י", "FK": "איי פוקלנד", @@ -237,7 +236,6 @@ "UA": "אוקראינה", "UG": "אוגנדה", "UM": "האיים המרוחקים הקטנים של ארה״ב", - "UN": "האומות המאוחדות", "US": "ארצות הברית", "UY": "אורוגוואי", "UZ": "אוזבקיסטן", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/hi.json b/src/Symfony/Component/Intl/Resources/data/regions/hi.json index 3cb506ce25..9ea72b6b22 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/hi.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/hi.json @@ -72,7 +72,6 @@ "ER": "इरिट्रिया", "ES": "स्पेन", "ET": "इथियोपिया", - "EZ": "यूरोज़ोन", "FI": "फ़िनलैंड", "FJ": "फ़िजी", "FK": "फ़ॉकलैंड द्वीपसमूह", @@ -237,7 +236,6 @@ "UA": "यूक्रेन", "UG": "युगांडा", "UM": "यू॰एस॰ आउटलाइंग द्वीपसमूह", - "UN": "संयुक्त राष्ट्र", "US": "संयुक्त राज्य", "UY": "उरूग्वे", "UZ": "उज़्बेकिस्तान", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/hr.json b/src/Symfony/Component/Intl/Resources/data/regions/hr.json index b086e081de..03f59c24e9 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/hr.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/hr.json @@ -72,7 +72,6 @@ "ER": "Eritreja", "ES": "Španjolska", "ET": "Etiopija", - "EZ": "eurozona", "FI": "Finska", "FJ": "Fidži", "FK": "Falklandski otoci", @@ -237,7 +236,6 @@ "UA": "Ukrajina", "UG": "Uganda", "UM": "Mali udaljeni otoci SAD-a", - "UN": "Ujedinjeni narodi", "US": "Sjedinjene Američke Države", "UY": "Urugvaj", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/hu.json b/src/Symfony/Component/Intl/Resources/data/regions/hu.json index badd300ee3..5011e03982 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/hu.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/hu.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spanyolország", "ET": "Etiópia", - "EZ": "Eurózóna", "FI": "Finnország", "FJ": "Fidzsi", "FK": "Falkland-szigetek", @@ -237,7 +236,6 @@ "UA": "Ukrajna", "UG": "Uganda", "UM": "Az USA lakatlan külbirtokai", - "UN": "Egyesült Nemzetek Szervezete", "US": "Egyesült Államok", "UY": "Uruguay", "UZ": "Üzbegisztán", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/hy.json b/src/Symfony/Component/Intl/Resources/data/regions/hy.json index 08be7f3834..6f4ba308e0 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/hy.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/hy.json @@ -72,7 +72,6 @@ "ER": "Էրիթրեա", "ES": "Իսպանիա", "ET": "Եթովպիա", - "EZ": "Եվրագոտի", "FI": "Ֆինլանդիա", "FJ": "Ֆիջի", "FK": "Ֆոլքլենդյան կղզիներ", @@ -237,7 +236,6 @@ "UA": "Ուկրաինա", "UG": "Ուգանդա", "UM": "Արտաքին կղզիներ (ԱՄՆ)", - "UN": "Միավորված ազգերի կազմակերպություն", "US": "Միացյալ Նահանգներ", "UY": "Ուրուգվայ", "UZ": "Ուզբեկստան", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/id.json b/src/Symfony/Component/Intl/Resources/data/regions/id.json index 552825ccdf..007d02cccb 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/id.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/id.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spanyol", "ET": "Etiopia", - "EZ": "Zona Euro", "FI": "Finlandia", "FJ": "Fiji", "FK": "Kepulauan Malvinas", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Uganda", "UM": "Kepulauan Terluar A.S.", - "UN": "Perserikatan Bangsa-Bangsa", "US": "Amerika Serikat", "UY": "Uruguay", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/in.json b/src/Symfony/Component/Intl/Resources/data/regions/in.json index 552825ccdf..007d02cccb 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/in.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/in.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spanyol", "ET": "Etiopia", - "EZ": "Zona Euro", "FI": "Finlandia", "FJ": "Fiji", "FK": "Kepulauan Malvinas", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Uganda", "UM": "Kepulauan Terluar A.S.", - "UN": "Perserikatan Bangsa-Bangsa", "US": "Amerika Serikat", "UY": "Uruguay", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/is.json b/src/Symfony/Component/Intl/Resources/data/regions/is.json index db171546d2..294f9fb20b 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/is.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/is.json @@ -72,7 +72,6 @@ "ER": "Erítrea", "ES": "Spánn", "ET": "Eþíópía", - "EZ": "Evrusvæðið", "FI": "Finnland", "FJ": "Fídjíeyjar", "FK": "Falklandseyjar", @@ -237,7 +236,6 @@ "UA": "Úkraína", "UG": "Úganda", "UM": "Smáeyjar Bandaríkjanna", - "UN": "Sameinuðu þjóðirnar", "US": "Bandaríkin", "UY": "Úrúgvæ", "UZ": "Úsbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/it.json b/src/Symfony/Component/Intl/Resources/data/regions/it.json index 865a31a6ac..5cef8d7ec7 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/it.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/it.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spagna", "ET": "Etiopia", - "EZ": "Eurozona", "FI": "Finlandia", "FJ": "Figi", "FK": "Isole Falkland", @@ -237,7 +236,6 @@ "UA": "Ucraina", "UG": "Uganda", "UM": "Altre isole americane del Pacifico", - "UN": "Nazioni Unite", "US": "Stati Uniti", "UY": "Uruguay", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/iw.json b/src/Symfony/Component/Intl/Resources/data/regions/iw.json index ce12c7030e..1bbfb96d1f 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/iw.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/iw.json @@ -72,7 +72,6 @@ "ER": "אריתריאה", "ES": "ספרד", "ET": "אתיופיה", - "EZ": "גוש האירו", "FI": "פינלנד", "FJ": "פיג׳י", "FK": "איי פוקלנד", @@ -237,7 +236,6 @@ "UA": "אוקראינה", "UG": "אוגנדה", "UM": "האיים המרוחקים הקטנים של ארה״ב", - "UN": "האומות המאוחדות", "US": "ארצות הברית", "UY": "אורוגוואי", "UZ": "אוזבקיסטן", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ja.json b/src/Symfony/Component/Intl/Resources/data/regions/ja.json index 511a6bde65..f62db01842 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ja.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ja.json @@ -72,7 +72,6 @@ "ER": "エリトリア", "ES": "スペイン", "ET": "エチオピア", - "EZ": "ユーロ圏", "FI": "フィンランド", "FJ": "フィジー", "FK": "フォークランド諸島", @@ -237,7 +236,6 @@ "UA": "ウクライナ", "UG": "ウガンダ", "UM": "合衆国領有小離島", - "UN": "国際連合", "US": "アメリカ合衆国", "UY": "ウルグアイ", "UZ": "ウズベキスタン", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ka.json b/src/Symfony/Component/Intl/Resources/data/regions/ka.json index 861ca2ea95..4d145bab65 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ka.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ka.json @@ -72,7 +72,6 @@ "ER": "ერიტრეა", "ES": "ესპანეთი", "ET": "ეთიოპია", - "EZ": "ევროზონა", "FI": "ფინეთი", "FJ": "ფიჯი", "FK": "ფოლკლენდის კუნძულები", @@ -237,7 +236,6 @@ "UA": "უკრაინა", "UG": "უგანდა", "UM": "აშშ-ის შორეული კუნძულები", - "UN": "გაერო", "US": "ამერიკის შეერთებული შტატები", "UY": "ურუგვაი", "UZ": "უზბეკეთი", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/kk.json b/src/Symfony/Component/Intl/Resources/data/regions/kk.json index 0c6e912947..2cd5007dd1 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/kk.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/kk.json @@ -72,7 +72,6 @@ "ER": "Эритрея", "ES": "Испания", "ET": "Эфиопия", - "EZ": "Еуроаймақ", "FI": "Финляндия", "FJ": "Фиджи", "FK": "Фолкленд аралдары", @@ -237,7 +236,6 @@ "UA": "Украина", "UG": "Уганда", "UM": "АҚШ-тың сыртқы кіші аралдары", - "UN": "Біріккен Ұлттар Ұйымы", "US": "Америка Құрама Штаттары", "UY": "Уругвай", "UZ": "Өзбекстан", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/km.json b/src/Symfony/Component/Intl/Resources/data/regions/km.json index 50d149e55e..21fe35191d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/km.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/km.json @@ -72,7 +72,6 @@ "ER": "អេរីត្រេ", "ES": "អេស្ប៉ាញ", "ET": "អេត្យូពី", - "EZ": "តំបន់ចាយលុយអឺរ៉ូ", "FI": "ហ្វាំងឡង់", "FJ": "ហ្វីជី", "FK": "កោះ​ហ្វក់ឡែន", @@ -237,7 +236,6 @@ "UA": "អ៊ុយក្រែន", "UG": "អ៊ូហ្គង់ដា", "UM": "កោះ​អៅឡាយីង​អាមេរិក", - "UN": "អង្គការសហប្រជាជាតិ", "US": "សហរដ្ឋអាមេរិក", "UY": "អ៊ុយរូហ្គាយ", "UZ": "អ៊ូសបេគីស្ថាន", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/kn.json b/src/Symfony/Component/Intl/Resources/data/regions/kn.json index 0265e4f39b..9e452245b0 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/kn.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/kn.json @@ -72,7 +72,6 @@ "ER": "ಎರಿಟ್ರಿಯಾ", "ES": "ಸ್ಪೇನ್", "ET": "ಇಥಿಯೋಪಿಯಾ", - "EZ": "ಯೂರೋಝೋನ್‌", "FI": "ಫಿನ್‌ಲ್ಯಾಂಡ್", "FJ": "ಫಿಜಿ", "FK": "ಫಾಕ್‌ಲ್ಯಾಂಡ್ ದ್ವೀಪಗಳು", @@ -237,7 +236,6 @@ "UA": "ಉಕ್ರೈನ್", "UG": "ಉಗಾಂಡಾ", "UM": "ಯುಎಸ್‌ ಔಟ್‌ಲೇಯಿಂಗ್ ದ್ವೀಪಗಳು", - "UN": "ಸಂಯುಕ್ತ ಸಂಸ್ಥಾನಗಳು", "US": "ಅಮೇರಿಕಾ ಸಂಯುಕ್ತ ಸಂಸ್ಥಾನ", "UY": "ಉರುಗ್ವೆ", "UZ": "ಉಜ್ಬೇಕಿಸ್ಥಾನ್", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ko.json b/src/Symfony/Component/Intl/Resources/data/regions/ko.json index e33d48d1b9..b955a71a5d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ko.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ko.json @@ -72,7 +72,6 @@ "ER": "에리트리아", "ES": "스페인", "ET": "에티오피아", - "EZ": "유로존", "FI": "핀란드", "FJ": "피지", "FK": "포클랜드 제도", @@ -237,7 +236,6 @@ "UA": "우크라이나", "UG": "우간다", "UM": "미국령 해외 제도", - "UN": "유엔", "US": "미국", "UY": "우루과이", "UZ": "우즈베키스탄", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ky.json b/src/Symfony/Component/Intl/Resources/data/regions/ky.json index e3acf4db41..9b6d27ce83 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ky.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ky.json @@ -72,7 +72,6 @@ "ER": "Эритрея", "ES": "Испания", "ET": "Эфиопия", - "EZ": "Еврозона", "FI": "Финляндия", "FJ": "Фиджи", "FK": "Фолкленд аралдары", @@ -237,7 +236,6 @@ "UA": "Украина", "UG": "Уганда", "UM": "АКШнын сырткы аралдары", - "UN": "БУ", "US": "Америка Кошмо Штаттары", "UY": "Уругвай", "UZ": "Өзбекстан", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/lo.json b/src/Symfony/Component/Intl/Resources/data/regions/lo.json index 8de0bb9006..fb116d91a0 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/lo.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/lo.json @@ -72,7 +72,6 @@ "ER": "ເອຣິເທຣຍ", "ES": "ສະເປນ", "ET": "ອີທິໂອເປຍ", - "EZ": "ເຂດຢູໂຣບ", "FI": "ຟິນແລນ", "FJ": "ຟິຈິ", "FK": "ຫມູ່ເກາະຟອກແລນ", @@ -237,7 +236,6 @@ "UA": "ຢູເຄຣນ", "UG": "ອູການດາ", "UM": "ໝູ່ເກາະຮອບນອກຂອງສະຫະລັດຯ", - "UN": "ສະຫະປະຊາຊາດ", "US": "ສະຫະລັດ", "UY": "ອູຣຸກວຍ", "UZ": "ອຸສເບກິສະຖານ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/lt.json b/src/Symfony/Component/Intl/Resources/data/regions/lt.json index d3d868d21e..f7a79dbb77 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/lt.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/lt.json @@ -72,7 +72,6 @@ "ER": "Eritrėja", "ES": "Ispanija", "ET": "Etiopija", - "EZ": "euro zona", "FI": "Suomija", "FJ": "Fidžis", "FK": "Folklando Salos", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Uganda", "UM": "Jungtinių Valstijų Mažosios Tolimosios Salos", - "UN": "Jungtinės Tautos", "US": "Jungtinės Valstijos", "UY": "Urugvajus", "UZ": "Uzbekistanas", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/lv.json b/src/Symfony/Component/Intl/Resources/data/regions/lv.json index a5d6739a27..87ad10494c 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/lv.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/lv.json @@ -72,7 +72,6 @@ "ER": "Eritreja", "ES": "Spānija", "ET": "Etiopija", - "EZ": "Eirozona", "FI": "Somija", "FJ": "Fidži", "FK": "Folklenda salas", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Uganda", "UM": "ASV Mazās Aizjūras salas", - "UN": "Apvienoto Nāciju Organizācija", "US": "Amerikas Savienotās Valstis", "UY": "Urugvaja", "UZ": "Uzbekistāna", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/meta.json b/src/Symfony/Component/Intl/Resources/data/regions/meta.json index 9dbe566037..54569d238e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/meta.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/meta.json @@ -72,7 +72,6 @@ "ER", "ES", "ET", - "EZ", "FI", "FJ", "FK", @@ -237,7 +236,6 @@ "UA", "UG", "UM", - "UN", "US", "UY", "UZ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/mk.json b/src/Symfony/Component/Intl/Resources/data/regions/mk.json index d03ade1157..bc11772b20 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/mk.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/mk.json @@ -72,7 +72,6 @@ "ER": "Еритреја", "ES": "Шпанија", "ET": "Етиопија", - "EZ": "Еврозона", "FI": "Финска", "FJ": "Фиџи", "FK": "Фолкландски Острови", @@ -237,7 +236,6 @@ "UA": "Украина", "UG": "Уганда", "UM": "Американски територии во Пацификот", - "UN": "Обединети нации", "US": "Соединети Американски Држави", "UY": "Уругвај", "UZ": "Узбекистан", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ml.json b/src/Symfony/Component/Intl/Resources/data/regions/ml.json index 54e7f6568d..6f367931cc 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ml.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ml.json @@ -72,7 +72,6 @@ "ER": "എറിത്രിയ", "ES": "സ്‌പെയിൻ", "ET": "എത്യോപ്യ", - "EZ": "യൂറോസോൺ", "FI": "ഫിൻലാൻഡ്", "FJ": "ഫിജി", "FK": "ഫാക്ക്‌ലാന്റ് ദ്വീപുകൾ", @@ -237,7 +236,6 @@ "UA": "ഉക്രെയ്‌ൻ", "UG": "ഉഗാണ്ട", "UM": "യു.എസ്. ദ്വീപസമൂഹങ്ങൾ", - "UN": "ഐക്യരാഷ്ട്രസഭ", "US": "അമേരിക്കൻ ഐക്യനാടുകൾ", "UY": "ഉറുഗ്വേ", "UZ": "ഉസ്‌ബെക്കിസ്ഥാൻ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/mn.json b/src/Symfony/Component/Intl/Resources/data/regions/mn.json index f32d2000b4..a40f22bb71 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/mn.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/mn.json @@ -72,7 +72,6 @@ "ER": "Эритрей", "ES": "Испани", "ET": "Этиоп", - "EZ": "Евро бүс", "FI": "Финланд", "FJ": "Фижи", "FK": "Фолклендийн арлууд", @@ -237,7 +236,6 @@ "UA": "Украин", "UG": "Уганда", "UM": "Америкийн Нэгдсэн Улсын бага арлууд", - "UN": "Нэгдсэн Үндэстний Байгууллага", "US": "Америкийн Нэгдсэн Улс", "UY": "Уругвай", "UZ": "Узбекистан", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/mr.json b/src/Symfony/Component/Intl/Resources/data/regions/mr.json index f80e64ff77..91786de809 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/mr.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/mr.json @@ -72,7 +72,6 @@ "ER": "एरिट्रिया", "ES": "स्पेन", "ET": "इथिओपिया", - "EZ": "युरोझोन", "FI": "फिनलंड", "FJ": "फिजी", "FK": "फॉकलंड बेटे", @@ -237,7 +236,6 @@ "UA": "युक्रेन", "UG": "युगांडा", "UM": "यू.एस. आउटलाइंग बेटे", - "UN": "संयुक्त राष्ट्र", "US": "युनायटेड स्टेट्स", "UY": "उरुग्वे", "UZ": "उझबेकिस्तान", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ms.json b/src/Symfony/Component/Intl/Resources/data/regions/ms.json index a5b9fae212..6c407fbc87 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ms.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ms.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Sepanyol", "ET": "Ethiopia", - "EZ": "Zon Euro", "FI": "Finland", "FJ": "Fiji", "FK": "Kepulauan Falkland", @@ -237,7 +236,6 @@ "UA": "Ukraine", "UG": "Uganda", "UM": "Kepulauan Terpencil A.S.", - "UN": "Bangsa-bangsa Bersatu", "US": "Amerika Syarikat", "UY": "Uruguay", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/my.json b/src/Symfony/Component/Intl/Resources/data/regions/my.json index 73946f0ac6..5a40c847b5 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/my.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/my.json @@ -72,7 +72,6 @@ "ER": "အီရီထရီးယား", "ES": "စပိန်", "ET": "အီသီယိုးပီးယား", - "EZ": "ဥရောပဒေသ", "FI": "ဖင်လန်", "FJ": "ဖီဂျီ", "FK": "ဖော့ကလန် ကျွန်းစု", @@ -237,7 +236,6 @@ "UA": "ယူကရိန်း", "UG": "ယူဂန်းဒါး", "UM": "ယူနိုက်တက်စတိတ် ကျွန်းနိုင်ငံများ", - "UN": "ကုလသမဂ္ဂ", "US": "အမေရိကန် ပြည်ထောင်စု", "UY": "ဥရုဂွေး", "UZ": "ဥဇဘက်ကစ္စတန်", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/nb.json b/src/Symfony/Component/Intl/Resources/data/regions/nb.json index ad15e81764..dcf10608a7 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/nb.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/nb.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spania", "ET": "Etiopia", - "EZ": "eurosonen", "FI": "Finland", "FJ": "Fiji", "FK": "Falklandsøyene", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Uganda", "UM": "USAs ytre øyer", - "UN": "FN", "US": "USA", "UY": "Uruguay", "UZ": "Usbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ne.json b/src/Symfony/Component/Intl/Resources/data/regions/ne.json index a72f1fdccf..34600f488c 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ne.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ne.json @@ -72,7 +72,6 @@ "ER": "एरित्रिया", "ES": "स्पेन", "ET": "इथियोपिया", - "EZ": "युरोजोन", "FI": "फिन्ल्याण्ड", "FJ": "फिजी", "FK": "फकल्याण्ड टापुहरु", @@ -237,7 +236,6 @@ "UA": "युक्रेन", "UG": "युगाण्डा", "UM": "संयुक्त राज्यका बाह्य टापुहरु", - "UN": "संयुक्त राष्ट्र संघ", "US": "संयुक्त राज्य", "UY": "उरूग्वे", "UZ": "उज्बेकिस्तान", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/nl.json b/src/Symfony/Component/Intl/Resources/data/regions/nl.json index a57efb1b35..48abedc931 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/nl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/nl.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spanje", "ET": "Ethiopië", - "EZ": "eurozone", "FI": "Finland", "FJ": "Fiji", "FK": "Falklandeilanden", @@ -237,7 +236,6 @@ "UA": "Oekraïne", "UG": "Oeganda", "UM": "Kleine afgelegen eilanden van de Verenigde Staten", - "UN": "Verenigde Naties", "US": "Verenigde Staten", "UY": "Uruguay", "UZ": "Oezbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/nn.json b/src/Symfony/Component/Intl/Resources/data/regions/nn.json index 60e95611cf..e80e7639fa 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/nn.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/nn.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spania", "ET": "Etiopia", - "EZ": "eurosona", "FI": "Finland", "FJ": "Fiji", "FK": "Falklandsøyane", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Uganda", "UM": "USAs ytre småøyar", - "UN": "SN", "US": "USA", "UY": "Uruguay", "UZ": "Usbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/no.json b/src/Symfony/Component/Intl/Resources/data/regions/no.json index ad15e81764..dcf10608a7 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/no.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/no.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spania", "ET": "Etiopia", - "EZ": "eurosonen", "FI": "Finland", "FJ": "Fiji", "FK": "Falklandsøyene", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Uganda", "UM": "USAs ytre øyer", - "UN": "FN", "US": "USA", "UY": "Uruguay", "UZ": "Usbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/or.json b/src/Symfony/Component/Intl/Resources/data/regions/or.json index c7d9d4c461..e2680dc0d3 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/or.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/or.json @@ -72,7 +72,6 @@ "ER": "ଇରିଟ୍ରିୟା", "ES": "ସ୍ପେନ୍", "ET": "ଇଥିଓପିଆ", - "EZ": "ୟୁରୋକ୍ଷେତ୍ର", "FI": "ଫିନଲ୍ୟାଣ୍ଡ", "FJ": "ଫିଜି", "FK": "ଫକ୍‌ଲ୍ୟାଣ୍ଡ ଦ୍ଵୀପପୁଞ୍ଜ", @@ -237,7 +236,6 @@ "UA": "ୟୁକ୍ରେନ୍‌", "UG": "ଉଗାଣ୍ଡା", "UM": "ଯୁକ୍ତରାଷ୍ଟ୍ର ଆଉଟ୍‌ଲାଇଙ୍ଗ ଦ୍ଵୀପପୁଞ୍ଜ", - "UN": "ଜାତିସଂଘ", "US": "ଯୁକ୍ତ ରାଷ୍ଟ୍ର", "UY": "ଉରୁଗୁଏ", "UZ": "ଉଜବେକିସ୍ତାନ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/pa.json b/src/Symfony/Component/Intl/Resources/data/regions/pa.json index 206bf55846..f8091bd3bd 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/pa.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/pa.json @@ -72,7 +72,6 @@ "ER": "ਇਰੀਟ੍ਰਿਆ", "ES": "ਸਪੇਨ", "ET": "ਇਥੋਪੀਆ", - "EZ": "EZ", "FI": "ਫਿਨਲੈਂਡ", "FJ": "ਫ਼ਿਜੀ", "FK": "ਫ਼ਾਕਲੈਂਡ ਟਾਪੂ", @@ -237,7 +236,6 @@ "UA": "ਯੂਕਰੇਨ", "UG": "ਯੂਗਾਂਡਾ", "UM": "ਯੂ.ਐੱਸ. ਦੂਰ-ਦੁਰਾਡੇ ਟਾਪੂ", - "UN": "ਸੰਯੁਕਤ ਰਾਸ਼ਟਰ", "US": "ਸੰਯੁਕਤ ਰਾਜ", "UY": "ਉਰੂਗਵੇ", "UZ": "ਉਜ਼ਬੇਕਿਸਤਾਨ", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/pl.json b/src/Symfony/Component/Intl/Resources/data/regions/pl.json index 9abb131f31..671b9d6d74 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/pl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/pl.json @@ -72,7 +72,6 @@ "ER": "Erytrea", "ES": "Hiszpania", "ET": "Etiopia", - "EZ": "strefa euro", "FI": "Finlandia", "FJ": "Fidżi", "FK": "Falklandy", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Uganda", "UM": "Dalekie Wyspy Mniejsze Stanów Zjednoczonych", - "UN": "Organizacja Narodów Zjednoczonych", "US": "Stany Zjednoczone", "UY": "Urugwaj", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ps.json b/src/Symfony/Component/Intl/Resources/data/regions/ps.json index 03675445ed..45d6a2d8e5 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ps.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ps.json @@ -72,7 +72,6 @@ "ER": "اریتره", "ES": "هسپانیه", "ET": "حبشه", - "EZ": "اروپاسيمه", "FI": "فنلینډ", "FJ": "في جي", "FK": "فوکلنډ ټاپو", @@ -237,7 +236,6 @@ "UA": "اوکراین", "UG": "یوګانډا", "UM": "د متحده ایالاتو ټاپو ټاپوګانې", - "UN": "ملگري ملتونه", "US": "متحده ایالات", "UY": "یوروګوی", "UZ": "اوزبکستان", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/pt.json b/src/Symfony/Component/Intl/Resources/data/regions/pt.json index 6bf9bf4269..a004367e16 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/pt.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/pt.json @@ -72,7 +72,6 @@ "ER": "Eritreia", "ES": "Espanha", "ET": "Etiópia", - "EZ": "zona do euro", "FI": "Finlândia", "FJ": "Fiji", "FK": "Ilhas Malvinas", @@ -237,7 +236,6 @@ "UA": "Ucrânia", "UG": "Uganda", "UM": "Ilhas Menores Distantes dos EUA", - "UN": "Nações Unidas", "US": "Estados Unidos", "UY": "Uruguai", "UZ": "Uzbequistão", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/pt_PT.json b/src/Symfony/Component/Intl/Resources/data/regions/pt_PT.json index 38c9ce880b..5b84703bff 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/pt_PT.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/pt_PT.json @@ -19,7 +19,6 @@ "DM": "Domínica", "EE": "Estónia", "EH": "Sara Ocidental", - "EZ": "Zona Euro", "FK": "Ilhas Falkland", "FO": "Ilhas Faroé", "GL": "Gronelândia", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ro.json b/src/Symfony/Component/Intl/Resources/data/regions/ro.json index 7615726758..11c04d88d2 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ro.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ro.json @@ -72,7 +72,6 @@ "ER": "Eritreea", "ES": "Spania", "ET": "Etiopia", - "EZ": "Zona euro", "FI": "Finlanda", "FJ": "Fiji", "FK": "Insulele Falkland", @@ -237,7 +236,6 @@ "UA": "Ucraina", "UG": "Uganda", "UM": "Insulele Îndepărtate ale S.U.A.", - "UN": "Națiunile Unite", "US": "Statele Unite ale Americii", "UY": "Uruguay", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ru.json b/src/Symfony/Component/Intl/Resources/data/regions/ru.json index 3b172ca715..569797192e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ru.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ru.json @@ -72,7 +72,6 @@ "ER": "Эритрея", "ES": "Испания", "ET": "Эфиопия", - "EZ": "еврозона", "FI": "Финляндия", "FJ": "Фиджи", "FK": "Фолклендские о-ва", @@ -237,7 +236,6 @@ "UA": "Украина", "UG": "Уганда", "UM": "Внешние малые о-ва (США)", - "UN": "Организация Объединенных Наций", "US": "Соединенные Штаты", "UY": "Уругвай", "UZ": "Узбекистан", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/se_FI.json b/src/Symfony/Component/Intl/Resources/data/regions/se_FI.json index 5aba89f374..41c5b42ffc 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/se_FI.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/se_FI.json @@ -2,10 +2,8 @@ "Version": "2.1.38.73", "Names": { "BA": "Bosnia ja Hercegovina", - "EZ": "Euroavádat", "KH": "Kamboža", "SD": "Sudan", - "TD": "Chad", - "UN": "Ovttastuvvan Našuvnnat" + "TD": "Chad" } } diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sh.json b/src/Symfony/Component/Intl/Resources/data/regions/sh.json index e8b6649951..b634f3bef4 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sh.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sh.json @@ -72,7 +72,6 @@ "ER": "Eritreja", "ES": "Španija", "ET": "Etiopija", - "EZ": "Evrozona", "FI": "Finska", "FJ": "Fidži", "FK": "Foklandska Ostrva", @@ -237,7 +236,6 @@ "UA": "Ukrajina", "UG": "Uganda", "UM": "Udaljena ostrva SAD", - "UN": "Ujedinjene nacije", "US": "Sjedinjene Države", "UY": "Urugvaj", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/si.json b/src/Symfony/Component/Intl/Resources/data/regions/si.json index 9975aeec7d..c3b969881e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/si.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/si.json @@ -72,7 +72,6 @@ "ER": "එරිත්‍රියාව", "ES": "ස්පාඤ්ඤය", "ET": "ඉතියෝපියාව", - "EZ": "යුරෝ කලාපය", "FI": "ෆින්ලන්තය", "FJ": "ෆීජී", "FK": "ෆෝක්ලන්ත දූපත්", @@ -237,7 +236,6 @@ "UA": "යුක්රේනය", "UG": "උගන්ඩාව", "UM": "එක්සත් ජනපද ඈත දූපත්", - "UN": "එක්සත් ජාතීන්", "US": "එක්සත් ජනපදය", "UY": "උරුගුවේ", "UZ": "උස්බෙකිස්ථානය", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sk.json b/src/Symfony/Component/Intl/Resources/data/regions/sk.json index 0bba0649a8..7d8d918b44 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sk.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sk.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Španielsko", "ET": "Etiópia", - "EZ": "eurozóna", "FI": "Fínsko", "FJ": "Fidži", "FK": "Falklandy", @@ -237,7 +236,6 @@ "UA": "Ukrajina", "UG": "Uganda", "UM": "Menšie odľahlé ostrovy USA", - "UN": "Organizácia Spojených národov", "US": "Spojené štáty", "UY": "Uruguaj", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sl.json b/src/Symfony/Component/Intl/Resources/data/regions/sl.json index c84a219667..15bea67b9d 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sl.json @@ -72,7 +72,6 @@ "ER": "Eritreja", "ES": "Španija", "ET": "Etiopija", - "EZ": "evroobmočje", "FI": "Finska", "FJ": "Fidži", "FK": "Falklandski otoki", @@ -237,7 +236,6 @@ "UA": "Ukrajina", "UG": "Uganda", "UM": "Stranski zunanji otoki Združenih držav", - "UN": "Združeni narodi", "US": "Združene države Amerike", "UY": "Urugvaj", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sq.json b/src/Symfony/Component/Intl/Resources/data/regions/sq.json index af82944add..67a4d6bcf7 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sq.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sq.json @@ -72,7 +72,6 @@ "ER": "Eritre", "ES": "Spanjë", "ET": "Etiopi", - "EZ": "Eurozonë", "FI": "Finlandë", "FJ": "Fixhi", "FK": "Ishujt Falkland", @@ -237,7 +236,6 @@ "UA": "Ukrainë", "UG": "Ugandë", "UM": "Ishujt Periferikë të SHBA-së", - "UN": "Kombet e Bashkuara", "US": "Shtetet e Bashkuara të Amerikës", "UY": "Uruguai", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sr.json b/src/Symfony/Component/Intl/Resources/data/regions/sr.json index 125467cbb1..e11116d2d8 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sr.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sr.json @@ -72,7 +72,6 @@ "ER": "Еритреја", "ES": "Шпанија", "ET": "Етиопија", - "EZ": "Еврозона", "FI": "Финска", "FJ": "Фиџи", "FK": "Фокландска Острва", @@ -237,7 +236,6 @@ "UA": "Украјина", "UG": "Уганда", "UM": "Удаљена острва САД", - "UN": "Уједињене нације", "US": "Сједињене Државе", "UY": "Уругвај", "UZ": "Узбекистан", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn.json b/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn.json index e8b6649951..b634f3bef4 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sr_Latn.json @@ -72,7 +72,6 @@ "ER": "Eritreja", "ES": "Španija", "ET": "Etiopija", - "EZ": "Evrozona", "FI": "Finska", "FJ": "Fidži", "FK": "Foklandska Ostrva", @@ -237,7 +236,6 @@ "UA": "Ukrajina", "UG": "Uganda", "UM": "Udaljena ostrva SAD", - "UN": "Ujedinjene nacije", "US": "Sjedinjene Države", "UY": "Urugvaj", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sv.json b/src/Symfony/Component/Intl/Resources/data/regions/sv.json index 5801373a61..934324ff96 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sv.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sv.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spanien", "ET": "Etiopien", - "EZ": "eurozonen", "FI": "Finland", "FJ": "Fiji", "FK": "Falklandsöarna", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Uganda", "UM": "USA:s yttre öar", - "UN": "Förenta Nationerna", "US": "USA", "UY": "Uruguay", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/sw.json b/src/Symfony/Component/Intl/Resources/data/regions/sw.json index 2cb97478b9..a91a143bbc 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/sw.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/sw.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Uhispania", "ET": "Ethiopia", - "EZ": "EZ", "FI": "Ufini", "FJ": "Fiji", "FK": "Visiwa vya Falkland", @@ -237,7 +236,6 @@ "UA": "Ukraine", "UG": "Uganda", "UM": "Visiwa Vidogo vya Nje vya Marekani", - "UN": "Umoja wa Mataifa", "US": "Marekani", "UY": "Uruguay", "UZ": "Uzibekistani", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ta.json b/src/Symfony/Component/Intl/Resources/data/regions/ta.json index 0cc6b2e94f..b8238eeae1 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ta.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ta.json @@ -72,7 +72,6 @@ "ER": "எரிட்ரியா", "ES": "ஸ்பெயின்", "ET": "எத்தியோப்பியா", - "EZ": "யூரோஜோன்", "FI": "பின்லாந்து", "FJ": "ஃபிஜி", "FK": "ஃபாக்லாந்து தீவுகள்", @@ -237,7 +236,6 @@ "UA": "உக்ரைன்", "UG": "உகாண்டா", "UM": "யூ.எஸ். வெளிப்புறத் தீவுகள்", - "UN": "ஐக்கிய நாடுகள்", "US": "அமெரிக்கா", "UY": "உருகுவே", "UZ": "உஸ்பெகிஸ்தான்", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/te.json b/src/Symfony/Component/Intl/Resources/data/regions/te.json index e845e339bf..0045be5f4e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/te.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/te.json @@ -72,7 +72,6 @@ "ER": "ఎరిట్రియా", "ES": "స్పెయిన్", "ET": "ఇథియోపియా", - "EZ": "యూరోజోన్", "FI": "ఫిన్లాండ్", "FJ": "ఫిజీ", "FK": "ఫాక్‌ల్యాండ్ దీవులు", @@ -237,7 +236,6 @@ "UA": "ఉక్రెయిన్", "UG": "ఉగాండా", "UM": "సంయుక్త రాజ్య అమెరికా బయట ఉన్న దీవులు", - "UN": "యునైటెడ్ నేషన్స్", "US": "యునైటెడ్ స్టేట్స్", "UY": "ఉరుగ్వే", "UZ": "ఉజ్బెకిస్తాన్", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/th.json b/src/Symfony/Component/Intl/Resources/data/regions/th.json index 3317bbc754..defa020527 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/th.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/th.json @@ -72,7 +72,6 @@ "ER": "เอริเทรีย", "ES": "สเปน", "ET": "เอธิโอเปีย", - "EZ": "ยูโรโซน", "FI": "ฟินแลนด์", "FJ": "ฟิจิ", "FK": "หมู่เกาะฟอล์กแลนด์", @@ -237,7 +236,6 @@ "UA": "ยูเครน", "UG": "ยูกันดา", "UM": "หมู่เกาะรอบนอกของสหรัฐอเมริกา", - "UN": "สหประชาชาติ", "US": "สหรัฐอเมริกา", "UY": "อุรุกวัย", "UZ": "อุซเบกิสถาน", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/tl.json b/src/Symfony/Component/Intl/Resources/data/regions/tl.json index 19554b3f88..546894d8f3 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/tl.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/tl.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Spain", "ET": "Ethiopia", - "EZ": "Eurozone", "FI": "Finland", "FJ": "Fiji", "FK": "Falkland Islands", @@ -237,7 +236,6 @@ "UA": "Ukraine", "UG": "Uganda", "UM": "U.S. Outlying Islands", - "UN": "United Nations", "US": "Estados Unidos", "UY": "Uruguay", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/to.json b/src/Symfony/Component/Intl/Resources/data/regions/to.json index 5b63c02018..28812f59ee 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/to.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/to.json @@ -72,7 +72,6 @@ "ER": "ʻElitulia", "ES": "Sipeini", "ET": "ʻĪtiōpia", - "EZ": "ʻEulope fekauʻaki-paʻanga", "FI": "Finilani", "FJ": "Fisi", "FK": "ʻOtumotu Fokulani", @@ -237,7 +236,6 @@ "UA": "ʻŪkalaʻine", "UG": "ʻIukanitā", "UM": "ʻOtumotu siʻi ʻo ʻAmelika", - "UN": "ʻŪ fonua fakatahataha", "US": "Puleʻanga fakatahataha ʻAmelika", "UY": "ʻUlukuai", "UZ": "ʻUsipekitani", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/tr.json b/src/Symfony/Component/Intl/Resources/data/regions/tr.json index 6e12bc5f1f..6996536cbd 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/tr.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/tr.json @@ -72,7 +72,6 @@ "ER": "Eritre", "ES": "İspanya", "ET": "Etiyopya", - "EZ": "Euro Bölgesi", "FI": "Finlandiya", "FJ": "Fiji", "FK": "Falkland Adaları", @@ -237,7 +236,6 @@ "UA": "Ukrayna", "UG": "Uganda", "UM": "ABD Küçük Harici Adaları", - "UN": "Birleşmiş Milletler", "US": "Amerika Birleşik Devletleri", "UY": "Uruguay", "UZ": "Özbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/uk.json b/src/Symfony/Component/Intl/Resources/data/regions/uk.json index 5ddda82648..08d8896215 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/uk.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/uk.json @@ -72,7 +72,6 @@ "ER": "Еритрея", "ES": "Іспанія", "ET": "Ефіопія", - "EZ": "Єврозона", "FI": "Фінляндія", "FJ": "Фіджі", "FK": "Фолклендські острови", @@ -237,7 +236,6 @@ "UA": "Україна", "UG": "Уганда", "UM": "Віддалені острови США", - "UN": "Організація Об’єднаних Націй", "US": "Сполучені Штати", "UY": "Уруґвай", "UZ": "Узбекистан", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/ur.json b/src/Symfony/Component/Intl/Resources/data/regions/ur.json index f315ffdedf..ec4a8aff46 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/ur.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/ur.json @@ -72,7 +72,6 @@ "ER": "اریٹیریا", "ES": "ہسپانیہ", "ET": "ایتھوپیا", - "EZ": "یوروزون", "FI": "فن لینڈ", "FJ": "فجی", "FK": "فاکلینڈ جزائر", @@ -237,7 +236,6 @@ "UA": "یوکرین", "UG": "یوگنڈا", "UM": "امریکہ سے باہر کے چھوٹے جزائز", - "UN": "اقوام متحدہ", "US": "ریاستہائے متحدہ", "UY": "یوروگوئے", "UZ": "ازبکستان", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/uz.json b/src/Symfony/Component/Intl/Resources/data/regions/uz.json index ab2ddfc66e..ff17448c57 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/uz.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/uz.json @@ -72,7 +72,6 @@ "ER": "Eritreya", "ES": "Ispaniya", "ET": "Efiopiya", - "EZ": "yevrozona", "FI": "Finlandiya", "FJ": "Fiji", "FK": "Folklend orollari", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Uganda", "UM": "AQSH yondosh orollari", - "UN": "Birlashgan Millatlar Tashkiloti", "US": "Amerika Qo‘shma Shtatlari", "UY": "Urugvay", "UZ": "Oʻzbekiston", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/vi.json b/src/Symfony/Component/Intl/Resources/data/regions/vi.json index 4d286235a8..71df7f435e 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/vi.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/vi.json @@ -72,7 +72,6 @@ "ER": "Eritrea", "ES": "Tây Ban Nha", "ET": "Ethiopia", - "EZ": "Khu vực đồng Euro", "FI": "Phần Lan", "FJ": "Fiji", "FK": "Quần đảo Falkland", @@ -237,7 +236,6 @@ "UA": "Ukraina", "UG": "Uganda", "UM": "Các tiểu đảo xa của Hoa Kỳ", - "UN": "Liên hiệp quốc", "US": "Hoa Kỳ", "UY": "Uruguay", "UZ": "Uzbekistan", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/zh.json b/src/Symfony/Component/Intl/Resources/data/regions/zh.json index 4fc172b764..6a1e11eefd 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/zh.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/zh.json @@ -72,7 +72,6 @@ "ER": "厄立特里亚", "ES": "西班牙", "ET": "埃塞俄比亚", - "EZ": "欧元区", "FI": "芬兰", "FJ": "斐济", "FK": "福克兰群岛", @@ -237,7 +236,6 @@ "UA": "乌克兰", "UG": "乌干达", "UM": "美国本土外小岛屿", - "UN": "联合国", "US": "美国", "UY": "乌拉圭", "UZ": "乌兹别克斯坦", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant.json b/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant.json index 1b7ef475ad..ab60d98295 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/zh_Hant.json @@ -72,7 +72,6 @@ "ER": "厄利垂亞", "ES": "西班牙", "ET": "衣索比亞", - "EZ": "歐元區", "FI": "芬蘭", "FJ": "斐濟", "FK": "福克蘭群島", @@ -237,7 +236,6 @@ "UA": "烏克蘭", "UG": "烏干達", "UM": "美國本土外小島嶼", - "UN": "聯合國", "US": "美國", "UY": "烏拉圭", "UZ": "烏茲別克", diff --git a/src/Symfony/Component/Intl/Resources/data/regions/zu.json b/src/Symfony/Component/Intl/Resources/data/regions/zu.json index e92b1858c0..77f36017cf 100644 --- a/src/Symfony/Component/Intl/Resources/data/regions/zu.json +++ b/src/Symfony/Component/Intl/Resources/data/regions/zu.json @@ -72,7 +72,6 @@ "ER": "i-Eritrea", "ES": "i-Spain", "ET": "i-Ethiopia", - "EZ": "EZ", "FI": "i-Finland", "FJ": "i-Fiji", "FK": "i-Falkland Islands", @@ -237,7 +236,6 @@ "UA": "i-Ukraine", "UG": "i-Uganda", "UM": "i-U.S. Minor Outlying Islands", - "UN": "I-United Nations", "US": "i-United States", "UY": "i-Uruguay", "UZ": "i-Uzbekistan", diff --git a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractRegionDataProviderTest.php b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractRegionDataProviderTest.php index 1b790d41c9..f282d64e01 100644 --- a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractRegionDataProviderTest.php +++ b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractRegionDataProviderTest.php @@ -94,7 +94,6 @@ abstract class AbstractRegionDataProviderTest extends AbstractDataProviderTest 'ER', 'ES', 'ET', - 'EZ', 'FI', 'FJ', 'FK', @@ -259,7 +258,6 @@ abstract class AbstractRegionDataProviderTest extends AbstractDataProviderTest 'UA', 'UG', 'UM', - 'UN', 'US', 'UY', 'UZ', From 61529f3cd77864d8d8294f130c54caeefd3fca63 Mon Sep 17 00:00:00 2001 From: Marco Lipparini Date: Wed, 5 Sep 2018 16:49:52 +0200 Subject: [PATCH 2/4] [Console] fixed PHPDoc for setArgument/setOption in InputInterface --- src/Symfony/Component/Console/Input/InputInterface.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Console/Input/InputInterface.php b/src/Symfony/Component/Console/Input/InputInterface.php index 805ee51736..c8a357b746 100644 --- a/src/Symfony/Component/Console/Input/InputInterface.php +++ b/src/Symfony/Component/Console/Input/InputInterface.php @@ -90,8 +90,8 @@ interface InputInterface /** * Sets an argument value by name. * - * @param string $name The argument name - * @param string $value The argument value + * @param string $name The argument name + * @param string|string[] $value The argument value * * @throws InvalidArgumentException When argument given doesn't exist */ @@ -127,8 +127,8 @@ interface InputInterface /** * Sets an option value by name. * - * @param string $name The option name - * @param string|bool $value The option value + * @param string $name The option name + * @param string|string[]|bool $value The option value * * @throws InvalidArgumentException When option given doesn't exist */ From 0f861568aaf186bf395f411ae009bbc3bc3b7436 Mon Sep 17 00:00:00 2001 From: downace Date: Sat, 8 Sep 2018 01:12:13 +0900 Subject: [PATCH 3/4] [Console] fixed corrupt error output for unknown multibyte short option --- src/Symfony/Component/Console/Input/ArgvInput.php | 3 ++- src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php index 741c734c72..2735fce693 100644 --- a/src/Symfony/Component/Console/Input/ArgvInput.php +++ b/src/Symfony/Component/Console/Input/ArgvInput.php @@ -121,7 +121,8 @@ class ArgvInput extends Input $len = \strlen($name); for ($i = 0; $i < $len; ++$i) { if (!$this->definition->hasShortcut($name[$i])) { - throw new RuntimeException(sprintf('The "-%s" option does not exist.', $name[$i])); + $encoding = mb_detect_encoding($name, null, true); + throw new RuntimeException(sprintf('The "-%s" option does not exist.', false === $encoding ? $name[$i] : mb_substr($name, $i, 1, $encoding))); } $option = $this->definition->getOptionForShortcut($name[$i]); diff --git a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php index 9290d980f6..c81385e3e3 100644 --- a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php +++ b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php @@ -228,6 +228,11 @@ class ArgvInputTest extends TestCase new InputDefinition(array(new InputArgument('number'))), 'The "-1" option does not exist.', ), + array( + array('cli.php', '-fЩ'), + new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_NONE))), + 'The "-Щ" option does not exist.', + ), ); } From b1aff9993c1d320f34d38bf246036c77bd610b62 Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Sat, 8 Sep 2018 20:42:42 +0200 Subject: [PATCH 4/4] [Console] Correct Command::initialize() and InputInterface::bind() phpdoc regarding thrown exceptions --- src/Symfony/Component/Console/Command/Command.php | 6 +++++- src/Symfony/Component/Console/Input/InputInterface.php | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php index 1f4b845fca..70b4546fde 100644 --- a/src/Symfony/Component/Console/Command/Command.php +++ b/src/Symfony/Component/Console/Command/Command.php @@ -163,10 +163,14 @@ class Command } /** - * Initializes the command just after the input has been validated. + * Initializes the command after the input has been bound and before the input + * is validated. * * This is mainly useful when a lot of commands extends one main command * where some things need to be initialized based on the input arguments and options. + * + * @see InputInterface::bind() + * @see InputInterface::validate() */ protected function initialize(InputInterface $input, OutputInterface $output) { diff --git a/src/Symfony/Component/Console/Input/InputInterface.php b/src/Symfony/Component/Console/Input/InputInterface.php index 805ee51736..1bce4d0635 100644 --- a/src/Symfony/Component/Console/Input/InputInterface.php +++ b/src/Symfony/Component/Console/Input/InputInterface.php @@ -59,6 +59,8 @@ interface InputInterface /** * Binds the current Input instance with the given arguments and options. + * + * @throws RuntimeException */ public function bind(InputDefinition $definition);