Author: Kamil Tekiela (kamil-tekiela) Committer: GitHub (web-flow) Pusher: kamil-tekiela Date: 2022-06-28T12:46:27+01:00
Commit: https://github.com/php/web-php/commit/996c06e1bccfb0fd11562c870ad2090718ac4cac Raw diff: https://github.com/php/web-php/commit/996c06e1bccfb0fd11562c870ad2090718ac4cac.diff Remove old countries lists (#569) Changed paths: D include/countries-alpha2.inc D include/countries_alpha_mapping.inc M include/countries.inc M include/site.inc Diff: diff --git a/include/countries-alpha2.inc b/include/countries-alpha2.inc deleted file mode 100644 index eac8a4707..000000000 --- a/include/countries-alpha2.inc +++ /dev/null @@ -1,255 +0,0 @@ -<?php -/** - * Taken from http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 - */ -$COUNTRIES_ALPHA2 = array( - "AD" => "Andorra", - "AE" => "United Arab Emirates", - "AF" => "Afghanistan", - "AG" => "Antigua and Barbuda", - "AI" => "Anguilla", - "AL" => "Albania", - "AM" => "Armenia", - "AO" => "Angola", - "AQ" => "Antarctica", - "AR" => "Argentina", - "AS" => "American Samoa", - "AT" => "Austria", - "AU" => "Australia", - "AW" => "Aruba", - "AX" => "Åland Islands", - "AZ" => "Azerbaijan", - "BA" => "Bosnia and Herzegovina", - "BB" => "Barbados", - "BD" => "Bangladesh", - "BE" => "Belgium", - "BF" => "Burkina Faso", - "BG" => "Bulgaria", - "BH" => "Bahrain", - "BI" => "Burundi", - "BJ" => "Benin", - "BL" => "Saint Barthélemy", - "BM" => "Bermuda", - "BN" => "Brunei Darussalam", - "BO" => "Bolivia, Plurinational State of", - "BQ" => "Bonaire, Sint Eustatius and Saba", - "BR" => "Brazil", - "BS" => "Bahamas", - "BT" => "Bhutan", - "BV" => "Bouvet Island", - "BW" => "Botswana", - "BY" => "Belarus", - "BZ" => "Belize", - "CA" => "Canada", - "CC" => "Cocos (Keeling) Islands", - "CD" => "Congo, the Democratic Republic of the", - "CF" => "Central African Republic", - "CG" => "Congo", - "CH" => "Switzerland", - "CI" => "Côte d'Ivoire", - "CK" => "Cook Islands", - "CL" => "Chile", - "CM" => "Cameroon", - "CN" => "China", - "CO" => "Colombia", - "CR" => "Costa Rica", - "CU" => "Cuba", - "CV" => "Cape Verde", - "CW" => "Curaçao", - "CX" => "Christmas Island", - "CY" => "Cyprus", - "CZ" => "Czech Republic", - "DE" => "Germany", - "DJ" => "Djibouti", - "DK" => "Denmark", - "DM" => "Dominica", - "DO" => "Dominican Republic", - "DZ" => "Algeria", - "EC" => "Ecuador", - "EE" => "Estonia", - "EG" => "Egypt", - "EH" => "Western Sahara", - "ER" => "Eritrea", - "ES" => "Spain", - "ET" => "Ethiopia", - "FI" => "Finland", - "FJ" => "Fiji", - "FK" => "Falkland Islands (Malvinas)", - "FM" => "Micronesia, Federated States of", - "FO" => "Faroe Islands", - "FR" => "France", - "GA" => "Gabon", - "GB" => "United Kingdom", - "GD" => "Grenada", - "GE" => "Georgia", - "GF" => "French Guiana", - "GG" => "Guernsey", - "GH" => "Ghana", - "GI" => "Gibraltar", - "GL" => "Greenland", - "GM" => "Gambia", - "GN" => "Guinea", - "GP" => "Guadeloupe", - "GQ" => "Equatorial Guinea", - "GR" => "Greece", - "GS" => "South Georgia and the South Sandwich Islands", - "GT" => "Guatemala", - "GU" => "Guam", - "GW" => "Guinea-Bissau", - "GY" => "Guyana", - "HK" => "Hong Kong", - "HM" => "Heard Island and McDonald Islands", - "HN" => "Honduras", - "HR" => "Croatia", - "HT" => "Haiti", - "HU" => "Hungary", - "ID" => "Indonesia", - "IE" => "Ireland", - "IL" => "Israel", - "IM" => "Isle of Man", - "IN" => "India", - "IO" => "British Indian Ocean Territory", - "IQ" => "Iraq", - "IR" => "Iran, Islamic Republic of", - "IS" => "Iceland", - "IT" => "Italy", - "JE" => "Jersey", - "JM" => "Jamaica", - "JO" => "Jordan", - "JP" => "Japan", - "KE" => "Kenya", - "KG" => "Kyrgyzstan", - "KH" => "Cambodia", - "KI" => "Kiribati", - "KM" => "Comoros", - "KN" => "Saint Kitts and Nevis", - "KP" => "Korea, Democratic People's Republic of", - "KR" => "Korea, Republic of", - "KW" => "Kuwait", - "KY" => "Cayman Islands", - "KZ" => "Kazakhstan", - "LA" => "Lao People's Democratic Republic", - "LB" => "Lebanon", - "LC" => "Saint Lucia", - "LI" => "Liechtenstein", - "LK" => "Sri Lanka", - "LR" => "Liberia", - "LS" => "Lesotho", - "LT" => "Lithuania", - "LU" => "Luxembourg", - "LV" => "Latvia", - "LY" => "Libya", - "MA" => "Morocco", - "MC" => "Monaco", - "MD" => "Moldova, Republic of", - "ME" => "Montenegro", - "MF" => "Saint Martin (French part)", - "MG" => "Madagascar", - "MH" => "Marshall Islands", - "MK" => "Macedonia, the former Yugoslav Republic of", - "ML" => "Mali", - "MM" => "Myanmar", - "MN" => "Mongolia", - "MO" => "Macao", - "MP" => "Northern Mariana Islands", - "MQ" => "Martinique", - "MR" => "Mauritania", - "MS" => "Montserrat", - "MT" => "Malta", - "MU" => "Mauritius", - "MV" => "Maldives", - "MW" => "Malawi", - "MX" => "Mexico", - "MY" => "Malaysia", - "MZ" => "Mozambique", - "NA" => "Namibia", - "NC" => "New Caledonia", - "NE" => "Niger", - "NF" => "Norfolk Island", - "NG" => "Nigeria", - "NI" => "Nicaragua", - "NL" => "Netherlands", - "NO" => "Norway", - "NP" => "Nepal", - "NR" => "Nauru", - "NU" => "Niue", - "NZ" => "New Zealand", - "OM" => "Oman", - "PA" => "Panama", - "PE" => "Peru", - "PF" => "French Polynesia", - "PG" => "Papua New Guinea", - "PH" => "Philippines", - "PK" => "Pakistan", - "PL" => "Poland", - "PM" => "Saint Pierre and Miquelon", - "PN" => "Pitcairn", - "PR" => "Puerto Rico", - "PS" => "Palestine, State of", - "PT" => "Portugal", - "PW" => "Palau", - "PY" => "Paraguay", - "QA" => "Qatar", - "RE" => "Réunion", - "RO" => "Romania", - "RS" => "Serbia", - "RU" => "Russian Federation", - "RW" => "Rwanda", - "SA" => "Saudi Arabia", - "SB" => "Solomon Islands", - "SC" => "Seychelles", - "SD" => "Sudan", - "SE" => "Sweden", - "SG" => "Singapore", - "SH" => "Saint Helena, Ascension and Tristan da Cunha", - "SI" => "Slovenia", - "SJ" => "Svalbard and Jan Mayen", - "SK" => "Slovakia", - "SL" => "Sierra Leone", - "SM" => "San Marino", - "SN" => "Senegal", - "SO" => "Somalia", - "SR" => "Suriname", - "SS" => "South Sudan", - "ST" => "Sao Tome and Principe", - "SV" => "El Salvador", - "SX" => "Sint Maarten (Dutch part)", - "SY" => "Syrian Arab Republic", - "SZ" => "Swaziland", - "TC" => "Turks and Caicos Islands", - "TD" => "Chad", - "TF" => "French Southern Territories", - "TG" => "Togo", - "TH" => "Thailand", - "TJ" => "Tajikistan", - "TK" => "Tokelau", - "TL" => "Timor-Leste", - "TM" => "Turkmenistan", - "TN" => "Tunisia", - "TO" => "Tonga", - "TR" => "Turkey", - "TT" => "Trinidad and Tobago", - "TV" => "Tuvalu", - "TW" => "Taiwan, Province of China", - "TZ" => "Tanzania, United Republic of", - "UA" => "Ukraine", - "UG" => "Uganda", - "UM" => "United States Minor Outlying Islands", - "US" => "United States", - "UY" => "Uruguay", - "UZ" => "Uzbekistan", - "VA" => "Holy See (Vatican City State)", - "VC" => "Saint Vincent and the Grenadines", - "VE" => "Venezuela, Bolivarian Republic of", - "VG" => "Virgin Islands, British", - "VI" => "Virgin Islands, U.S.", - "VN" => "Viet Nam", - "VU" => "Vanuatu", - "WF" => "Wallis and Futuna", - "WS" => "Samoa", - "YE" => "Yemen", - "YT" => "Mayotte", - "ZA" => "South Africa", - "ZM" => "Zambia", - "ZW" => "Zimbabwe", -); diff --git a/include/countries.inc b/include/countries.inc index 0594540d4..cd9871695 100644 --- a/include/countries.inc +++ b/include/countries.inc @@ -1,5 +1,5 @@ <?php -$COUNTRIES = array( +return array( 'AFG' => 'Afghanistan', 'ALB' => 'Albania', 'DZA' => 'Algeria', @@ -167,7 +167,7 @@ $COUNTRIES = array( 'QAT' => 'Qatar', 'KOR' => 'Republic of Korea', 'MDA' => 'Republic of Moldova', -'REU' => 'R�union', +'REU' => 'Réunion', 'ROU' => 'Romania', 'RUS' => 'Russian Federation', 'RWA' => 'Rwanda', diff --git a/include/countries_alpha_mapping.inc b/include/countries_alpha_mapping.inc deleted file mode 100644 index a69dccc08..000000000 --- a/include/countries_alpha_mapping.inc +++ /dev/null @@ -1,255 +0,0 @@ -<?php -/** - * This file has been extracted from http://opengeocode.org/download/countrynames.txt - */ -$COUNTRY_ALPHA_3_TO_2 = array( - "AFG" => "AF", - "ALA" => "AX", - "ALB" => "AL", - "DZA" => "DZ", - "ASM" => "AS", - "AND" => "AD", - "AGO" => "AO", - "AIA" => "AI", - "ATA" => "AQ", - "ATG" => "AG", - "ARG" => "AR", - "ARM" => "AM", - "ABW" => "AW", - "AUS" => "AU", - "AUT" => "AT", - "AZE" => "AZ", - "BHS" => "BS", - "BHR" => "BH", - "BGD" => "BD", - "BRB" => "BB", - "BLR" => "BY", - "BEL" => "BE", - "BLZ" => "BZ", - "BEN" => "BJ", - "BMU" => "BM", - "BTN" => "BT", - "BOL" => "BO", - "BES" => "BQ", - "BIH" => "BA", - "BWA" => "BW", - "BVT" => "BV", - "BRA" => "BR", - "IOT" => "IO", - "BRN" => "BN", - "BGR" => "BG", - "BFA" => "BF", - "BDI" => "BI", - "KHM" => "KH", - "CMR" => "CM", - "CAN" => "CA", - "CPV" => "CV", - "CYM" => "KY", - "CAF" => "CF", - "TCD" => "TD", - "CHL" => "CL", - "CHN" => "CN", - "CXR" => "CX", - "CCK" => "CC", - "COL" => "CO", - "COM" => "KM", - "COG" => "CG", - "COD" => "CD", - "COK" => "CK", - "CRI" => "CR", - "CIV" => "CI", - "HRV" => "HR", - "CUB" => "CU", - "CUW" => "CW", - "CYP" => "CY", - "CZE" => "CZ", - "DNK" => "DK", - "DJI" => "DJ", - "DMA" => "DM", - "DOM" => "DO", - "ECU" => "EC", - "EGY" => "EG", - "SLV" => "SV", - "GNQ" => "GQ", - "ERI" => "ER", - "EST" => "EE", - "ETH" => "ET", - "FLK" => "FK", - "534" => "FO", - "FJI" => "FJ", - "FIN" => "FI", - "FRA" => "FR", - "GUF" => "GF", - "PYF" => "PF", - "ATF" => "TF", - "GAB" => "GA", - "GMB" => "GM", - "GEO" => "GE", - "DEU" => "DE", - "GHA" => "GH", - "GIB" => "GI", - "GRC" => "GR", - "GRL" => "GL", - "GRD" => "GD", - "GLP" => "GP", - "GUM" => "GU", - "GTM" => "GT", - "GGY" => "GG", - "GIN" => "GN", - "GNB" => "GW", - "GUY" => "GY", - "HTI" => "HT", - "HMD" => "HM", - "VAT" => "VA", - "HND" => "HN", - "HKG" => "HK", - "HUN" => "HU", - "ISL" => "IS", - "IND" => "IN", - "IDN" => "ID", - "IRN" => "IR", - "IRQ" => "IQ", - "IRL" => "IE", - "IMN" => "IM", - "ISR" => "IL", - "ITA" => "IT", - "JAM" => "JM", - "JPN" => "JP", - "JEY" => "JE", - "JOR" => "JO", - "KAZ" => "KZ", - "KEN" => "KE", - "KIR" => "KI", - "PRK" => "KP", - "KOR" => "KR", - "KWT" => "KW", - "KGZ" => "KG", - "LAO" => "LA", - "LVA" => "LV", - "LBN" => "LB", - "LSO" => "LS", - "LBR" => "LR", - "LBY" => "LY", - "LIE" => "LI", - "LTU" => "LT", - "LUX" => "LU", - "MAC" => "MO", - "MKD" => "MK", - "MDG" => "MG", - "MWI" => "MW", - "MYS" => "MY", - "MDV" => "MV", - "MLI" => "ML", - "MLT" => "MT", - "MHL" => "MH", - "MTQ" => "MQ", - "MRT" => "MR", - "MUS" => "MU", - "MYT" => "YT", - "MEX" => "MX", - "FSM" => "FM", - "MDA" => "MD", - "MCO" => "MC", - "MNG" => "MN", - "MNE" => "ME", - "MSR" => "MS", - "MAR" => "MA", - "MOZ" => "MZ", - "MMR" => "MM", - "NAM" => "NA", - "NRU" => "NR", - "NPL" => "NP", - "NLD" => "NL", - "NCL" => "NC", - "NZL" => "NZ", - "NIC" => "NI", - "NER" => "NE", - "NGA" => "NG", - "NIU" => "NU", - "NFK" => "NF", - "MNP" => "MP", - "NOR" => "NO", - "PSE" => "PS", - "OMN" => "OM", - "PAK" => "PK", - "PLW" => "PW", - "PAN" => "PA", - "PNG" => "PG", - "PRY" => "PY", - "PER" => "PE", - "PHL" => "PH", - "PCN" => "PN", - "POL" => "PL", - "PRT" => "PT", - "PRI" => "PR", - "QAT" => "QA", - "REU" => "RE", - "ROU" => "RO", - "RUS" => "RU", - "RWA" => "RW", - "534" => "BL", - "SHN" => "SH", - "KNA" => "KN", - "LCA" => "LC", - "MAF" => "MF", - "SPM" => "PM", - "VCT" => "VC", - "WSM" => "WS", - "SMR" => "SM", - "STP" => "ST", - "SAU" => "SA", - "SEN" => "SN", - "SRB" => "RS", - "SYC" => "SC", - "SLE" => "SL", - "SGP" => "SG", - "SXM" => "SX", - "SVK" => "SK", - "SVN" => "SI", - "SLB" => "SB", - "SOM" => "SO", - "ZAF" => "ZA", - "SGS" => "GS", - "ESP" => "ES", - "LKA" => "LK", - "SDN" => "SD", - "SUR" => "SR", - "534" => "SJ", - "SWZ" => "SZ", - "SWE" => "SE", - "CHE" => "CH", - "SYR" => "SY", - "TWN" => "TW", - "TJK" => "TJ", - "TZA" => "TZ", - "THA" => "TH", - "TLS" => "TL", - "TGO" => "TG", - "TKL" => "TK", - "TON" => "TO", - "TTO" => "TT", - "TUN" => "TN", - "TUR" => "TR", - "TKM" => "TM", - "TCA" => "TC", - "TUV" => "TV", - "UGA" => "UG", - "UKR" => "UA", - "ARE" => "AE", - "GBR" => "GB", - "USA" => "US", - "UMI" => "UM", - "URY" => "UY", - "UZB" => "UZ", - "VUT" => "VU", - "VEN" => "VE", - "VNM" => "VN", - "VGB" => "VG", - "VIR" => "VI", - "WLF" => "WF", - "ESH" => "EH", - "YEM" => "YE", - "ZMB" => "ZM", - "ZWE" => "ZW", - ); -$COUNTRY_ALPHA_2_TO_3 = array_flip($COUNTRY_ALPHA_3_TO_2); diff --git a/include/site.inc b/include/site.inc index bea49a059..52abf3505 100644 --- a/include/site.inc +++ b/include/site.inc @@ -20,14 +20,10 @@ $MIRRORS = array( "en", MIRROR_OK), ); -// Define $COUNTRIES array -include __DIR__ . '/countries.inc'; - -// Define $COUNTRIES_ALPHA2 array -include __DIR__ . '/countries-alpha2.inc'; - -// Define $COUNTRY_ALPHA_2_TO_3 array -include __DIR__ . '/countries_alpha_mapping.inc'; +/** + * @var array<string, string> $COUNTRIES + */ +$COUNTRIES = include __DIR__ . '/countries.inc'; // Define $LANGUAGES array include __DIR__ . '/languages.inc'; -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
