mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge pull request #7034 from open-sausages/pulls/4.0/fix-i18n-countries
BUG Removed reserved / removed / invalid country codes
This commit is contained in:
commit
fa203d8c99
@ -1143,7 +1143,7 @@ class IntlLocales implements Locales, Resettable
|
|||||||
'bm' => 'Bermuda',
|
'bm' => 'Bermuda',
|
||||||
'bn' => 'Brunei',
|
'bn' => 'Brunei',
|
||||||
'bo' => 'Bolivia',
|
'bo' => 'Bolivia',
|
||||||
'bq' => 'British Antarctic Territory',
|
'bq' => 'Bonaire, Sint Eustatius and Saba',
|
||||||
'br' => 'Brazil',
|
'br' => 'Brazil',
|
||||||
'bs' => 'Bahamas',
|
'bs' => 'Bahamas',
|
||||||
'bt' => 'Bhutan',
|
'bt' => 'Bhutan',
|
||||||
@ -1164,8 +1164,6 @@ class IntlLocales implements Locales, Resettable
|
|||||||
'cn' => 'China',
|
'cn' => 'China',
|
||||||
'co' => 'Colombia',
|
'co' => 'Colombia',
|
||||||
'cr' => 'Costa Rica',
|
'cr' => 'Costa Rica',
|
||||||
'cs' => 'Serbia and Montenegro',
|
|
||||||
'ct' => 'Canton and Enderbury Islands',
|
|
||||||
'cu' => 'Cuba',
|
'cu' => 'Cuba',
|
||||||
'cv' => 'Cape Verde',
|
'cv' => 'Cape Verde',
|
||||||
'cx' => 'Christmas Island',
|
'cx' => 'Christmas Island',
|
||||||
@ -1189,9 +1187,7 @@ class IntlLocales implements Locales, Resettable
|
|||||||
'fk' => 'Falkland Islands',
|
'fk' => 'Falkland Islands',
|
||||||
'fm' => 'Micronesia',
|
'fm' => 'Micronesia',
|
||||||
'fo' => 'Faroe Islands',
|
'fo' => 'Faroe Islands',
|
||||||
'fq' => 'French Southern and Antarctic Territories',
|
|
||||||
'fr' => 'France',
|
'fr' => 'France',
|
||||||
'fx' => 'Metropolitan France',
|
|
||||||
'ga' => 'Gabon',
|
'ga' => 'Gabon',
|
||||||
'gb' => 'United Kingdom',
|
'gb' => 'United Kingdom',
|
||||||
'gd' => 'Grenada',
|
'gd' => 'Grenada',
|
||||||
@ -1231,7 +1227,6 @@ class IntlLocales implements Locales, Resettable
|
|||||||
'jm' => 'Jamaica',
|
'jm' => 'Jamaica',
|
||||||
'jo' => 'Jordan',
|
'jo' => 'Jordan',
|
||||||
'jp' => 'Japan',
|
'jp' => 'Japan',
|
||||||
'jt' => 'Johnston Island',
|
|
||||||
'ke' => 'Kenya',
|
'ke' => 'Kenya',
|
||||||
'kg' => 'Kyrgyzstan',
|
'kg' => 'Kyrgyzstan',
|
||||||
'kh' => 'Cambodia',
|
'kh' => 'Cambodia',
|
||||||
@ -1261,7 +1256,6 @@ class IntlLocales implements Locales, Resettable
|
|||||||
'mf' => 'Saint Martin',
|
'mf' => 'Saint Martin',
|
||||||
'mg' => 'Madagascar',
|
'mg' => 'Madagascar',
|
||||||
'mh' => 'Marshall Islands',
|
'mh' => 'Marshall Islands',
|
||||||
'mi' => 'Midway Islands',
|
|
||||||
'mk' => 'Macedonia',
|
'mk' => 'Macedonia',
|
||||||
'ml' => 'Mali',
|
'ml' => 'Mali',
|
||||||
'mm' => 'Myanmar [Burma]',
|
'mm' => 'Myanmar [Burma]',
|
||||||
@ -1287,14 +1281,11 @@ class IntlLocales implements Locales, Resettable
|
|||||||
'nl' => 'Netherlands',
|
'nl' => 'Netherlands',
|
||||||
'no' => 'Norway',
|
'no' => 'Norway',
|
||||||
'np' => 'Nepal',
|
'np' => 'Nepal',
|
||||||
'nq' => 'Dronning Maud Land',
|
|
||||||
'nr' => 'Nauru',
|
'nr' => 'Nauru',
|
||||||
'nt' => 'Neutral Zone',
|
|
||||||
'nu' => 'Niue',
|
'nu' => 'Niue',
|
||||||
'nz' => 'New Zealand',
|
'nz' => 'New Zealand',
|
||||||
'om' => 'Oman',
|
'om' => 'Oman',
|
||||||
'pa' => 'Panama',
|
'pa' => 'Panama',
|
||||||
'pc' => 'Pacific Islands Trust Territory',
|
|
||||||
'pe' => 'Peru',
|
'pe' => 'Peru',
|
||||||
'pf' => 'French Polynesia',
|
'pf' => 'French Polynesia',
|
||||||
'pg' => 'Papua New Guinea',
|
'pg' => 'Papua New Guinea',
|
||||||
@ -1306,13 +1297,10 @@ class IntlLocales implements Locales, Resettable
|
|||||||
'pr' => 'Puerto Rico',
|
'pr' => 'Puerto Rico',
|
||||||
'ps' => 'Palestinian Territories',
|
'ps' => 'Palestinian Territories',
|
||||||
'pt' => 'Portugal',
|
'pt' => 'Portugal',
|
||||||
'pu' => 'U.S. Miscellaneous Pacific Islands',
|
|
||||||
'pw' => 'Palau',
|
'pw' => 'Palau',
|
||||||
'py' => 'Paraguay',
|
'py' => 'Paraguay',
|
||||||
'pz' => 'Panama Canal Zone',
|
|
||||||
'qa' => 'Qatar',
|
'qa' => 'Qatar',
|
||||||
'qo' => 'Outlying Oceania',
|
'qo' => 'Outlying Oceania',
|
||||||
'qu' => 'European Union',
|
|
||||||
're' => 'Réunion',
|
're' => 'Réunion',
|
||||||
'ro' => 'Romania',
|
'ro' => 'Romania',
|
||||||
'rs' => 'Serbia',
|
'rs' => 'Serbia',
|
||||||
@ -1334,7 +1322,6 @@ class IntlLocales implements Locales, Resettable
|
|||||||
'so' => 'Somalia',
|
'so' => 'Somalia',
|
||||||
'sr' => 'Suriname',
|
'sr' => 'Suriname',
|
||||||
'st' => 'São Tomé and Príncipe',
|
'st' => 'São Tomé and Príncipe',
|
||||||
'su' => 'Union of Soviet Socialist Republics',
|
|
||||||
'sv' => 'El Salvador',
|
'sv' => 'El Salvador',
|
||||||
'sy' => 'Syria',
|
'sy' => 'Syria',
|
||||||
'sz' => 'Swaziland',
|
'sz' => 'Swaziland',
|
||||||
@ -1362,16 +1349,13 @@ class IntlLocales implements Locales, Resettable
|
|||||||
'uz' => 'Uzbekistan',
|
'uz' => 'Uzbekistan',
|
||||||
'va' => 'Vatican City',
|
'va' => 'Vatican City',
|
||||||
'vc' => 'Saint Vincent and the Grenadines',
|
'vc' => 'Saint Vincent and the Grenadines',
|
||||||
'vd' => 'North Vietnam',
|
|
||||||
've' => 'Venezuela',
|
've' => 'Venezuela',
|
||||||
'vg' => 'British Virgin Islands',
|
'vg' => 'British Virgin Islands',
|
||||||
'vi' => 'U.S. Virgin Islands',
|
'vi' => 'U.S. Virgin Islands',
|
||||||
'vn' => 'Vietnam',
|
'vn' => 'Vietnam',
|
||||||
'vu' => 'Vanuatu',
|
'vu' => 'Vanuatu',
|
||||||
'wf' => 'Wallis and Futuna',
|
'wf' => 'Wallis and Futuna',
|
||||||
'wk' => 'Wake Island',
|
|
||||||
'ws' => 'Samoa',
|
'ws' => 'Samoa',
|
||||||
'yd' => 'People\'s Democratic Republic of Yemen',
|
|
||||||
'ye' => 'Yemen',
|
'ye' => 'Yemen',
|
||||||
'yt' => 'Mayotte',
|
'yt' => 'Mayotte',
|
||||||
'za' => 'South Africa',
|
'za' => 'South Africa',
|
||||||
|
Loading…
Reference in New Issue
Block a user