Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1bb7dde

Browse files
committed
[Intl] Made countries ISO 3166 compliant + exclude Zzzz script code
1 parent2e872c4 commit1bb7dde

File tree

386 files changed

+388
-1765
lines changed

Some content is hidden

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

386 files changed

+388
-1765
lines changed

‎src/Symfony/Component/Intl/CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ CHANGELOG
1010
* added`Locales` in favor of`Intl::getLocaleBundle()`
1111
* added`Countries` in favor of`Intl::getRegionBundle()`
1212
* added`Timezones`
13+
* made country codes ISO 3166 compliant
14+
* excluded script code`Zzzz`
1315

1416
4.2.0
1517
-----

‎src/Symfony/Component/Intl/Countries.php‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,16 @@
2222
finalclass Countriesextends ResourceBundle
2323
{
2424
/**
25-
* @return string[]
25+
* Returns all available countries.
26+
*
27+
* Countries are returned as uppercase ISO 3166 two-letter country codes.
28+
*
29+
* A full table of ISO 3166 country codes can be found here:
30+
* https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes
31+
*
32+
* This list only contains "officially assigned ISO 3166-1 alpha-2" country codes.
33+
*
34+
* @return string[] an array of canonical ISO 3166 country codes
2635
*/
2736
publicstaticfunctiongetCountryCodes():array
2837
{

‎src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,21 @@
2828
class RegionDataGeneratorextends AbstractDataGenerator
2929
{
3030
privatestatic$blacklist = [
31-
// Look like countries, but are sub-continents
32-
'QO' =>true,// Outlying Oceania
31+
// Exceptional reservations
32+
'AC' =>true,// Ascension Island
33+
'CP' =>true,// Clipperton Island
34+
'DG' =>true,// Diego Garcia
35+
'EA' =>true,// Ceuta & Melilla
3336
'EU' =>true,// European Union
3437
'EZ' =>true,// Eurozone
38+
'IC' =>true,// Canary Islands
39+
'TA' =>true,// Tristan da Cunha
3540
'UN' =>true,// United Nations
36-
// Uninhabited islands
37-
'BV' =>true,// Bouvet Island
38-
'HM' =>true,// Heard & McDonald Islands
39-
'CP' =>true,// Clipperton Island
41+
// User-assigned
42+
'QO' =>true,// Outlying Oceania
43+
'XA' =>true,// Pseudo-Accents
44+
'XB' =>true,// Pseudo-Bidi
45+
'XK' =>true,// Kosovo
4046
// Misc
4147
'ZZ' =>true,// Unknown Region
4248
];

‎src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
*/
2525
class ScriptDataGeneratorextends AbstractDataGenerator
2626
{
27+
privatestatic$blacklist = [
28+
'Zzzz' =>true,// Unknown Script
29+
];
30+
2731
/**
2832
* Collects all available language codes.
2933
*
@@ -66,7 +70,7 @@ protected function generateDataForLocale(BundleReaderInterface $reader, $tempDir
6670
if (isset($localeBundle['Scripts']) &&null !==$localeBundle['Scripts']) {
6771
$data = [
6872
'Version' =>$localeBundle['Version'],
69-
'Names' =>iterator_to_array($localeBundle['Scripts']),
73+
'Names' =>array_diff_key(iterator_to_array($localeBundle['Scripts']),self::$blacklist),
7074
];
7175

7276
$this->scriptCodes =array_merge($this->scriptCodes,array_keys($data['Names']));

‎src/Symfony/Component/Intl/Resources/data/locales/af.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
"en_CX":"Engels (Kerseiland)",
116116
"en_CY":"Engels (Siprus)",
117117
"en_DE":"Engels (Duitsland)",
118-
"en_DG":"Engels (Diego Garcia)",
119118
"en_DK":"Engels (Denemarke)",
120119
"en_DM":"Engels (Dominica)",
121120
"en_ER":"Engels (Eritrea)",
@@ -208,13 +207,11 @@
208207
"es_CR":"Spaans (Costa Rica)",
209208
"es_CU":"Spaans (Kuba)",
210209
"es_DO":"Spaans (Dominikaanse Republiek)",
211-
"es_EA":"Spaans (Ceuta en Melilla)",
212210
"es_EC":"Spaans (Ecuador)",
213211
"es_ES":"Spaans (Spanje)",
214212
"es_GQ":"Spaans (Ekwatoriaal-Guinee)",
215213
"es_GT":"Spaans (Guatemala)",
216214
"es_HN":"Spaans (Honduras)",
217-
"es_IC":"Spaans (Kanariese Eilande)",
218215
"es_MX":"Spaans (Meksiko)",
219216
"es_NI":"Spaans (Nicaragua)",
220217
"es_PA":"Spaans (Panama)",
@@ -507,22 +504,18 @@
507504
"sq":"Albanees",
508505
"sq_AL":"Albanees (Albanië)",
509506
"sq_MK":"Albanees (Macedonië)",
510-
"sq_XK":"Albanees (Kosovo)",
511507
"sr":"Serwies",
512508
"sr_BA":"Serwies (Bosnië en Herzegowina)",
513509
"sr_Cyrl":"Serwies (Sirillies)",
514510
"sr_Cyrl_BA":"Serwies (Sirillies, Bosnië en Herzegowina)",
515511
"sr_Cyrl_ME":"Serwies (Sirillies, Montenegro)",
516512
"sr_Cyrl_RS":"Serwies (Sirillies, Serwië)",
517-
"sr_Cyrl_XK":"Serwies (Sirillies, Kosovo)",
518513
"sr_Latn":"Serwies (Latyn)",
519514
"sr_Latn_BA":"Serwies (Latyn, Bosnië en Herzegowina)",
520515
"sr_Latn_ME":"Serwies (Latyn, Montenegro)",
521516
"sr_Latn_RS":"Serwies (Latyn, Serwië)",
522-
"sr_Latn_XK":"Serwies (Latyn, Kosovo)",
523517
"sr_ME":"Serwies (Montenegro)",
524518
"sr_RS":"Serwies (Serwië)",
525-
"sr_XK":"Serwies (Kosovo)",
526519
"sv":"Sweeds",
527520
"sv_AX":"Sweeds (Ålandeilande)",
528521
"sv_FI":"Sweeds (Finland)",

‎src/Symfony/Component/Intl/Resources/data/locales/am.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
"en_CX":"እንግሊዝኛ (ክሪስማስ ደሴት)",
116116
"en_CY":"እንግሊዝኛ (ሳይፕረስ)",
117117
"en_DE":"እንግሊዝኛ (ጀርመን)",
118-
"en_DG":"እንግሊዝኛ (ዲዬጎ ጋርሺያ)",
119118
"en_DK":"እንግሊዝኛ (ዴንማርክ)",
120119
"en_DM":"እንግሊዝኛ (ዶሚኒካ)",
121120
"en_ER":"እንግሊዝኛ (ኤርትራ)",
@@ -208,13 +207,11 @@
208207
"es_CR":"ስፓንሽኛ (ኮስታሪካ)",
209208
"es_CU":"ስፓንሽኛ (ኩባ)",
210209
"es_DO":"ስፓንሽኛ (ዶመኒካን ሪፑብሊክ)",
211-
"es_EA":"ስፓንሽኛ (ሴኡታና ሜሊላ)",
212210
"es_EC":"ስፓንሽኛ (ኢኳዶር)",
213211
"es_ES":"ስፓንሽኛ (ስፔን)",
214212
"es_GQ":"ስፓንሽኛ (ኢኳቶሪያል ጊኒ)",
215213
"es_GT":"ስፓንሽኛ (ጉዋቲማላ)",
216214
"es_HN":"ስፓንሽኛ (ሆንዱራስ)",
217-
"es_IC":"ስፓንሽኛ (የካናሪ ደሴቶች)",
218215
"es_MX":"ስፓንሽኛ (ሜክሲኮ)",
219216
"es_NI":"ስፓንሽኛ (ኒካራጓ)",
220217
"es_PA":"ስፓንሽኛ (ፓናማ)",
@@ -507,22 +504,18 @@
507504
"sq":"አልባንያንኛ",
508505
"sq_AL":"አልባንያንኛ (አልባኒያ)",
509506
"sq_MK":"አልባንያንኛ (ሰሜን መቄዶንያ)",
510-
"sq_XK":"አልባንያንኛ (ኮሶቮ)",
511507
"sr":"ሰርብያኛ",
512508
"sr_BA":"ሰርብያኛ (ቦስኒያ እና ሄርዞጎቪኒያ)",
513509
"sr_Cyrl":"ሰርብያኛ (ሲይሪልክ)",
514510
"sr_Cyrl_BA":"ሰርብያኛ (ሲይሪልክ, ቦስኒያ እና ሄርዞጎቪኒያ)",
515511
"sr_Cyrl_ME":"ሰርብያኛ (ሲይሪልክ, ሞንተኔግሮ)",
516512
"sr_Cyrl_RS":"ሰርብያኛ (ሲይሪልክ, ሰርብያ)",
517-
"sr_Cyrl_XK":"ሰርብያኛ (ሲይሪልክ, ኮሶቮ)",
518513
"sr_Latn":"ሰርብያኛ (ላቲን)",
519514
"sr_Latn_BA":"ሰርብያኛ (ላቲን, ቦስኒያ እና ሄርዞጎቪኒያ)",
520515
"sr_Latn_ME":"ሰርብያኛ (ላቲን, ሞንተኔግሮ)",
521516
"sr_Latn_RS":"ሰርብያኛ (ላቲን, ሰርብያ)",
522-
"sr_Latn_XK":"ሰርብያኛ (ላቲን, ኮሶቮ)",
523517
"sr_ME":"ሰርብያኛ (ሞንተኔግሮ)",
524518
"sr_RS":"ሰርብያኛ (ሰርብያ)",
525-
"sr_XK":"ሰርብያኛ (ኮሶቮ)",
526519
"sv":"ስዊድንኛ",
527520
"sv_AX":"ስዊድንኛ (የአላንድ ደሴቶች)",
528521
"sv_FI":"ስዊድንኛ (ፊንላንድ)",

‎src/Symfony/Component/Intl/Resources/data/locales/ar.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
"en_CX":"الإنجليزية (جزيرة كريسماس)",
116116
"en_CY":"الإنجليزية (قبرص)",
117117
"en_DE":"الإنجليزية (ألمانيا)",
118-
"en_DG":"الإنجليزية (دييغو غارسيا)",
119118
"en_DK":"الإنجليزية (الدانمرك)",
120119
"en_DM":"الإنجليزية (دومينيكا)",
121120
"en_ER":"الإنجليزية (إريتريا)",
@@ -208,13 +207,11 @@
208207
"es_CR":"الإسبانية (كوستاريكا)",
209208
"es_CU":"الإسبانية (كوبا)",
210209
"es_DO":"الإسبانية (جمهورية الدومينيكان)",
211-
"es_EA":"الإسبانية (سيوتا وميليلا)",
212210
"es_EC":"الإسبانية (الإكوادور)",
213211
"es_ES":"الإسبانية (إسبانيا)",
214212
"es_GQ":"الإسبانية (غينيا الاستوائية)",
215213
"es_GT":"الإسبانية (غواتيمالا)",
216214
"es_HN":"الإسبانية (هندوراس)",
217-
"es_IC":"الإسبانية (جزر الكناري)",
218215
"es_MX":"الإسبانية (المكسيك)",
219216
"es_NI":"الإسبانية (نيكاراغوا)",
220217
"es_PA":"الإسبانية (بنما)",
@@ -507,22 +504,18 @@
507504
"sq":"الألبانية",
508505
"sq_AL":"الألبانية (ألبانيا)",
509506
"sq_MK":"الألبانية (مقدونيا الشمالية)",
510-
"sq_XK":"الألبانية (كوسوفو)",
511507
"sr":"الصربية",
512508
"sr_BA":"الصربية (البوسنة والهرسك)",
513509
"sr_Cyrl":"الصربية (السيريلية)",
514510
"sr_Cyrl_BA":"الصربية (السيريلية, البوسنة والهرسك)",
515511
"sr_Cyrl_ME":"الصربية (السيريلية, الجبل الأسود)",
516512
"sr_Cyrl_RS":"الصربية (السيريلية, صربيا)",
517-
"sr_Cyrl_XK":"الصربية (السيريلية, كوسوفو)",
518513
"sr_Latn":"الصربية (اللاتينية)",
519514
"sr_Latn_BA":"الصربية (اللاتينية, البوسنة والهرسك)",
520515
"sr_Latn_ME":"الصربية (اللاتينية, الجبل الأسود)",
521516
"sr_Latn_RS":"الصربية (اللاتينية, صربيا)",
522-
"sr_Latn_XK":"الصربية (اللاتينية, كوسوفو)",
523517
"sr_ME":"الصربية (الجبل الأسود)",
524518
"sr_RS":"الصربية (صربيا)",
525-
"sr_XK":"الصربية (كوسوفو)",
526519
"sv":"السويدية",
527520
"sv_AX":"السويدية (جزر آلاند)",
528521
"sv_FI":"السويدية (فنلندا)",

‎src/Symfony/Component/Intl/Resources/data/locales/ar_LY.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"Names": {
33
"en_MS":"الإنجليزية (مونتيسيرات)",
4-
"es_EA":"الإسبانية (سبتة ومليلية)",
54
"es_UY":"الإسبانية (أوروغواي)",
65
"lo":"اللاوو",
76
"lo_LA":"اللاوو (لاوس)",

‎src/Symfony/Component/Intl/Resources/data/locales/ar_SA.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"en_BS":"الإنجليزية (جزر البهاما)",
44
"en_MO":"الإنجليزية (ماكاو الصينية (منطقة إدارية خاصة))",
55
"en_MS":"الإنجليزية (مونتيسيرات)",
6-
"es_EA":"الإسبانية (سبتة ومليلية)",
76
"es_UY":"الإسبانية (أوروغواي)",
87
"lo":"اللاوو",
98
"lo_LA":"اللاوو (لاوس)",

‎src/Symfony/Component/Intl/Resources/data/locales/as.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
"en_CX":"ইংৰাজী (খ্ৰীষ্টমাছ দ্বীপ)",
116116
"en_CY":"ইংৰাজী (চাইপ্ৰাছ)",
117117
"en_DE":"ইংৰাজী (জাৰ্মানী)",
118-
"en_DG":"ইংৰাজী (ডিয়েগো গাৰ্চিয়া)",
119118
"en_DK":"ইংৰাজী (ডেনমাৰ্ক)",
120119
"en_DM":"ইংৰাজী (ড’মিনিকা)",
121120
"en_ER":"ইংৰাজী (এৰিত্ৰিয়া)",
@@ -208,13 +207,11 @@
208207
"es_CR":"স্পেনিচ (কোষ্টা ৰিকা)",
209208
"es_CU":"স্পেনিচ (কিউবা)",
210209
"es_DO":"স্পেনিচ (ড’মিনিকান ৰিপাব্লিক)",
211-
"es_EA":"স্পেনিচ (চেউটা আৰু মেলিলা)",
212210
"es_EC":"স্পেনিচ (ইকুৱেডৰ)",
213211
"es_ES":"স্পেনিচ (স্পেইন)",
214212
"es_GQ":"স্পেনিচ (ইকুৱেটৰিয়েল গিনি)",
215213
"es_GT":"স্পেনিচ (গুৱাটেমালা)",
216214
"es_HN":"স্পেনিচ (হন্দুৰাছ)",
217-
"es_IC":"স্পেনিচ (কেনেৰী দ্বীপপুঞ্জ)",
218215
"es_MX":"স্পেনিচ (মেক্সিকো)",
219216
"es_NI":"স্পেনিচ (নিকাৰাগুৱা)",
220217
"es_PA":"স্পেনিচ (পানামা)",
@@ -503,22 +500,18 @@
503500
"sq":"আলবেনীয়",
504501
"sq_AL":"আলবেনীয় (আলবেনিয়া)",
505502
"sq_MK":"আলবেনীয় (মেচিডোনীয়া)",
506-
"sq_XK":"আলবেনীয় (কচ’ভ’)",
507503
"sr":"ছাৰ্বিয়ান",
508504
"sr_BA":"ছাৰ্বিয়ান (ব’ছনিয়া আৰু হাৰ্জেগ’ভিনা)",
509505
"sr_Cyrl":"ছাৰ্বিয়ান (চিৰিলিক)",
510506
"sr_Cyrl_BA":"ছাৰ্বিয়ান (চিৰিলিক, ব’ছনিয়া আৰু হাৰ্জেগ’ভিনা)",
511507
"sr_Cyrl_ME":"ছাৰ্বিয়ান (চিৰিলিক, মণ্টেনেগ্ৰু)",
512508
"sr_Cyrl_RS":"ছাৰ্বিয়ান (চিৰিলিক, ছাৰ্বিয়া)",
513-
"sr_Cyrl_XK":"ছাৰ্বিয়ান (চিৰিলিক, কচ’ভ’)",
514509
"sr_Latn":"ছাৰ্বিয়ান (লেটিন)",
515510
"sr_Latn_BA":"ছাৰ্বিয়ান (লেটিন, ব’ছনিয়া আৰু হাৰ্জেগ’ভিনা)",
516511
"sr_Latn_ME":"ছাৰ্বিয়ান (লেটিন, মণ্টেনেগ্ৰু)",
517512
"sr_Latn_RS":"ছাৰ্বিয়ান (লেটিন, ছাৰ্বিয়া)",
518-
"sr_Latn_XK":"ছাৰ্বিয়ান (লেটিন, কচ’ভ’)",
519513
"sr_ME":"ছাৰ্বিয়ান (মণ্টেনেগ্ৰু)",
520514
"sr_RS":"ছাৰ্বিয়ান (ছাৰ্বিয়া)",
521-
"sr_XK":"ছাৰ্বিয়ান (কচ’ভ’)",
522515
"sv":"ছুইডিচ",
523516
"sv_AX":"ছুইডিচ (আলণ্ড দ্বীপপুঞ্জ)",
524517
"sv_FI":"ছুইডিচ (ফিনলেণ্ড)",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp