From 1591246afbeb9f7e2f503e4359f43adf1913454b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 24 Oct 2023 13:53:31 +0900 Subject: [PATCH 1/6] Update country code names to match database Required for ASS / osu-web cross-compatibility --- osu.Game/Users/CountryCode.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Users/CountryCode.cs b/osu.Game/Users/CountryCode.cs index 775de2bcf5..00092c72be 100644 --- a/osu.Game/Users/CountryCode.cs +++ b/osu.Game/Users/CountryCode.cs @@ -90,7 +90,7 @@ namespace osu.Game.Users [Description("Belize")] BZ, - [Description("Russia")] + [Description("Russian Federation")] RU, [Description("Rwanda")] @@ -639,7 +639,7 @@ namespace osu.Game.Users [Description("Trinidad and Tobago")] TT, - [Description("Turkey")] + [Description("Türkiye")] TR, [Description("Sri Lanka")] From 11c949d09144d57099d1be3fcd725eeaefaa0a8c Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 24 Oct 2023 14:45:25 +0900 Subject: [PATCH 2/6] Sort countries alphabetically --- osu.Game/Users/CountryCode.cs | 1094 ++++++++++++++++----------------- 1 file changed, 547 insertions(+), 547 deletions(-) diff --git a/osu.Game/Users/CountryCode.cs b/osu.Game/Users/CountryCode.cs index 00092c72be..3e28b946f9 100644 --- a/osu.Game/Users/CountryCode.cs +++ b/osu.Game/Users/CountryCode.cs @@ -15,6 +15,60 @@ namespace osu.Game.Users [Description("Unknown")] Unknown = 0, + [Description("Andorra")] + AD, + + [Description("United Arab Emirates")] + AE, + + [Description("Afghanistan")] + AF, + + [Description("Antigua and Barbuda")] + AG, + + [Description("Anguilla")] + AI, + + [Description("Albania")] + AL, + + [Description("Armenia")] + AM, + + [Description("Angola")] + AO, + + [Description("Antarctica")] + AQ, + + [Description("Argentina")] + AR, + + [Description("American Samoa")] + AS, + + [Description("Austria")] + AT, + + [Description("Australia")] + AU, + + [Description("Aruba")] + AW, + + [Description("Aland Islands")] + AX, + + [Description("Azerbaijan")] + AZ, + + [Description("Bosnia and Herzegovina")] + BA, + + [Description("Barbados")] + BB, + [Description("Bangladesh")] BD, @@ -27,14 +81,14 @@ namespace osu.Game.Users [Description("Bulgaria")] BG, - [Description("Bosnia and Herzegovina")] - BA, + [Description("Bahrain")] + BH, - [Description("Barbados")] - BB, + [Description("Burundi")] + BI, - [Description("Wallis and Futuna")] - WF, + [Description("Benin")] + BJ, [Description("Saint Barthelemy")] BL, @@ -48,30 +102,6 @@ namespace osu.Game.Users [Description("Bolivia")] BO, - [Description("Bahrain")] - BH, - - [Description("Burundi")] - BI, - - [Description("Benin")] - BJ, - - [Description("Bhutan")] - BT, - - [Description("Jamaica")] - JM, - - [Description("Bouvet Island")] - BV, - - [Description("Botswana")] - BW, - - [Description("Samoa")] - WS, - [Description("Bonaire, Saint Eustatius and Saba")] BQ, @@ -81,8 +111,14 @@ namespace osu.Game.Users [Description("Bahamas")] BS, - [Description("Jersey")] - JE, + [Description("Bhutan")] + BT, + + [Description("Bouvet Island")] + BV, + + [Description("Botswana")] + BW, [Description("Belarus")] BY, @@ -90,179 +126,83 @@ namespace osu.Game.Users [Description("Belize")] BZ, - [Description("Russian Federation")] - RU, + [Description("Canada")] + CA, - [Description("Rwanda")] - RW, + [Description("Cocos Islands")] + CC, - [Description("Serbia")] - RS, + [Description("Democratic Republic of the Congo")] + CD, - [Description("East Timor")] - TL, + [Description("Central African Republic")] + CF, - [Description("Reunion")] - RE, + [Description("Republic of the Congo")] + CG, - [Description("Turkmenistan")] - TM, + [Description("Switzerland")] + CH, - [Description("Tajikistan")] - TJ, + [Description("Ivory Coast")] + CI, - [Description("Romania")] - RO, + [Description("Cook Islands")] + CK, - [Description("Tokelau")] - TK, + [Description("Chile")] + CL, - [Description("Guinea-Bissau")] - GW, + [Description("Cameroon")] + CM, - [Description("Guam")] - GU, + [Description("China")] + CN, - [Description("Guatemala")] - GT, + [Description("Colombia")] + CO, - [Description("South Georgia and the South Sandwich Islands")] - GS, + [Description("Costa Rica")] + CR, - [Description("Greece")] - GR, + [Description("Cuba")] + CU, - [Description("Equatorial Guinea")] - GQ, + [Description("Cabo Verde")] + CV, - [Description("Guadeloupe")] - GP, + [Description("Curacao")] + CW, - [Description("Japan")] - JP, + [Description("Christmas Island")] + CX, - [Description("Guyana")] - GY, + [Description("Cyprus")] + CY, - [Description("Guernsey")] - GG, + [Description("Czech Republic")] + CZ, - [Description("French Guiana")] - GF, + [Description("Germany")] + DE, - [Description("Georgia")] - GE, + [Description("Djibouti")] + DJ, - [Description("Grenada")] - GD, + [Description("Denmark")] + DK, - [Description("United Kingdom")] - GB, + [Description("Dominica")] + DM, - [Description("Gabon")] - GA, + [Description("Dominican Republic")] + DO, - [Description("El Salvador")] - SV, + [Description("Algeria")] + DZ, - [Description("Guinea")] - GN, - - [Description("Gambia")] - GM, - - [Description("Greenland")] - GL, - - [Description("Gibraltar")] - GI, - - [Description("Ghana")] - GH, - - [Description("Oman")] - OM, - - [Description("Tunisia")] - TN, - - [Description("Jordan")] - JO, - - [Description("Croatia")] - HR, - - [Description("Haiti")] - HT, - - [Description("Hungary")] - HU, - - [Description("Hong Kong")] - HK, - - [Description("Honduras")] - HN, - - [Description("Heard Island and McDonald Islands")] - HM, - - [Description("Venezuela")] - VE, - - [Description("Puerto Rico")] - PR, - - [Description("Palestinian Territory")] - PS, - - [Description("Palau")] - PW, - - [Description("Portugal")] - PT, - - [Description("Svalbard and Jan Mayen")] - SJ, - - [Description("Paraguay")] - PY, - - [Description("Iraq")] - IQ, - - [Description("Panama")] - PA, - - [Description("French Polynesia")] - PF, - - [Description("Papua New Guinea")] - PG, - - [Description("Peru")] - PE, - - [Description("Pakistan")] - PK, - - [Description("Philippines")] - PH, - - [Description("Pitcairn")] - PN, - - [Description("Poland")] - PL, - - [Description("Saint Pierre and Miquelon")] - PM, - - [Description("Zambia")] - ZM, - - [Description("Western Sahara")] - EH, + [Description("Ecuador")] + EC, [Description("Estonia")] EE, @@ -270,128 +210,17 @@ namespace osu.Game.Users [Description("Egypt")] EG, - [Description("South Africa")] - ZA, - - [Description("Ecuador")] - EC, - - [Description("Italy")] - IT, - - [Description("Vietnam")] - VN, - - [Description("Solomon Islands")] - SB, - - [Description("Ethiopia")] - ET, - - [Description("Somalia")] - SO, - - [Description("Zimbabwe")] - ZW, - - [Description("Saudi Arabia")] - SA, - - [Description("Spain")] - ES, + [Description("Western Sahara")] + EH, [Description("Eritrea")] ER, - [Description("Montenegro")] - ME, + [Description("Spain")] + ES, - [Description("Moldova")] - MD, - - [Description("Madagascar")] - MG, - - [Description("Saint Martin")] - MF, - - [Description("Morocco")] - MA, - - [Description("Monaco")] - MC, - - [Description("Uzbekistan")] - UZ, - - [Description("Myanmar")] - MM, - - [Description("Mali")] - ML, - - [Description("Macao")] - MO, - - [Description("Mongolia")] - MN, - - [Description("Marshall Islands")] - MH, - - [Description("North Macedonia")] - MK, - - [Description("Mauritius")] - MU, - - [Description("Malta")] - MT, - - [Description("Malawi")] - MW, - - [Description("Maldives")] - MV, - - [Description("Martinique")] - MQ, - - [Description("Northern Mariana Islands")] - MP, - - [Description("Montserrat")] - MS, - - [Description("Mauritania")] - MR, - - [Description("Isle of Man")] - IM, - - [Description("Uganda")] - UG, - - [Description("Tanzania")] - TZ, - - [Description("Malaysia")] - MY, - - [Description("Mexico")] - MX, - - [Description("Israel")] - IL, - - [Description("France")] - FR, - - [Description("British Indian Ocean Territory")] - IO, - - [Description("Saint Helena")] - SH, + [Description("Ethiopia")] + ET, [Description("Finland")] FI, @@ -408,21 +237,264 @@ namespace osu.Game.Users [Description("Faroe Islands")] FO, - [Description("Nicaragua")] - NI, + [Description("France")] + FR, - [Description("Netherlands")] - NL, + [Description("Gabon")] + GA, - [Description("Norway")] - NO, + [Description("United Kingdom")] + GB, + + [Description("Grenada")] + GD, + + [Description("Georgia")] + GE, + + [Description("French Guiana")] + GF, + + [Description("Guernsey")] + GG, + + [Description("Ghana")] + GH, + + [Description("Gibraltar")] + GI, + + [Description("Greenland")] + GL, + + [Description("Gambia")] + GM, + + [Description("Guinea")] + GN, + + [Description("Guadeloupe")] + GP, + + [Description("Equatorial Guinea")] + GQ, + + [Description("Greece")] + GR, + + [Description("South Georgia and the South Sandwich Islands")] + GS, + + [Description("Guatemala")] + GT, + + [Description("Guam")] + GU, + + [Description("Guinea-Bissau")] + GW, + + [Description("Guyana")] + GY, + + [Description("Hong Kong")] + HK, + + [Description("Heard Island and McDonald Islands")] + HM, + + [Description("Honduras")] + HN, + + [Description("Croatia")] + HR, + + [Description("Haiti")] + HT, + + [Description("Hungary")] + HU, + + [Description("Indonesia")] + ID, + + [Description("Ireland")] + IE, + + [Description("Israel")] + IL, + + [Description("Isle of Man")] + IM, + + [Description("India")] + IN, + + [Description("British Indian Ocean Territory")] + IO, + + [Description("Iraq")] + IQ, + + [Description("Iran")] + IR, + + [Description("Iceland")] + IS, + + [Description("Italy")] + IT, + + [Description("Jersey")] + JE, + + [Description("Jamaica")] + JM, + + [Description("Jordan")] + JO, + + [Description("Japan")] + JP, + + [Description("Kenya")] + KE, + + [Description("Kyrgyzstan")] + KG, + + [Description("Cambodia")] + KH, + + [Description("Kiribati")] + KI, + + [Description("Comoros")] + KM, + + [Description("Saint Kitts and Nevis")] + KN, + + [Description("North Korea")] + KP, + + [Description("South Korea")] + KR, + + [Description("Kuwait")] + KW, + + [Description("Cayman Islands")] + KY, + + [Description("Kazakhstan")] + KZ, + + [Description("Laos")] + LA, + + [Description("Lebanon")] + LB, + + [Description("Saint Lucia")] + LC, + + [Description("Liechtenstein")] + LI, + + [Description("Sri Lanka")] + LK, + + [Description("Liberia")] + LR, + + [Description("Lesotho")] + LS, + + [Description("Lithuania")] + LT, + + [Description("Luxembourg")] + LU, + + [Description("Latvia")] + LV, + + [Description("Libya")] + LY, + + [Description("Morocco")] + MA, + + [Description("Monaco")] + MC, + + [Description("Moldova")] + MD, + + [Description("Montenegro")] + ME, + + [Description("Saint Martin")] + MF, + + [Description("Madagascar")] + MG, + + [Description("Marshall Islands")] + MH, + + [Description("North Macedonia")] + MK, + + [Description("Mali")] + ML, + + [Description("Myanmar")] + MM, + + [Description("Mongolia")] + MN, + + [Description("Macao")] + MO, + + [Description("Northern Mariana Islands")] + MP, + + [Description("Martinique")] + MQ, + + [Description("Mauritania")] + MR, + + [Description("Montserrat")] + MS, + + [Description("Malta")] + MT, + + [Description("Mauritius")] + MU, + + [Description("Maldives")] + MV, + + [Description("Malawi")] + MW, + + [Description("Mexico")] + MX, + + [Description("Malaysia")] + MY, + + [Description("Mozambique")] + MZ, [Description("Namibia")] NA, - [Description("Vanuatu")] - VU, - [Description("New Caledonia")] NC, @@ -435,8 +507,14 @@ namespace osu.Game.Users [Description("Nigeria")] NG, - [Description("New Zealand")] - NZ, + [Description("Nicaragua")] + NI, + + [Description("Netherlands")] + NL, + + [Description("Norway")] + NO, [Description("Nepal")] NP, @@ -447,227 +525,140 @@ namespace osu.Game.Users [Description("Niue")] NU, - [Description("Cook Islands")] - CK, + [Description("New Zealand")] + NZ, - [Description("Kosovo")] - XK, + [Description("Oman")] + OM, - [Description("Ivory Coast")] - CI, + [Description("Panama")] + PA, - [Description("Switzerland")] - CH, + [Description("Peru")] + PE, - [Description("Colombia")] - CO, + [Description("French Polynesia")] + PF, - [Description("China")] - CN, + [Description("Papua New Guinea")] + PG, - [Description("Cameroon")] - CM, + [Description("Philippines")] + PH, - [Description("Chile")] - CL, + [Description("Pakistan")] + PK, - [Description("Cocos Islands")] - CC, + [Description("Poland")] + PL, - [Description("Canada")] - CA, + [Description("Saint Pierre and Miquelon")] + PM, - [Description("Republic of the Congo")] - CG, + [Description("Pitcairn")] + PN, - [Description("Central African Republic")] - CF, + [Description("Puerto Rico")] + PR, - [Description("Democratic Republic of the Congo")] - CD, + [Description("Palestinian Territory")] + PS, - [Description("Czech Republic")] - CZ, + [Description("Portugal")] + PT, - [Description("Cyprus")] - CY, + [Description("Palau")] + PW, - [Description("Christmas Island")] - CX, + [Description("Paraguay")] + PY, - [Description("Costa Rica")] - CR, + [Description("Qatar")] + QA, - [Description("Curacao")] - CW, + [Description("Reunion")] + RE, - [Description("Cabo Verde")] - CV, + [Description("Romania")] + RO, - [Description("Cuba")] - CU, + [Description("Serbia")] + RS, - [Description("Eswatini")] - SZ, + [Description("Russian Federation")] + RU, - [Description("Syria")] - SY, + [Description("Rwanda")] + RW, - [Description("Sint Maarten")] - SX, + [Description("Saudi Arabia")] + SA, - [Description("Kyrgyzstan")] - KG, - - [Description("Kenya")] - KE, - - [Description("South Sudan")] - SS, - - [Description("Suriname")] - SR, - - [Description("Kiribati")] - KI, - - [Description("Cambodia")] - KH, - - [Description("Saint Kitts and Nevis")] - KN, - - [Description("Comoros")] - KM, - - [Description("Sao Tome and Principe")] - ST, - - [Description("Slovakia")] - SK, - - [Description("South Korea")] - KR, - - [Description("Slovenia")] - SI, - - [Description("North Korea")] - KP, - - [Description("Kuwait")] - KW, - - [Description("Senegal")] - SN, - - [Description("San Marino")] - SM, - - [Description("Sierra Leone")] - SL, + [Description("Solomon Islands")] + SB, [Description("Seychelles")] SC, - [Description("Kazakhstan")] - KZ, - - [Description("Cayman Islands")] - KY, - - [Description("Singapore")] - SG, + [Description("Sudan")] + SD, [Description("Sweden")] SE, - [Description("Sudan")] - SD, + [Description("Singapore")] + SG, - [Description("Dominican Republic")] - DO, + [Description("Saint Helena")] + SH, - [Description("Dominica")] - DM, + [Description("Slovenia")] + SI, - [Description("Djibouti")] - DJ, + [Description("Svalbard and Jan Mayen")] + SJ, - [Description("Denmark")] - DK, + [Description("Slovakia")] + SK, - [Description("British Virgin Islands")] - VG, + [Description("Sierra Leone")] + SL, - [Description("Germany")] - DE, + [Description("San Marino")] + SM, - [Description("Yemen")] - YE, + [Description("Senegal")] + SN, - [Description("Algeria")] - DZ, + [Description("Somalia")] + SO, - [Description("United States")] - US, + [Description("Suriname")] + SR, - [Description("Uruguay")] - UY, + [Description("South Sudan")] + SS, - [Description("Mayotte")] - YT, + [Description("Sao Tome and Principe")] + ST, - [Description("United States Minor Outlying Islands")] - UM, + [Description("El Salvador")] + SV, - [Description("Lebanon")] - LB, + [Description("Sint Maarten")] + SX, - [Description("Saint Lucia")] - LC, + [Description("Syria")] + SY, - [Description("Laos")] - LA, + [Description("Eswatini")] + SZ, - [Description("Tuvalu")] - TV, + [Description("Turks and Caicos Islands")] + TC, - [Description("Taiwan")] - TW, - - [Description("Trinidad and Tobago")] - TT, - - [Description("Türkiye")] - TR, - - [Description("Sri Lanka")] - LK, - - [Description("Liechtenstein")] - LI, - - [Description("Latvia")] - LV, - - [Description("Tonga")] - TO, - - [Description("Lithuania")] - LT, - - [Description("Luxembourg")] - LU, - - [Description("Liberia")] - LR, - - [Description("Lesotho")] - LS, - - [Description("Thailand")] - TH, + [Description("Chad")] + TD, [Description("French Southern Territories")] TF, @@ -675,14 +666,59 @@ namespace osu.Game.Users [Description("Togo")] TG, - [Description("Chad")] - TD, + [Description("Thailand")] + TH, - [Description("Turks and Caicos Islands")] - TC, + [Description("Tajikistan")] + TJ, - [Description("Libya")] - LY, + [Description("Tokelau")] + TK, + + [Description("East Timor")] + TL, + + [Description("Turkmenistan")] + TM, + + [Description("Tunisia")] + TN, + + [Description("Tonga")] + TO, + + [Description("Türkiye")] + TR, + + [Description("Trinidad and Tobago")] + TT, + + [Description("Tuvalu")] + TV, + + [Description("Taiwan")] + TW, + + [Description("Tanzania")] + TZ, + + [Description("Ukraine")] + UA, + + [Description("Uganda")] + UG, + + [Description("United States Minor Outlying Islands")] + UM, + + [Description("United States")] + US, + + [Description("Uruguay")] + UY, + + [Description("Uzbekistan")] + UZ, [Description("Vatican")] VA, @@ -690,79 +726,43 @@ namespace osu.Game.Users [Description("Saint Vincent and the Grenadines")] VC, - [Description("United Arab Emirates")] - AE, + [Description("Venezuela")] + VE, - [Description("Andorra")] - AD, - - [Description("Antigua and Barbuda")] - AG, - - [Description("Afghanistan")] - AF, - - [Description("Anguilla")] - AI, + [Description("British Virgin Islands")] + VG, [Description("U.S. Virgin Islands")] VI, - [Description("Iceland")] - IS, + [Description("Vietnam")] + VN, - [Description("Iran")] - IR, + [Description("Vanuatu")] + VU, - [Description("Armenia")] - AM, + [Description("Wallis and Futuna")] + WF, - [Description("Albania")] - AL, + [Description("Samoa")] + WS, - [Description("Angola")] - AO, + [Description("Kosovo")] + XK, - [Description("Antarctica")] - AQ, + [Description("Yemen")] + YE, - [Description("American Samoa")] - AS, + [Description("Mayotte")] + YT, - [Description("Argentina")] - AR, + [Description("South Africa")] + ZA, - [Description("Australia")] - AU, + [Description("Zambia")] + ZM, - [Description("Austria")] - AT, - - [Description("Aruba")] - AW, - - [Description("India")] - IN, - - [Description("Aland Islands")] - AX, - - [Description("Azerbaijan")] - AZ, - - [Description("Ireland")] - IE, - - [Description("Indonesia")] - ID, - - [Description("Ukraine")] - UA, - - [Description("Qatar")] - QA, - - [Description("Mozambique")] - MZ, + [Description("Zimbabwe")] + ZW, } } From 17070707b5fbdbaeef32804b0154e45143f03b3d Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 24 Oct 2023 14:46:58 +0900 Subject: [PATCH 3/6] Update and add remaining country codes to match database --- osu.Game/Users/CountryCode.cs | 64 ++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 23 deletions(-) diff --git a/osu.Game/Users/CountryCode.cs b/osu.Game/Users/CountryCode.cs index 3e28b946f9..e56cdf0dfd 100644 --- a/osu.Game/Users/CountryCode.cs +++ b/osu.Game/Users/CountryCode.cs @@ -15,6 +15,12 @@ namespace osu.Game.Users [Description("Unknown")] Unknown = 0, + [Description("Anonymous Proxy")] + A1, + + [Description("Satellite Provider")] + A2, + [Description("Andorra")] AD, @@ -36,9 +42,15 @@ namespace osu.Game.Users [Description("Armenia")] AM, + [Description("Netherlands Antilles")] + AN, + [Description("Angola")] AO, + [Description("Asia/Pacific Region")] + AP, + [Description("Antarctica")] AQ, @@ -102,7 +114,7 @@ namespace osu.Game.Users [Description("Bolivia")] BO, - [Description("Bonaire, Saint Eustatius and Saba")] + [Description("Caribbean Netherlands")] BQ, [Description("Brazil")] @@ -129,22 +141,22 @@ namespace osu.Game.Users [Description("Canada")] CA, - [Description("Cocos Islands")] + [Description("Cocos (Keeling) Islands")] CC, - [Description("Democratic Republic of the Congo")] + [Description("The Democratic Republic of the Congo")] CD, [Description("Central African Republic")] CF, - [Description("Republic of the Congo")] + [Description("Congo")] CG, [Description("Switzerland")] CH, - [Description("Ivory Coast")] + [Description("Cote D'Ivoire")] CI, [Description("Cook Islands")] @@ -171,7 +183,7 @@ namespace osu.Game.Users [Description("Cabo Verde")] CV, - [Description("Curacao")] + [Description("Curaçao")] CW, [Description("Christmas Island")] @@ -180,7 +192,7 @@ namespace osu.Game.Users [Description("Cyprus")] CY, - [Description("Czech Republic")] + [Description("Czechia")] CZ, [Description("Germany")] @@ -222,16 +234,19 @@ namespace osu.Game.Users [Description("Ethiopia")] ET, + [Description("Europe")] + EU, + [Description("Finland")] FI, [Description("Fiji")] FJ, - [Description("Falkland Islands")] + [Description("Falkland Islands (Malvinas)")] FK, - [Description("Micronesia")] + [Description("Federated States of Micronesia")] FM, [Description("Faroe Islands")] @@ -240,6 +255,9 @@ namespace osu.Game.Users [Description("France")] FR, + [Description("France, Metropolitan")] + FX, + [Description("Gabon")] GA, @@ -336,7 +354,7 @@ namespace osu.Game.Users [Description("Iraq")] IQ, - [Description("Iran")] + [Description("Islamic Republic of Iran")] IR, [Description("Iceland")] @@ -375,7 +393,7 @@ namespace osu.Game.Users [Description("Saint Kitts and Nevis")] KN, - [Description("North Korea")] + [Description("Democratic People's Republic of Korea")] KP, [Description("South Korea")] @@ -390,7 +408,7 @@ namespace osu.Game.Users [Description("Kazakhstan")] KZ, - [Description("Laos")] + [Description("Lao People's Democratic Republic")] LA, [Description("Lebanon")] @@ -456,7 +474,7 @@ namespace osu.Game.Users [Description("Mongolia")] MN, - [Description("Macao")] + [Description("Macau")] MO, [Description("Northern Mariana Islands")] @@ -528,6 +546,9 @@ namespace osu.Game.Users [Description("New Zealand")] NZ, + [Description("Other")] + O1, + [Description("Oman")] OM, @@ -561,7 +582,7 @@ namespace osu.Game.Users [Description("Puerto Rico")] PR, - [Description("Palestinian Territory")] + [Description("State of Palestine")] PS, [Description("Portugal")] @@ -636,9 +657,6 @@ namespace osu.Game.Users [Description("Suriname")] SR, - [Description("South Sudan")] - SS, - [Description("Sao Tome and Principe")] ST, @@ -648,7 +666,7 @@ namespace osu.Game.Users [Description("Sint Maarten")] SX, - [Description("Syria")] + [Description("Syrian Arab Republic")] SY, [Description("Eswatini")] @@ -675,7 +693,7 @@ namespace osu.Game.Users [Description("Tokelau")] TK, - [Description("East Timor")] + [Description("Timor-Leste")] TL, [Description("Turkmenistan")] @@ -699,7 +717,7 @@ namespace osu.Game.Users [Description("Taiwan")] TW, - [Description("Tanzania")] + [Description("United Republic of Tanzania")] TZ, [Description("Ukraine")] @@ -720,7 +738,7 @@ namespace osu.Game.Users [Description("Uzbekistan")] UZ, - [Description("Vatican")] + [Description("Holy See (Vatican City State)")] VA, [Description("Saint Vincent and the Grenadines")] @@ -729,10 +747,10 @@ namespace osu.Game.Users [Description("Venezuela")] VE, - [Description("British Virgin Islands")] + [Description("Virgin Islands, British")] VG, - [Description("U.S. Virgin Islands")] + [Description("Virgin Islands, U.S.")] VI, [Description("Vietnam")] From cd8b068f4c42097daa53e3fb19fd4d35eb6b65a1 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 25 Oct 2023 13:01:23 +0900 Subject: [PATCH 4/6] Add fallback case to `CountryExtensions.GetAcronym` --- osu.Game.Tournament/CountryExtensions.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/osu.Game.Tournament/CountryExtensions.cs b/osu.Game.Tournament/CountryExtensions.cs index f2a583c8a5..b47c3f18ce 100644 --- a/osu.Game.Tournament/CountryExtensions.cs +++ b/osu.Game.Tournament/CountryExtensions.cs @@ -1,7 +1,6 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. -using System; using osu.Game.Users; namespace osu.Game.Tournament @@ -763,7 +762,7 @@ namespace osu.Game.Tournament return "MOZ"; default: - throw new ArgumentOutOfRangeException(nameof(country)); + return country.ToString(); } } } From d9ec030cc8a2fca7b121d9d5353ea707064af876 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 25 Oct 2023 13:02:15 +0900 Subject: [PATCH 5/6] Remove missing country --- osu.Game.Tournament/CountryExtensions.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/osu.Game.Tournament/CountryExtensions.cs b/osu.Game.Tournament/CountryExtensions.cs index b47c3f18ce..c66727bc77 100644 --- a/osu.Game.Tournament/CountryExtensions.cs +++ b/osu.Game.Tournament/CountryExtensions.cs @@ -518,9 +518,6 @@ namespace osu.Game.Tournament case CountryCode.KE: return "KEN"; - case CountryCode.SS: - return "SSD"; - case CountryCode.SR: return "SUR"; From da07066a744c6808d00fdaa82e0e0b141e34f9fc Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 25 Oct 2023 13:03:03 +0900 Subject: [PATCH 6/6] Add note about `CountryCode` being at parity with `osu_countries` --- osu.Game/Users/CountryCode.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/osu.Game/Users/CountryCode.cs b/osu.Game/Users/CountryCode.cs index e56cdf0dfd..edaa1562c7 100644 --- a/osu.Game/Users/CountryCode.cs +++ b/osu.Game/Users/CountryCode.cs @@ -8,6 +8,9 @@ using Newtonsoft.Json.Converters; namespace osu.Game.Users { + /// + /// Matches `osu_countries` database table. + /// [JsonConverter(typeof(StringEnumConverter))] [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)] public enum CountryCode