Skip to content

[Intl] Blacklist invalid languages #28833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2018
Merged

[Intl] Blacklist invalid languages #28833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/Symfony/Component/Intl/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CHANGELOG
=========

4.2.0
-----

* excluded language codes `mis`, `mul`, `und` and `zxx`
13 changes: 12 additions & 1 deletion src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ class LanguageDataGenerator extends AbstractDataGenerator
'za' => 'zha',
'zh' => 'zho',
);
private static $blacklist = array(
'mul' => true, // Multiple languages
'mis' => true, // Uncoded language
'und' => true, // Unknown language
'zxx' => true, // No linguistic content
);

/**
* Collects all available language codes.
Expand Down Expand Up @@ -126,7 +132,7 @@ protected function generateDataForLocale(BundleReaderInterface $reader, $tempDir
if (isset($localeBundle['Languages']) && null !== $localeBundle['Languages']) {
$data = array(
'Version' => $localeBundle['Version'],
'Names' => iterator_to_array($localeBundle['Languages']),
'Names' => self::generateLanguageNames($localeBundle),
);

$this->languageCodes = array_merge($this->languageCodes, array_keys($data['Names']));
Expand Down Expand Up @@ -162,6 +168,11 @@ protected function generateDataForMeta(BundleReaderInterface $reader, $tempDir)
);
}

private static function generateLanguageNames(ArrayAccessibleResourceBundle $localeBundle): array
{
return array_diff_key(iterator_to_array($localeBundle['Languages']), self::$blacklist);
}

private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $metadataBundle)
{
$aliases = iterator_to_array($metadataBundle['alias']['language']);
Expand Down
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/Resources/data/languages/af.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@
"ms": "Maleis",
"mt": "Maltees",
"mua": "Mundang",
"mul": "Veelvuldige tale",
"mus": "Kreek",
"mwl": "Mirandees",
"my": "Birmaans",
Expand Down Expand Up @@ -374,7 +373,6 @@
"ug": "Uighur",
"uk": "Oekraïens",
"umb": "Umbundu",
"und": "Onbekende of ongeldige taal",
"ur": "Oerdoe",
"uz": "Oezbeeks",
"vai": "Vai",
Expand Down Expand Up @@ -403,7 +401,6 @@
"zh_Hant": "Chinees (Tradisioneel)",
"zu": "Zoeloe",
"zun": "Zuni",
"zxx": "Geen taalinhoud nie",
"zza": "Zaza"
}
}
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/Resources/data/languages/am.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,6 @@
"ms": "ማላይኛ",
"mt": "ማልቲስኛ",
"mua": "ሙንዳንግ",
"mul": "ባለብዙ ቋንቋዎች",
"mus": "ክሪክ",
"mwl": "ሚራንዴዝኛ",
"my": "ቡርማኛ",
Expand Down Expand Up @@ -433,7 +432,6 @@
"ug": "ኡዊግሁርኛ",
"uk": "ዩክሬንኛ",
"umb": "ኡምቡንዱ",
"und": "ያልታወቀ ቋንቋ",
"ur": "ኡርዱኛ",
"uz": "ኡዝቤክኛ",
"vai": "ቫይ",
Expand Down Expand Up @@ -464,7 +462,6 @@
"zh_Hant": "ባህላዊ ቻይንኛ",
"zu": "ዙሉኛ",
"zun": "ዙኒ",
"zxx": "ቋንቋዊ ይዘት አይደለም",
"zza": "ዛዛ"
}
}
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/Resources/data/languages/ar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,6 @@
"ms": "الماليزية",
"mt": "المالطية",
"mua": "مندنج",
"mul": "لغات متعددة",
"mus": "الكريك",
"mwl": "الميرانديز",
"mwr": "الماروارية",
Expand Down Expand Up @@ -492,7 +491,6 @@
"uga": "اليجاريتيك",
"uk": "الأوكرانية",
"umb": "الأمبندو",
"und": "لغة غير معروفة",
"ur": "الأوردية",
"uz": "الأوزبكية",
"vai": "الفاي",
Expand Down Expand Up @@ -529,7 +527,6 @@
"zh_Hant": "الصينية التقليدية",
"zu": "الزولو",
"zun": "الزونية",
"zxx": "بدون محتوى لغوي",
"zza": "زازا"
}
}
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/Resources/data/languages/as.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@
"ms": "মালয়",
"mt": "মাল্টিজ",
"mua": "মুণ্ডাং",
"mul": "একাধিক ভাষা",
"mus": "ক্ৰীক",
"mwl": "মিৰাণ্ডিজ",
"my": "বাৰ্মীজ",
Expand Down Expand Up @@ -361,7 +360,6 @@
"ug": "উইঘুৰ",
"uk": "ইউক্ৰেইনীয়",
"umb": "উম্বুন্দু",
"und": "অজ্ঞাত ভাষা",
"ur": "উৰ্দু",
"uz": "উজবেক",
"vai": "ভাই",
Expand All @@ -388,7 +386,6 @@
"zh_Hant": "পৰম্পৰাগত চীনা",
"zu": "ঝুলু",
"zun": "ঝুনি",
"zxx": "কোনো ভাষা সমল নাই",
"zza": "ঝাঝা"
}
}
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/Resources/data/languages/az.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,6 @@
"ms": "malay",
"mt": "malta",
"mua": "mundanq",
"mul": "çoxsaylı dillər",
"mus": "krik",
"mwl": "mirand",
"mwr": "maruari",
Expand Down Expand Up @@ -475,7 +474,6 @@
"uga": "uqarit",
"uk": "ukrayna",
"umb": "umbundu",
"und": "naməlum dil",
"ur": "urdu",
"uz": "özbək",
"vai": "vai",
Expand Down Expand Up @@ -512,7 +510,6 @@
"zh_Hant": "ənənəvi çin",
"zu": "zulu",
"zun": "zuni",
"zxx": "dil məzmunu yoxdur",
"zza": "zaza"
}
}
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/Resources/data/languages/az_Cyrl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@
"ms": "малај",
"mt": "малта",
"mua": "мунданг",
"mul": "чохсајлы дилләр",
"mus": "крик",
"mwl": "миранд",
"my": "бирман",
Expand Down Expand Up @@ -360,7 +359,6 @@
"ug": "ујғур",
"uk": "украјна",
"umb": "умбунду",
"und": "намәлум дил",
"ur": "урду",
"uz": "өзбәк",
"vai": "ваи",
Expand All @@ -387,7 +385,6 @@
"zh_Hant": "әнәнәви чин",
"zu": "зулу",
"zun": "зуни",
"zxx": "дил мәзмуну јохдур",
"zza": "заза"
}
}
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/Resources/data/languages/be.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@
"ms": "малайская",
"mt": "мальтыйская",
"mua": "мунданг",
"mul": "некалькі моў",
"mus": "мускогі",
"mwl": "мірандыйская",
"my": "бірманская",
Expand Down Expand Up @@ -375,7 +374,6 @@
"ug": "уйгурская",
"uk": "украінская",
"umb": "умбунду",
"und": "невядомая мова",
"ur": "урду",
"uz": "узбекская",
"vai": "ваі",
Expand Down Expand Up @@ -404,7 +402,6 @@
"zh_Hant": "кітайская (традыцыйныя іерогліфы)",
"zu": "зулу",
"zun": "зуні",
"zxx": "няма моўнага матэрыялу",
"zza": "зазакі"
}
}
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/Resources/data/languages/bg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,6 @@
"ms": "малайски",
"mt": "малтийски",
"mua": "мунданг",
"mul": "многоезични",
"mus": "крик",
"mwl": "мирандийски",
"mwr": "марвари",
Expand Down Expand Up @@ -461,7 +460,6 @@
"uga": "угаритски",
"uk": "украински",
"umb": "умбунду",
"und": "неопределен",
"ur": "урду",
"uz": "узбекски",
"vai": "ваи",
Expand Down Expand Up @@ -496,7 +494,6 @@
"zh_Hans": "китайски (опростен)",
"zu": "зулуски",
"zun": "зуни",
"zxx": "без лингвистично съдържание",
"zza": "заза"
}
}
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/Resources/data/languages/bn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,6 @@
"ms": "মালয়",
"mt": "মল্টিয়",
"mua": "মুদাঙ্গ",
"mul": "একাধিক ভাষা",
"mus": "ক্রিক",
"mwl": "মিরান্ডিজ",
"mwr": "মারোয়ারি",
Expand Down Expand Up @@ -479,7 +478,6 @@
"uga": "উগারিটিক",
"uk": "ইউক্রেনীয়",
"umb": "উম্বুন্দু",
"und": "অজানা ভাষা",
"ur": "উর্দু",
"uz": "উজবেকীয়",
"vai": "ভাই",
Expand Down Expand Up @@ -516,7 +514,6 @@
"zh_Hant": "ঐতিহ্যবাহি চীনা",
"zu": "জুলু",
"zun": "জুনি",
"zxx": "ভাষাভিত্তিক বিষয়বস্তু নেই",
"zza": "জাজা"
}
}
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/Resources/data/languages/br.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,6 @@
"ms": "malayseg",
"mt": "malteg",
"mua": "moundangeg",
"mul": "yezhoù lies",
"mus": "muskogi",
"mwl": "mirandeg",
"my": "birmaneg",
Expand Down Expand Up @@ -498,7 +497,6 @@
"uga": "ougariteg",
"uk": "ukraineg",
"umb": "umbundu",
"und": "yezh dianav",
"ur": "ourdou",
"uz": "ouzbekeg",
"vai": "vai",
Expand Down Expand Up @@ -540,7 +538,6 @@
"zh_Hant": "sinaeg hengounel",
"zu": "zouloueg",
"zun": "zuni",
"zxx": "diyezh",
"zza": "zazakeg"
}
}
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/Resources/data/languages/bs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@
"ms": "malajski",
"mt": "malteški",
"mua": "mundang",
"mul": "više jezika",
"mus": "kriški",
"mwl": "mirandeški",
"mwr": "marvari",
Expand Down Expand Up @@ -475,7 +474,6 @@
"uga": "ugaritski",
"uk": "ukrajinski",
"umb": "umbundu",
"und": "nepoznati jezik",
"ur": "urdu",
"uz": "uzbečki",
"vai": "vai",
Expand Down Expand Up @@ -511,7 +509,6 @@
"zh_Hant": "kineski (tradicionalni)",
"zu": "zulu",
"zun": "zuni",
"zxx": "bez lingvističkog sadržaja",
"zza": "zaza"
}
}
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/Resources/data/languages/bs_Cyrl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@
"mr": "марати",
"ms": "малајски",
"mt": "мелтешки",
"mul": "више језика",
"mus": "кришки",
"mwl": "мирандешки",
"mwr": "марвари",
Expand Down Expand Up @@ -402,7 +401,6 @@
"uga": "угаритски",
"uk": "украјински",
"umb": "умбунду",
"und": "непознати језик",
"ur": "урду",
"uz": "узбечки",
"vai": "ваи",
Expand Down Expand Up @@ -432,7 +430,6 @@
"zh_Hant": "кинески (традиционални)",
"zu": "зулу",
"zun": "зуни",
"zxx": "без лингвистичког садржаја",
"zza": "заза"
}
}
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/Resources/data/languages/ca.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,6 @@
"ms": "malai",
"mt": "maltès",
"mua": "mundang",
"mul": "llengües vàries",
"mus": "creek",
"mwl": "mirandès",
"mwr": "marwari",
Expand Down Expand Up @@ -529,7 +528,6 @@
"uga": "ugarític",
"uk": "ucraïnès",
"umb": "umbundu",
"und": "idioma desconegut",
"ur": "urdú",
"uz": "uzbek",
"vai": "vai",
Expand Down Expand Up @@ -571,7 +569,6 @@
"zh_Hant": "xinès tradicional",
"zu": "zulu",
"zun": "zuni",
"zxx": "sense contingut lingüístic",
"zza": "zaza"
}
}
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/Resources/data/languages/ce.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@
"ms": "малайн",
"mt": "мальтойн",
"mua": "мунданг",
"mul": "тайп-тайпа доьзалан меттанаш",
"mus": "крик",
"mwl": "мирандойн",
"my": "бирманийн",
Expand Down Expand Up @@ -366,7 +365,6 @@
"ug": "уйгурийн",
"uk": "украинийн",
"umb": "умбунду",
"und": "боьвзуш боцу мотт",
"ur": "урду",
"uz": "узбекийн",
"vai": "ваи",
Expand Down Expand Up @@ -394,7 +392,6 @@
"zh_Hant": "ламастан цийн",
"zu": "зулу",
"zun": "зуньи",
"zxx": "меттан чулацам боцуш",
"zza": "заза"
}
}
Loading