From 5f10863cc6a8ee07eb4dd7d3dcb121f7c427d361 Mon Sep 17 00:00:00 2001
From: Anu <anulithic@gmail.com>
Date: Mon, 24 Feb 2025 00:42:46 -0800
Subject: [PATCH] Standardize on USA-recognized names as of 2017, per
svornost's recommendation
---
src/js/utilsSlave.js | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/js/utilsSlave.js b/src/js/utilsSlave.js
index 9361bed80b4..08cbe07cd04 100644
--- a/src/js/utilsSlave.js
+++ b/src/js/utilsSlave.js
@@ -1404,7 +1404,6 @@ globalThis.nationOf = function(nation) {
switch (nation) {
case "Albanian":
case "Algerian":
- case "American": // could call this one the United States/the USA instead
case "Andorran":
case "Angolan":
case "Antiguan":
@@ -1445,6 +1444,7 @@ globalThis.nationOf = function(nation) {
case "Liberian":
case "Libyan":
case "Lithuanian":
+ case "Macedonian": // Macedonia, not North Macedonia - no name changes after 2017
case "Malaysian":
case "Mauritanian":
case "Micronesian":
@@ -1535,6 +1535,7 @@ globalThis.nationOf = function(nation) {
break;
case "Argentinian":
case "Bermudian":
+ case "Burmese": // Burma, not Myanmar, in keeping with official USA recognition as of 2017
case "Canadian":
case "Grenadian":
case "Chinese":
@@ -1576,6 +1577,13 @@ globalThis.nationOf = function(nation) {
case "Scottish":
country = nation.slice(0, nation.length - 4) + "land"; // replace last four letters with "land" - e.g. Finnish to Finland
break;
+ case "Swazi": // Swaziland, not Eswatini - no name changes after 2017
+ case "Thai":
+ country = nation + "land"; // add "land" - e.g. Swazi to Swaziland
+ break;
+ case "American":
+ country = jsEither(["America", "the USA", "the United States"]);
+ break;
case "Bahamian":
country = "the Bahamas";
break;
@@ -1591,9 +1599,6 @@ globalThis.nationOf = function(nation) {
case "Burkinabé":
country = "Burkina Faso";
break;
- case "Burmese":
- country = "Myanmar"; // or Burma?
- break;
case "Catalan":
country = "Catalonia";
break;
@@ -1610,7 +1615,7 @@ globalThis.nationOf = function(nation) {
country = "Cyprus";
break;
case "Czech":
- country = jsEither(["Czechia", "the Czech Republic"]);
+ country = "the Czech Republic"; // this is borderline - the Czechs recommended Czechia back in 1992, it started to catch on in 2016, but the US and EU didn't officially switch until after 2018
break;
case "Danish":
country = "Denmark";
@@ -1672,9 +1677,6 @@ globalThis.nationOf = function(nation) {
case "a Liechtensteiner":
country = "Liechtenstein";
break;
- case "Macedonian":
- country = "North Macedonia"; // south Macedonians are presumably Greek
- break;
case "Malagasy":
country = "Madagascar";
break;
@@ -1741,23 +1743,17 @@ globalThis.nationOf = function(nation) {
case "Spanish":
country = "Spain";
break;
- case "Swazi":
- country = "Eswatini";
- break;
case "Swedish":
country = "Sweden";
break;
case "Swiss":
country = "Switzerland";
break;
- case "Thai":
- country = "Thailand";
- break;
case "Trinidadian":
country = "Trinidad and Tobago";
break;
case "Turkish":
- country = "Turkey"; // or do we want Türkiye?
+ country = "Turkey"; // not Türkiye - no name changes after 2017
break;
case "Vatican":
country = "Vatican City";
@@ -1768,7 +1764,11 @@ globalThis.nationOf = function(nation) {
case "Zairian":
country = jsEither(["the Democratic Republic of the Congo", "Congo-Kinshasa"]); // or Zaire?
break;
+ case "Rhodesian": // no slave's nationality should ever be directly assigned Rhodesian, but it is occasionally used as an alias, so catch it just in case
+ country = "Zimbabwe";
+ break;
case "Stateless":
+ case "slave": // old value which shouldn't still be in use, but catch it just in case
country = "no country"; // best we can do, shouldn't ever come up
break;
default:
--
GitLab