Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3044261 by Joseph Zhao, cilefen, tstoeckler, Pancho, gnindl: Update CLDR codes in CountryManager.php to latest data (35.1.0)

merge-requests/55/head
Gábor Hojtsy 2019-08-23 14:45:31 +02:00
parent bf4caf99ad
commit e85067b28d
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
core/lib/Drupal/Core/Locale/CountryManager.php
View File

@ -42,7 +42,7 @@ class CountryManager implements CountryManagerInterface {
'AD' => t('Andorra'), 'AD' => t('Andorra'),
'AE' => t('United Arab Emirates'), 'AE' => t('United Arab Emirates'),
'AF' => t('Afghanistan'), 'AF' => t('Afghanistan'),
'AG' => t('Antigua and Barbuda'), 'AG' => t('Antigua & Barbuda'),
'AI' => t('Anguilla'), 'AI' => t('Anguilla'),
'AL' => t('Albania'), 'AL' => t('Albania'),
'AM' => t('Armenia'), 'AM' => t('Armenia'),
@ -56,7 +56,7 @@ class CountryManager implements CountryManagerInterface {
'AW' => t('Aruba'), 'AW' => t('Aruba'),
'AX' => t('Åland Islands'), 'AX' => t('Åland Islands'),
'AZ' => t('Azerbaijan'), 'AZ' => t('Azerbaijan'),
'BA' => t('Bosnia and Herzegovina'), 'BA' => t('Bosnia & Herzegovina'),
'BB' => t('Barbados'), 'BB' => t('Barbados'),
'BD' => t('Bangladesh'), 'BD' => t('Bangladesh'),
'BE' => t('Belgium'), 'BE' => t('Belgium'),
@ -65,7 +65,7 @@ class CountryManager implements CountryManagerInterface {
'BH' => t('Bahrain'), 'BH' => t('Bahrain'),
'BI' => t('Burundi'), 'BI' => t('Burundi'),
'BJ' => t('Benin'), 'BJ' => t('Benin'),
'BL' => t('Saint Barthélemy'), 'BL' => t('St. Barthélemy'),
'BM' => t('Bermuda'), 'BM' => t('Bermuda'),
'BN' => t('Brunei'), 'BN' => t('Brunei'),
'BO' => t('Bolivia'), 'BO' => t('Bolivia'),
@ -78,7 +78,7 @@ class CountryManager implements CountryManagerInterface {
'BY' => t('Belarus'), 'BY' => t('Belarus'),
'BZ' => t('Belize'), 'BZ' => t('Belize'),
'CA' => t('Canada'), 'CA' => t('Canada'),
'CC' => t('Cocos [Keeling] Islands'), 'CC' => t('Cocos (Keeling) Islands'),
'CD' => t('Congo - Kinshasa'), 'CD' => t('Congo - Kinshasa'),
'CF' => t('Central African Republic'), 'CF' => t('Central African Republic'),
'CG' => t('Congo - Brazzaville'), 'CG' => t('Congo - Brazzaville'),
@ -96,7 +96,7 @@ class CountryManager implements CountryManagerInterface {
'CW' => t('Curaçao'), 'CW' => t('Curaçao'),
'CX' => t('Christmas Island'), 'CX' => t('Christmas Island'),
'CY' => t('Cyprus'), 'CY' => t('Cyprus'),
'CZ' => t('Czech Republic'), 'CZ' => t('Czechia'),
'DE' => t('Germany'), 'DE' => t('Germany'),
'DG' => t('Diego Garcia'), 'DG' => t('Diego Garcia'),
'DJ' => t('Djibouti'), 'DJ' => t('Djibouti'),
@ -104,7 +104,7 @@ class CountryManager implements CountryManagerInterface {
'DM' => t('Dominica'), 'DM' => t('Dominica'),
'DO' => t('Dominican Republic'), 'DO' => t('Dominican Republic'),
'DZ' => t('Algeria'), 'DZ' => t('Algeria'),
'EA' => t('Ceuta and Melilla'), 'EA' => t('Ceuta & Melilla'),
'EC' => t('Ecuador'), 'EC' => t('Ecuador'),
'EE' => t('Estonia'), 'EE' => t('Estonia'),
'EG' => t('Egypt'), 'EG' => t('Egypt'),
@ -132,13 +132,13 @@ class CountryManager implements CountryManagerInterface {
'GP' => t('Guadeloupe'), 'GP' => t('Guadeloupe'),
'GQ' => t('Equatorial Guinea'), 'GQ' => t('Equatorial Guinea'),
'GR' => t('Greece'), 'GR' => t('Greece'),
'GS' => t('South Georgia and the South Sandwich Islands'), 'GS' => t('South Georgia & South Sandwich Islands'),
'GT' => t('Guatemala'), 'GT' => t('Guatemala'),
'GU' => t('Guam'), 'GU' => t('Guam'),
'GW' => t('Guinea-Bissau'), 'GW' => t('Guinea-Bissau'),
'GY' => t('Guyana'), 'GY' => t('Guyana'),
'HK' => t('Hong Kong SAR China'), 'HK' => t('Hong Kong SAR China'),
'HM' => t('Heard Island and McDonald Islands'), 'HM' => t('Heard & McDonald Islands'),
'HN' => t('Honduras'), 'HN' => t('Honduras'),
'HR' => t('Croatia'), 'HR' => t('Croatia'),
'HT' => t('Haiti'), 'HT' => t('Haiti'),
@ -163,7 +163,7 @@ class CountryManager implements CountryManagerInterface {
'KH' => t('Cambodia'), 'KH' => t('Cambodia'),
'KI' => t('Kiribati'), 'KI' => t('Kiribati'),
'KM' => t('Comoros'), 'KM' => t('Comoros'),
'KN' => t('Saint Kitts and Nevis'), 'KN' => t('St. Kitts & Nevis'),
'KP' => t('North Korea'), 'KP' => t('North Korea'),
'KR' => t('South Korea'), 'KR' => t('South Korea'),
'KW' => t('Kuwait'), 'KW' => t('Kuwait'),
@ -171,7 +171,7 @@ class CountryManager implements CountryManagerInterface {
'KZ' => t('Kazakhstan'), 'KZ' => t('Kazakhstan'),
'LA' => t('Laos'), 'LA' => t('Laos'),
'LB' => t('Lebanon'), 'LB' => t('Lebanon'),
'LC' => t('Saint Lucia'), 'LC' => t('St. Lucia'),
'LI' => t('Liechtenstein'), 'LI' => t('Liechtenstein'),
'LK' => t('Sri Lanka'), 'LK' => t('Sri Lanka'),
'LR' => t('Liberia'), 'LR' => t('Liberia'),
@ -184,14 +184,14 @@ class CountryManager implements CountryManagerInterface {
'MC' => t('Monaco'), 'MC' => t('Monaco'),
'MD' => t('Moldova'), 'MD' => t('Moldova'),
'ME' => t('Montenegro'), 'ME' => t('Montenegro'),
'MF' => t('Saint Martin'), 'MF' => t('St. Martin'),
'MG' => t('Madagascar'), 'MG' => t('Madagascar'),
'MH' => t('Marshall Islands'), 'MH' => t('Marshall Islands'),
'MK' => t('Macedonia'), 'MK' => t('North Macedonia'),
'ML' => t('Mali'), 'ML' => t('Mali'),
'MM' => t('Myanmar [Burma]'), 'MM' => t('Myanmar (Burma)'),
'MN' => t('Mongolia'), 'MN' => t('Mongolia'),
'MO' => t('Macau SAR China'), 'MO' => t('Macao SAR China'),
'MP' => t('Northern Mariana Islands'), 'MP' => t('Northern Mariana Islands'),
'MQ' => t('Martinique'), 'MQ' => t('Martinique'),
'MR' => t('Mauritania'), 'MR' => t('Mauritania'),
@ -223,7 +223,7 @@ class CountryManager implements CountryManagerInterface {
'PH' => t('Philippines'), 'PH' => t('Philippines'),
'PK' => t('Pakistan'), 'PK' => t('Pakistan'),
'PL' => t('Poland'), 'PL' => t('Poland'),
'PM' => t('Saint Pierre and Miquelon'), 'PM' => t('St. Pierre & Miquelon'),
'PN' => t('Pitcairn Islands'), 'PN' => t('Pitcairn Islands'),
'PR' => t('Puerto Rico'), 'PR' => t('Puerto Rico'),
'PS' => t('Palestinian Territories'), 'PS' => t('Palestinian Territories'),
@ -243,9 +243,9 @@ class CountryManager implements CountryManagerInterface {
'SD' => t('Sudan'), 'SD' => t('Sudan'),
'SE' => t('Sweden'), 'SE' => t('Sweden'),
'SG' => t('Singapore'), 'SG' => t('Singapore'),
'SH' => t('Saint Helena'), 'SH' => t('St. Helena'),
'SI' => t('Slovenia'), 'SI' => t('Slovenia'),
'SJ' => t('Svalbard and Jan Mayen'), 'SJ' => t('Svalbard & Jan Mayen'),
'SK' => t('Slovakia'), 'SK' => t('Slovakia'),
'SL' => t('Sierra Leone'), 'SL' => t('Sierra Leone'),
'SM' => t('San Marino'), 'SM' => t('San Marino'),
@ -253,13 +253,13 @@ class CountryManager implements CountryManagerInterface {
'SO' => t('Somalia'), 'SO' => t('Somalia'),
'SR' => t('Suriname'), 'SR' => t('Suriname'),
'SS' => t('South Sudan'), 'SS' => t('South Sudan'),
'ST' => t('São Tomé and Príncipe'), 'ST' => t('São Tomé & Príncipe'),
'SV' => t('El Salvador'), 'SV' => t('El Salvador'),
'SX' => t('Sint Maarten'), 'SX' => t('Sint Maarten'),
'SY' => t('Syria'), 'SY' => t('Syria'),
'SZ' => t('Swaziland'), 'SZ' => t('Eswatini'),
'TA' => t('Tristan da Cunha'), 'TA' => t('Tristan da Cunha'),
'TC' => t('Turks and Caicos Islands'), 'TC' => t('Turks & Caicos Islands'),
'TD' => t('Chad'), 'TD' => t('Chad'),
'TF' => t('French Southern Territories'), 'TF' => t('French Southern Territories'),
'TG' => t('Togo'), 'TG' => t('Togo'),
@ -271,7 +271,7 @@ class CountryManager implements CountryManagerInterface {
'TN' => t('Tunisia'), 'TN' => t('Tunisia'),
'TO' => t('Tonga'), 'TO' => t('Tonga'),
'TR' => t('Turkey'), 'TR' => t('Turkey'),
'TT' => t('Trinidad and Tobago'), 'TT' => t('Trinidad & Tobago'),
'TV' => t('Tuvalu'), 'TV' => t('Tuvalu'),
'TW' => t('Taiwan'), 'TW' => t('Taiwan'),
'TZ' => t('Tanzania'), 'TZ' => t('Tanzania'),
@ -282,13 +282,13 @@ class CountryManager implements CountryManagerInterface {
'UY' => t('Uruguay'), 'UY' => t('Uruguay'),
'UZ' => t('Uzbekistan'), 'UZ' => t('Uzbekistan'),
'VA' => t('Vatican City'), 'VA' => t('Vatican City'),
'VC' => t('Saint Vincent and the Grenadines'), 'VC' => t('St. Vincent & Grenadines'),
'VE' => t('Venezuela'), 'VE' => t('Venezuela'),
'VG' => t('British Virgin Islands'), 'VG' => t('British Virgin Islands'),
'VI' => t('U.S. Virgin Islands'), 'VI' => t('U.S. Virgin Islands'),
'VN' => t('Vietnam'), 'VN' => t('Vietnam'),
'VU' => t('Vanuatu'), 'VU' => t('Vanuatu'),
'WF' => t('Wallis and Futuna'), 'WF' => t('Wallis & Futuna'),
'WS' => t('Samoa'), 'WS' => t('Samoa'),
'XK' => t('Kosovo'), 'XK' => t('Kosovo'),
'YE' => t('Yemen'), 'YE' => t('Yemen'),

8
core/scripts/update-countries.sh
View File

@ -69,6 +69,14 @@ foreach ($data->main->en->localeDisplayNames->territories as $code => $name) {
$exclude_codes = [ $exclude_codes = [
// The European Union is not a country. // The European Union is not a country.
'EU', 'EU',
// The Eurozone is not a country.
'EZ',
// The United Nations is not a country.
'UN',
// "Pseudo-Accents" is not a country.
'XA',
// "Pseudo-Bidi" is not a country.
'XB',
// Don't allow "Unknown Region". // Don't allow "Unknown Region".
'ZZ', 'ZZ',
]; ];