Issue #3044261 by Joseph Zhao, cilefen, tstoeckler, Pancho, gnindl: Update...

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

core/lib/Drupal/Core/Locale/CountryManager.php

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

core/scripts/update-countries.sh

@@ -69,6 +69,14 @@ function t($string) {
   $exclude_codes = [
     // The European Union is not a country.
     '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".
     'ZZ',
   ];