[Intl] Order alpha2 to alpha3 mapping + phpdoc fixes
This commit is contained in:
parent
69ef436481
commit
867e3de92f
@ -31,13 +31,16 @@ final class Countries extends ResourceBundle
|
||||
*
|
||||
* This list only contains "officially assigned ISO 3166-1 alpha-2" country codes.
|
||||
*
|
||||
* @return string[] an array of canonical ISO 3166 country codes
|
||||
* @return string[] an array of canonical ISO 3166 alpha-2 country codes
|
||||
*/
|
||||
public static function getCountryCodes(): array
|
||||
{
|
||||
return self::readEntry(['Regions'], 'meta');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $country Alpha2 country code
|
||||
*/
|
||||
public static function exists(string $country): bool
|
||||
{
|
||||
try {
|
||||
@ -50,6 +53,8 @@ final class Countries extends ResourceBundle
|
||||
}
|
||||
|
||||
/**
|
||||
* Get country name from alpha2 code.
|
||||
*
|
||||
* @throws MissingResourceException if the country code does not exists
|
||||
*/
|
||||
public static function getName(string $country, string $displayLocale = null): string
|
||||
@ -58,9 +63,11 @@ final class Countries extends ResourceBundle
|
||||
}
|
||||
|
||||
/**
|
||||
* Get list of country names indexed with alpha2 codes as keys.
|
||||
*
|
||||
* @return string[]
|
||||
*/
|
||||
public static function getNames($displayLocale = null)
|
||||
public static function getNames($displayLocale = null): array
|
||||
{
|
||||
return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
|
||||
}
|
||||
|
@ -204,6 +204,8 @@ class LanguageDataGenerator extends AbstractDataGenerator
|
||||
}
|
||||
}
|
||||
|
||||
asort($alpha2ToAlpha3);
|
||||
|
||||
return $alpha2ToAlpha3;
|
||||
}
|
||||
}
|
||||
|
@ -22,7 +22,7 @@ use Symfony\Component\Intl\Exception\MissingResourceException;
|
||||
final class Languages extends ResourceBundle
|
||||
{
|
||||
/**
|
||||
* Returns all available languages.
|
||||
* Returns all available languages as two-letter codes.
|
||||
*
|
||||
* Languages are returned as lowercase ISO 639-1 two-letter language codes.
|
||||
* For languages that don't have a two-letter code, the ISO 639-2
|
||||
@ -31,7 +31,7 @@ final class Languages extends ResourceBundle
|
||||
* A full table of ISO 639 language codes can be found here:
|
||||
* http://www-01.sil.org/iso639-3/codes.asp
|
||||
*
|
||||
* @return string[] an array of canonical ISO 639 language codes
|
||||
* @return string[] an array of canonical ISO 639-1 language codes
|
||||
*/
|
||||
public static function getLanguageCodes(): array
|
||||
{
|
||||
@ -50,6 +50,8 @@ final class Languages extends ResourceBundle
|
||||
}
|
||||
|
||||
/**
|
||||
* Get language name from alpha2 code.
|
||||
*
|
||||
* @throws MissingResourceException if the language code does not exists
|
||||
*/
|
||||
public static function getName(string $language, string $displayLocale = null): string
|
||||
@ -58,6 +60,8 @@ final class Languages extends ResourceBundle
|
||||
}
|
||||
|
||||
/**
|
||||
* Get list of language names indexed with alpha2 codes as keys.
|
||||
*
|
||||
* @return string[]
|
||||
*/
|
||||
public static function getNames(string $displayLocale = null): array
|
||||
@ -66,7 +70,7 @@ final class Languages extends ResourceBundle
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the ISO 639-2 three-letter code of a language.
|
||||
* Returns the ISO 639-2 three-letter code of a language, given a two-letter code.
|
||||
*
|
||||
* @throws MissingResourceException if the language has no corresponding three-letter code
|
||||
*/
|
||||
|
@ -67,7 +67,7 @@ final class Locales extends ResourceBundle
|
||||
/**
|
||||
* @return string[]
|
||||
*/
|
||||
public static function getNames($displayLocale = null)
|
||||
public static function getNames($displayLocale = null): array
|
||||
{
|
||||
return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
|
||||
}
|
||||
|
@ -623,14 +623,11 @@
|
||||
"Alpha2ToAlpha3": {
|
||||
"aa": "aar",
|
||||
"ab": "abk",
|
||||
"dz": "dzo",
|
||||
"af": "afr",
|
||||
"ak": "aka",
|
||||
"sq": "sqi",
|
||||
"am": "amh",
|
||||
"ar": "ara",
|
||||
"an": "arg",
|
||||
"hy": "hye",
|
||||
"as": "asm",
|
||||
"av": "ava",
|
||||
"ae": "ave",
|
||||
@ -638,7 +635,6 @@
|
||||
"az": "aze",
|
||||
"ba": "bak",
|
||||
"bm": "bam",
|
||||
"eu": "eus",
|
||||
"be": "bel",
|
||||
"bn": "ben",
|
||||
"bi": "bis",
|
||||
@ -646,12 +642,10 @@
|
||||
"bs": "bos",
|
||||
"br": "bre",
|
||||
"bg": "bul",
|
||||
"my": "mya",
|
||||
"ca": "cat",
|
||||
"cs": "ces",
|
||||
"ch": "cha",
|
||||
"ce": "che",
|
||||
"zh": "zho",
|
||||
"cu": "chu",
|
||||
"cv": "chv",
|
||||
"kw": "cor",
|
||||
@ -661,13 +655,12 @@
|
||||
"da": "dan",
|
||||
"de": "deu",
|
||||
"dv": "div",
|
||||
"mn": "mon",
|
||||
"nl": "nld",
|
||||
"et": "est",
|
||||
"dz": "dzo",
|
||||
"el": "ell",
|
||||
"en": "eng",
|
||||
"eo": "epo",
|
||||
"ik": "ipk",
|
||||
"et": "est",
|
||||
"eu": "eus",
|
||||
"ee": "ewe",
|
||||
"fo": "fao",
|
||||
"fa": "fas",
|
||||
@ -676,8 +669,6 @@
|
||||
"fr": "fra",
|
||||
"fy": "fry",
|
||||
"ff": "ful",
|
||||
"om": "orm",
|
||||
"ka": "kat",
|
||||
"gd": "gla",
|
||||
"ga": "gle",
|
||||
"gl": "glg",
|
||||
@ -692,31 +683,34 @@
|
||||
"ho": "hmo",
|
||||
"hr": "hrv",
|
||||
"hu": "hun",
|
||||
"hy": "hye",
|
||||
"ig": "ibo",
|
||||
"is": "isl",
|
||||
"io": "ido",
|
||||
"ii": "iii",
|
||||
"iu": "iku",
|
||||
"ie": "ile",
|
||||
"ia": "ina",
|
||||
"id": "ind",
|
||||
"ik": "ipk",
|
||||
"is": "isl",
|
||||
"it": "ita",
|
||||
"jv": "jav",
|
||||
"ja": "jpn",
|
||||
"kl": "kal",
|
||||
"kn": "kan",
|
||||
"ks": "kas",
|
||||
"ka": "kat",
|
||||
"kr": "kau",
|
||||
"kk": "kaz",
|
||||
"km": "khm",
|
||||
"ki": "kik",
|
||||
"rw": "kin",
|
||||
"ky": "kir",
|
||||
"ku": "kur",
|
||||
"kg": "kon",
|
||||
"kv": "kom",
|
||||
"kg": "kon",
|
||||
"ko": "kor",
|
||||
"kj": "kua",
|
||||
"ku": "kur",
|
||||
"lo": "lao",
|
||||
"la": "lat",
|
||||
"lv": "lav",
|
||||
@ -726,40 +720,43 @@
|
||||
"lb": "ltz",
|
||||
"lu": "lub",
|
||||
"lg": "lug",
|
||||
"mk": "mkd",
|
||||
"mh": "mah",
|
||||
"ml": "mal",
|
||||
"mi": "mri",
|
||||
"mr": "mar",
|
||||
"ms": "msa",
|
||||
"mk": "mkd",
|
||||
"mg": "mlg",
|
||||
"mt": "mlt",
|
||||
"ro": "ron",
|
||||
"mn": "mon",
|
||||
"mi": "mri",
|
||||
"ms": "msa",
|
||||
"my": "mya",
|
||||
"na": "nau",
|
||||
"nv": "nav",
|
||||
"nr": "nbl",
|
||||
"nd": "nde",
|
||||
"ng": "ndo",
|
||||
"ne": "nep",
|
||||
"nl": "nld",
|
||||
"nn": "nno",
|
||||
"nb": "nob",
|
||||
"ny": "nya",
|
||||
"oc": "oci",
|
||||
"oj": "oji",
|
||||
"or": "ori",
|
||||
"om": "orm",
|
||||
"os": "oss",
|
||||
"pa": "pan",
|
||||
"ps": "pus",
|
||||
"pi": "pli",
|
||||
"pl": "pol",
|
||||
"pt": "por",
|
||||
"ps": "pus",
|
||||
"qu": "que",
|
||||
"rm": "roh",
|
||||
"ro": "ron",
|
||||
"rn": "run",
|
||||
"ru": "rus",
|
||||
"sg": "sag",
|
||||
"sa": "san",
|
||||
"sr": "srp",
|
||||
"si": "sin",
|
||||
"sk": "slk",
|
||||
"sl": "slv",
|
||||
@ -770,7 +767,9 @@
|
||||
"so": "som",
|
||||
"st": "sot",
|
||||
"es": "spa",
|
||||
"sq": "sqi",
|
||||
"sc": "srd",
|
||||
"sr": "srp",
|
||||
"ss": "ssw",
|
||||
"su": "sun",
|
||||
"sw": "swa",
|
||||
@ -800,6 +799,7 @@
|
||||
"yi": "yid",
|
||||
"yo": "yor",
|
||||
"za": "zha",
|
||||
"zh": "zho",
|
||||
"zu": "zul"
|
||||
}
|
||||
}
|
||||
|
@ -51,7 +51,7 @@ final class Scripts extends ResourceBundle
|
||||
/**
|
||||
* @return string[]
|
||||
*/
|
||||
public static function getNames($displayLocale = null)
|
||||
public static function getNames($displayLocale = null): array
|
||||
{
|
||||
return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
|
||||
}
|
||||
|
@ -648,11 +648,9 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
|
||||
'ab' => 'abk',
|
||||
'af' => 'afr',
|
||||
'ak' => 'aka',
|
||||
'sq' => 'sqi',
|
||||
'am' => 'amh',
|
||||
'ar' => 'ara',
|
||||
'an' => 'arg',
|
||||
'hy' => 'hye',
|
||||
'as' => 'asm',
|
||||
'av' => 'ava',
|
||||
'ae' => 'ave',
|
||||
@ -660,7 +658,6 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
|
||||
'az' => 'aze',
|
||||
'ba' => 'bak',
|
||||
'bm' => 'bam',
|
||||
'eu' => 'eus',
|
||||
'be' => 'bel',
|
||||
'bn' => 'ben',
|
||||
'bi' => 'bis',
|
||||
@ -668,12 +665,10 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
|
||||
'bs' => 'bos',
|
||||
'br' => 'bre',
|
||||
'bg' => 'bul',
|
||||
'my' => 'mya',
|
||||
'ca' => 'cat',
|
||||
'cs' => 'ces',
|
||||
'ch' => 'cha',
|
||||
'ce' => 'che',
|
||||
'zh' => 'zho',
|
||||
'cu' => 'chu',
|
||||
'cv' => 'chv',
|
||||
'kw' => 'cor',
|
||||
@ -683,13 +678,12 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
|
||||
'da' => 'dan',
|
||||
'de' => 'deu',
|
||||
'dv' => 'div',
|
||||
'nl' => 'nld',
|
||||
'dz' => 'dzo',
|
||||
'et' => 'est',
|
||||
'el' => 'ell',
|
||||
'en' => 'eng',
|
||||
'eo' => 'epo',
|
||||
'ik' => 'ipk',
|
||||
'et' => 'est',
|
||||
'eu' => 'eus',
|
||||
'ee' => 'ewe',
|
||||
'fo' => 'fao',
|
||||
'fa' => 'fas',
|
||||
@ -698,8 +692,6 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
|
||||
'fr' => 'fra',
|
||||
'fy' => 'fry',
|
||||
'ff' => 'ful',
|
||||
'om' => 'orm',
|
||||
'ka' => 'kat',
|
||||
'gd' => 'gla',
|
||||
'ga' => 'gle',
|
||||
'gl' => 'glg',
|
||||
@ -714,32 +706,34 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
|
||||
'ho' => 'hmo',
|
||||
'hr' => 'hrv',
|
||||
'hu' => 'hun',
|
||||
'hy' => 'hye',
|
||||
'ig' => 'ibo',
|
||||
'is' => 'isl',
|
||||
'io' => 'ido',
|
||||
'ii' => 'iii',
|
||||
'iu' => 'iku',
|
||||
'ie' => 'ile',
|
||||
'ia' => 'ina',
|
||||
'id' => 'ind',
|
||||
'ik' => 'ipk',
|
||||
'is' => 'isl',
|
||||
'it' => 'ita',
|
||||
'jv' => 'jav',
|
||||
'ja' => 'jpn',
|
||||
'kl' => 'kal',
|
||||
'kn' => 'kan',
|
||||
'ks' => 'kas',
|
||||
'ka' => 'kat',
|
||||
'kr' => 'kau',
|
||||
'kk' => 'kaz',
|
||||
'mn' => 'mon',
|
||||
'km' => 'khm',
|
||||
'ki' => 'kik',
|
||||
'rw' => 'kin',
|
||||
'ky' => 'kir',
|
||||
'ku' => 'kur',
|
||||
'kg' => 'kon',
|
||||
'kv' => 'kom',
|
||||
'kg' => 'kon',
|
||||
'ko' => 'kor',
|
||||
'kj' => 'kua',
|
||||
'ku' => 'kur',
|
||||
'lo' => 'lao',
|
||||
'la' => 'lat',
|
||||
'lv' => 'lav',
|
||||
@ -749,32 +743,36 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
|
||||
'lb' => 'ltz',
|
||||
'lu' => 'lub',
|
||||
'lg' => 'lug',
|
||||
'mk' => 'mkd',
|
||||
'mh' => 'mah',
|
||||
'ml' => 'mal',
|
||||
'mi' => 'mri',
|
||||
'mr' => 'mar',
|
||||
'ms' => 'msa',
|
||||
'mk' => 'mkd',
|
||||
'mg' => 'mlg',
|
||||
'mt' => 'mlt',
|
||||
'mn' => 'mon',
|
||||
'mi' => 'mri',
|
||||
'ms' => 'msa',
|
||||
'my' => 'mya',
|
||||
'na' => 'nau',
|
||||
'nv' => 'nav',
|
||||
'nr' => 'nbl',
|
||||
'nd' => 'nde',
|
||||
'ng' => 'ndo',
|
||||
'ne' => 'nep',
|
||||
'nl' => 'nld',
|
||||
'nn' => 'nno',
|
||||
'nb' => 'nob',
|
||||
'ny' => 'nya',
|
||||
'oc' => 'oci',
|
||||
'oj' => 'oji',
|
||||
'or' => 'ori',
|
||||
'om' => 'orm',
|
||||
'os' => 'oss',
|
||||
'pa' => 'pan',
|
||||
'ps' => 'pus',
|
||||
'pi' => 'pli',
|
||||
'pl' => 'pol',
|
||||
'pt' => 'por',
|
||||
'ps' => 'pus',
|
||||
'qu' => 'que',
|
||||
'rm' => 'roh',
|
||||
'ro' => 'ron',
|
||||
@ -782,7 +780,6 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
|
||||
'ru' => 'rus',
|
||||
'sg' => 'sag',
|
||||
'sa' => 'san',
|
||||
'sr' => 'srp',
|
||||
'si' => 'sin',
|
||||
'sk' => 'slk',
|
||||
'sl' => 'slv',
|
||||
@ -793,7 +790,9 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
|
||||
'so' => 'som',
|
||||
'st' => 'sot',
|
||||
'es' => 'spa',
|
||||
'sq' => 'sqi',
|
||||
'sc' => 'srd',
|
||||
'sr' => 'srp',
|
||||
'ss' => 'ssw',
|
||||
'su' => 'sun',
|
||||
'sw' => 'swa',
|
||||
@ -823,6 +822,7 @@ abstract class AbstractLanguageDataProviderTest extends AbstractDataProviderTest
|
||||
'yi' => 'yid',
|
||||
'yo' => 'yor',
|
||||
'za' => 'zha',
|
||||
'zh' => 'zho',
|
||||
'zu' => 'zul',
|
||||
];
|
||||
|
||||
|
@ -645,11 +645,9 @@ class LanguagesTest extends ResourceBundleTestCase
|
||||
'ab' => 'abk',
|
||||
'af' => 'afr',
|
||||
'ak' => 'aka',
|
||||
'sq' => 'sqi',
|
||||
'am' => 'amh',
|
||||
'ar' => 'ara',
|
||||
'an' => 'arg',
|
||||
'hy' => 'hye',
|
||||
'as' => 'asm',
|
||||
'av' => 'ava',
|
||||
'ae' => 'ave',
|
||||
@ -657,7 +655,6 @@ class LanguagesTest extends ResourceBundleTestCase
|
||||
'az' => 'aze',
|
||||
'ba' => 'bak',
|
||||
'bm' => 'bam',
|
||||
'eu' => 'eus',
|
||||
'be' => 'bel',
|
||||
'bn' => 'ben',
|
||||
'bi' => 'bis',
|
||||
@ -665,12 +662,10 @@ class LanguagesTest extends ResourceBundleTestCase
|
||||
'bs' => 'bos',
|
||||
'br' => 'bre',
|
||||
'bg' => 'bul',
|
||||
'my' => 'mya',
|
||||
'ca' => 'cat',
|
||||
'cs' => 'ces',
|
||||
'ch' => 'cha',
|
||||
'ce' => 'che',
|
||||
'zh' => 'zho',
|
||||
'cu' => 'chu',
|
||||
'cv' => 'chv',
|
||||
'kw' => 'cor',
|
||||
@ -680,13 +675,12 @@ class LanguagesTest extends ResourceBundleTestCase
|
||||
'da' => 'dan',
|
||||
'de' => 'deu',
|
||||
'dv' => 'div',
|
||||
'nl' => 'nld',
|
||||
'dz' => 'dzo',
|
||||
'et' => 'est',
|
||||
'el' => 'ell',
|
||||
'en' => 'eng',
|
||||
'eo' => 'epo',
|
||||
'ik' => 'ipk',
|
||||
'et' => 'est',
|
||||
'eu' => 'eus',
|
||||
'ee' => 'ewe',
|
||||
'fo' => 'fao',
|
||||
'fa' => 'fas',
|
||||
@ -695,8 +689,6 @@ class LanguagesTest extends ResourceBundleTestCase
|
||||
'fr' => 'fra',
|
||||
'fy' => 'fry',
|
||||
'ff' => 'ful',
|
||||
'om' => 'orm',
|
||||
'ka' => 'kat',
|
||||
'gd' => 'gla',
|
||||
'ga' => 'gle',
|
||||
'gl' => 'glg',
|
||||
@ -711,32 +703,34 @@ class LanguagesTest extends ResourceBundleTestCase
|
||||
'ho' => 'hmo',
|
||||
'hr' => 'hrv',
|
||||
'hu' => 'hun',
|
||||
'hy' => 'hye',
|
||||
'ig' => 'ibo',
|
||||
'is' => 'isl',
|
||||
'io' => 'ido',
|
||||
'ii' => 'iii',
|
||||
'iu' => 'iku',
|
||||
'ie' => 'ile',
|
||||
'ia' => 'ina',
|
||||
'id' => 'ind',
|
||||
'ik' => 'ipk',
|
||||
'is' => 'isl',
|
||||
'it' => 'ita',
|
||||
'jv' => 'jav',
|
||||
'ja' => 'jpn',
|
||||
'kl' => 'kal',
|
||||
'kn' => 'kan',
|
||||
'ks' => 'kas',
|
||||
'ka' => 'kat',
|
||||
'kr' => 'kau',
|
||||
'kk' => 'kaz',
|
||||
'mn' => 'mon',
|
||||
'km' => 'khm',
|
||||
'ki' => 'kik',
|
||||
'rw' => 'kin',
|
||||
'ky' => 'kir',
|
||||
'ku' => 'kur',
|
||||
'kg' => 'kon',
|
||||
'kv' => 'kom',
|
||||
'kg' => 'kon',
|
||||
'ko' => 'kor',
|
||||
'kj' => 'kua',
|
||||
'ku' => 'kur',
|
||||
'lo' => 'lao',
|
||||
'la' => 'lat',
|
||||
'lv' => 'lav',
|
||||
@ -746,32 +740,36 @@ class LanguagesTest extends ResourceBundleTestCase
|
||||
'lb' => 'ltz',
|
||||
'lu' => 'lub',
|
||||
'lg' => 'lug',
|
||||
'mk' => 'mkd',
|
||||
'mh' => 'mah',
|
||||
'ml' => 'mal',
|
||||
'mi' => 'mri',
|
||||
'mr' => 'mar',
|
||||
'ms' => 'msa',
|
||||
'mk' => 'mkd',
|
||||
'mg' => 'mlg',
|
||||
'mt' => 'mlt',
|
||||
'mn' => 'mon',
|
||||
'mi' => 'mri',
|
||||
'ms' => 'msa',
|
||||
'my' => 'mya',
|
||||
'na' => 'nau',
|
||||
'nv' => 'nav',
|
||||
'nr' => 'nbl',
|
||||
'nd' => 'nde',
|
||||
'ng' => 'ndo',
|
||||
'ne' => 'nep',
|
||||
'nl' => 'nld',
|
||||
'nn' => 'nno',
|
||||
'nb' => 'nob',
|
||||
'ny' => 'nya',
|
||||
'oc' => 'oci',
|
||||
'oj' => 'oji',
|
||||
'or' => 'ori',
|
||||
'om' => 'orm',
|
||||
'os' => 'oss',
|
||||
'pa' => 'pan',
|
||||
'ps' => 'pus',
|
||||
'pi' => 'pli',
|
||||
'pl' => 'pol',
|
||||
'pt' => 'por',
|
||||
'ps' => 'pus',
|
||||
'qu' => 'que',
|
||||
'rm' => 'roh',
|
||||
'ro' => 'ron',
|
||||
@ -779,7 +777,6 @@ class LanguagesTest extends ResourceBundleTestCase
|
||||
'ru' => 'rus',
|
||||
'sg' => 'sag',
|
||||
'sa' => 'san',
|
||||
'sr' => 'srp',
|
||||
'si' => 'sin',
|
||||
'sk' => 'slk',
|
||||
'sl' => 'slv',
|
||||
@ -790,7 +787,9 @@ class LanguagesTest extends ResourceBundleTestCase
|
||||
'so' => 'som',
|
||||
'st' => 'sot',
|
||||
'es' => 'spa',
|
||||
'sq' => 'sqi',
|
||||
'sc' => 'srd',
|
||||
'sr' => 'srp',
|
||||
'ss' => 'ssw',
|
||||
'su' => 'sun',
|
||||
'sw' => 'swa',
|
||||
@ -820,6 +819,7 @@ class LanguagesTest extends ResourceBundleTestCase
|
||||
'yi' => 'yid',
|
||||
'yo' => 'yor',
|
||||
'za' => 'zha',
|
||||
'zh' => 'zho',
|
||||
'zu' => 'zul',
|
||||
];
|
||||
|
||||
|
Reference in New Issue
Block a user