Skip to content

[Intl] Make intl-data tests pass and save language aliases again #24814

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

Closed
wants to merge 3 commits into from
Closed

[Intl] Make intl-data tests pass and save language aliases again #24814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3366277
[Intl] Make intl-data tests pass again
jakzal Oct 27, 2017
b15ea8d
[Intl] Save language aliases again
jakzal Nov 3, 2017
a1a551d
[Intl] Update assertions to verify data is not empty
jakzal Nov 4, 2017
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
12 changes: 6 additions & 6 deletions 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 @@ -157,20 +157,20 @@ protected function generateDataForMeta(BundleReaderInterface $reader, $tempDir)
return array(
'Version' => $rootBundle['Version'],
'Languages' => $this->languageCodes,
'Aliases' => $metadataBundle['languageAlias'],
'Aliases' => array_map(function (\ResourceBundle $bundle) {
return $bundle['replacement'];
}, iterator_to_array($metadataBundle['alias']['language'])),
'Alpha2ToAlpha3' => $this->generateAlpha2ToAlpha3Mapping($metadataBundle),
);
}

private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $metadataBundle)
{
// Data structure has changed in ICU 5.5 from "languageAlias" to "alias->language"
$aliases = $metadataBundle['languageAlias'] ?: $metadataBundle['alias']['language'];
$aliases = iterator_to_array($metadataBundle['alias']['language']);
$alpha2ToAlpha3 = array();

foreach ($aliases as $alias => $language) {
// $language is a string before ICU 5.5
$language = is_string($language) ? $language : $language['replacement'];
$language = $language['replacement'];
if (2 === strlen($language) && 3 === strlen($alias)) {
if (isset(self::$preferredAlpha2ToAlpha3Mapping[$language])) {
// Validate to prevent typos
Expand All @@ -184,7 +184,7 @@ private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $me
}

$alpha3 = self::$preferredAlpha2ToAlpha3Mapping[$language];
$alpha2 = is_string($aliases[$alpha3]) ? $aliases[$alpha3] : $aliases[$alpha3]['replacement'];
$alpha2 = $aliases[$alpha3]['replacement'];

if ($language !== $alpha2) {
throw new RuntimeException(
Expand Down
339 changes: 338 additions & 1 deletion src/Symfony/Component/Intl/Resources/data/languages/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,344 @@
"zxx",
"zza"
],
"Aliases": null,
"Aliases": {
"aa_SAAHO": "ssy",
"aar": "aa",
"abk": "ab",
"afr": "af",
"aju": "jrb",
"aka": "ak",
"alb": "sq",
"als": "sq",
"amh": "am",
"ara": "ar",
"arb": "ar",
"arg": "an",
"arm": "hy",
"art_lojban": "jbo",
"asm": "as",
"ava": "av",
"ave": "ae",
"aym": "ay",
"ayr": "ay",
"az_AZ": "az_Latn_AZ",
"aze": "az",
"azj": "az",
"bak": "ba",
"bam": "bm",
"baq": "eu",
"bcc": "bal",
"bcl": "bik",
"bel": "be",
"ben": "bn",
"bh": "bho",
"bih": "bho",
"bis": "bi",
"bod": "bo",
"bos": "bs",
"bre": "br",
"bs_BA": "bs_Latn_BA",
"bul": "bg",
"bur": "my",
"bxk": "luy",
"bxr": "bua",
"cat": "ca",
"ces": "cs",
"cha": "ch",
"che": "ce",
"chi": "zh",
"chu": "cu",
"chv": "cv",
"cld": "syr",
"cmn": "zh",
"cor": "kw",
"cos": "co",
"cre": "cr",
"cwd": "cr",
"cym": "cy",
"cze": "cs",
"dan": "da",
"deu": "de",
"dgo": "doi",
"dhd": "mwr",
"dik": "din",
"diq": "zza",
"div": "dv",
"dut": "nl",
"dzo": "dz",
"ekk": "et",
"ell": "el",
"emk": "man",
"eng": "en",
"epo": "eo",
"esk": "ik",
"est": "et",
"eus": "eu",
"ewe": "ee",
"fao": "fo",
"fas": "fa",
"fat": "ak",
"fij": "fj",
"fin": "fi",
"fra": "fr",
"fre": "fr",
"fry": "fy",
"fuc": "ff",
"ful": "ff",
"gaz": "om",
"gbo": "grb",
"geo": "ka",
"ger": "de",
"gla": "gd",
"gle": "ga",
"glg": "gl",
"glv": "gv",
"gno": "gon",
"gre": "el",
"grn": "gn",
"gug": "gn",
"guj": "gu",
"gya": "gba",
"ha_Latn_GH": "ha_GH",
"ha_Latn_NE": "ha_NE",
"ha_Latn_NG": "ha_NG",
"hat": "ht",
"hau": "ha",
"hbs": "sr_Latn",
"hdn": "hai",
"hea": "hmn",
"heb": "he",
"her": "hz",
"him": "srx",
"hin": "hi",
"hmo": "ho",
"hrv": "hr",
"hun": "hu",
"hye": "hy",
"i_ami": "ami",
"i_bnn": "bnn",
"i_hak": "hak",
"i_klingon": "tlh",
"i_lux": "lb",
"i_navajo": "nv",
"i_pwn": "pwn",
"i_tao": "tao",
"i_tay": "tay",
"i_tsu": "tsu",
"ibo": "ig",
"ice": "is",
"ido": "io",
"iii": "ii",
"ike": "iu",
"iku": "iu",
"ile": "ie",
"in": "id",
"ina": "ia",
"ind": "id",
"ipk": "ik",
"isl": "is",
"ita": "it",
"iw": "he",
"jav": "jv",
"ji": "yi",
"jpn": "ja",
"jw": "jv",
"kal": "kl",
"kan": "kn",
"kas": "ks",
"kat": "ka",
"kau": "kr",
"kaz": "kk",
"khk": "mn",
"khm": "km",
"kik": "ki",
"kin": "rw",
"kir": "ky",
"kk_Cyrl_KZ": "kk_KZ",
"kmr": "ku",
"knc": "kr",
"kng": "kg",
"knn": "kok",
"kom": "kv",
"kon": "kg",
"kor": "ko",
"kpv": "kv",
"ks_Arab_IN": "ks_IN",
"kua": "kj",
"kur": "ku",
"ky_Cyrl_KG": "ky_KG",
"lao": "lo",
"lat": "la",
"lav": "lv",
"lbk": "bnc",
"lim": "li",
"lin": "ln",
"lit": "lt",
"ltz": "lb",
"lub": "lu",
"lug": "lg",
"lvs": "lv",
"mac": "mk",
"mah": "mh",
"mal": "ml",
"mao": "mi",
"mar": "mr",
"may": "ms",
"mhr": "chm",
"mkd": "mk",
"mlg": "mg",
"mlt": "mt",
"mn_Cyrl_MN": "mn_MN",
"mnk": "man",
"mo": "ro_MD",
"mol": "ro_MD",
"mon": "mn",
"mri": "mi",
"ms_Latn_BN": "ms_BN",
"ms_Latn_MY": "ms_MY",
"ms_Latn_SG": "ms_SG",
"msa": "ms",
"mup": "raj",
"mya": "my",
"nau": "na",
"nav": "nv",
"nbl": "nr",
"nde": "nd",
"ndo": "ng",
"nep": "ne",
"nld": "nl",
"nno": "nn",
"no": "nb",
"no_BOKMAL": "nb",
"no_NYNORSK": "nn",
"no_bok": "nb",
"no_nyn": "nn",
"nob": "nb",
"nor": "nb",
"npi": "ne",
"nya": "ny",
"oci": "oc",
"ojg": "oj",
"oji": "oj",
"ori": "or",
"orm": "om",
"ory": "or",
"oss": "os",
"pa_IN": "pa_Guru_IN",
"pa_PK": "pa_Arab_PK",
"pan": "pa",
"pbu": "ps",
"per": "fa",
"pes": "fa",
"pli": "pi",
"plt": "mg",
"pnb": "lah",
"pol": "pl",
"por": "pt",
"prs": "fa_AF",
"pus": "ps",
"que": "qu",
"quz": "qu",
"rmy": "rom",
"roh": "rm",
"ron": "ro",
"rum": "ro",
"run": "rn",
"rus": "ru",
"sag": "sg",
"san": "sa",
"scc": "sr",
"scr": "hr",
"sgn_BE_FR": "sfb",
"sgn_BE_NL": "vgt",
"sgn_CH_DE": "sgg",
"sh": "sr_Latn",
"shi_MA": "shi_Tfng_MA",
"sin": "si",
"slk": "sk",
"slo": "sk",
"slv": "sl",
"sme": "se",
"smo": "sm",
"sna": "sn",
"snd": "sd",
"som": "so",
"sot": "st",
"spa": "es",
"spy": "kln",
"sqi": "sq",
"sr_BA": "sr_Cyrl_BA",
"sr_ME": "sr_Latn_ME",
"sr_RS": "sr_Cyrl_RS",
"sr_XK": "sr_Cyrl_XK",
"src": "sc",
"srd": "sc",
"srp": "sr",
"ssw": "ss",
"sun": "su",
"swa": "sw",
"swc": "sw_CD",
"swe": "sv",
"swh": "sw",
"tah": "ty",
"tam": "ta",
"tat": "tt",
"tel": "te",
"tgk": "tg",
"tgl": "fil",
"tha": "th",
"tib": "bo",
"tir": "ti",
"tl": "fil",
"ton": "to",
"tsn": "tn",
"tso": "ts",
"ttq": "tmh",
"tuk": "tk",
"tur": "tr",
"tw": "ak",
"twi": "ak",
"tzm_Latn_MA": "tzm_MA",
"ug_Arab_CN": "ug_CN",
"uig": "ug",
"ukr": "uk",
"umu": "del",
"urd": "ur",
"uz_AF": "uz_Arab_AF",
"uz_UZ": "uz_Latn_UZ",
"uzb": "uz",
"uzn": "uz",
"vai_LR": "vai_Vaii_LR",
"ven": "ve",
"vie": "vi",
"vol": "vo",
"wel": "cy",
"wln": "wa",
"wol": "wo",
"xho": "xh",
"xpe": "kpe",
"xsl": "den",
"ydd": "yi",
"yid": "yi",
"yor": "yo",
"yue_CN": "yue_Hans_CN",
"yue_HK": "yue_Hant_HK",
"zai": "zap",
"zh_CN": "zh_Hans_CN",
"zh_HK": "zh_Hant_HK",
"zh_MO": "zh_Hant_MO",
"zh_SG": "zh_Hans_SG",
"zh_TW": "zh_Hant_TW",
"zh_guoyu": "zh",
"zh_hakka": "hak",
"zh_min_nan": "nan",
"zh_xiang": "hsn",
"zha": "za",
"zho": "zh",
"zsm": "ms",
"zul": "zu",
"zyb": "za"
},
"Alpha2ToAlpha3": {
"aa": "aar",
"ab": "abk",
Expand Down
Loading