Enhancement/languages (#206)

package.json

@@ -43,7 +43,7 @@
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-prettier": "4.2.1",
     "mocha": "10.1.0",
-    "prettier": "2.7.1",
-    "nyc": "15.1.0"
+    "nyc": "15.1.0",
+    "prettier": "2.7.1"
   }
 }

src/middleware.js

@@ -1,9 +1,18 @@
 const facts = require("./models/facts");
 const { convert } = require("sst");
+const localization = require("./models/localization");
+console.log(localization);
 
-const ISO_LANG = ["eng-us", "ukr-ua", "rus-ru", "esp-mx", "esp-es", "de-de"];
-const SHORT_LANG = ["eng", "ukr", "rus", "esp", "ger"];
-const VALID_LANGUAGES = SHORT_LANG.concat(ISO_LANG);
+let fullCode = [];
+let shortISO = [];
+
+// Dynamically fill the fullCode and shortISO list with the provided config information in the language files
+for (const language in localization) {
+  fullCode.push(localization[language].code);
+  shortISO.push(localization[language].langISO);
+}
+
+const VALID_LANGUAGES = shortISO.concat(fullCode);
 
 /**
  * Check if user entered valid count parameter
@@ -44,9 +53,7 @@ function invalidLanguageMiddleware(request, response, next) {
       // language specified, so continue
       response
         .status(400)
-        .send(
-          `Invalid language, valid languages are "eng", "ukr", "rus", "ger"`
-        );
+        .send(`Invalid language, valid languages are ${shortISO.join(", ")}`);
       return;
     }
   }

src/models/facts.js

@@ -1,38 +1,21 @@
-const english = require("./localization/eng-US");
-const russian = require("./localization/rus-RU");
-const ukraine = require("./localization/ukr-UA");
-const german = require("./localization/de-DE");
-const spanishMexico = require("./localization/esp-MX");
-const spanishSpain = require("./localization/esp-ES");
+const localization = require("./localization");
 
 /**
  *
- * @param {String} langName - ISO 639-2 Code
+ * @param {String} requestedLang - ISO 639-2 Code
  * @returns {String} fact localized to the language
  */
-function getLanguageFacts(langName) {
-  switch (langName) {
-    case "eng-us": // english
-    case "eng": // default english
-      return english.facts;
-    case "rus-ru": // russian
-    case "rus": // default russian
-      return russian.facts;
-    case "ukr-ua": // ukrainian
-    case "ukr": // default ukrainian
-      return ukraine.facts;
-    case "esp-es": // spanish Spain
-      return spanishSpain.facts;
-    case "esp-mx": // spanish Mexico
-    case "esp": // default spanish
-      return spanishMexico.facts;
-    case "de-de": // german Germany
-    case "ger": // default german
-      return german.facts;
-    case undefined: // no language specified
-    default:
-      return english.facts;
+function getLanguageFacts(requestedLang) {
+  for (const language in localization) {
+    if (
+      localization[language].code === requestedLang ||
+      localization[language].langISO === requestedLang
+    ) {
+      return localization[language].facts;
+    }
   }
+
+  return localization["eng-us"].facts;
 }
 
 /**
@@ -42,7 +25,7 @@ function getLanguageFacts(langName) {
  * @param {String} lang
  * @returns {String} - a single fact about cats
  **/
-function getSingle(ID = null, lang) {
+function getSingle(ID = null, lang = "eng-us") {
   const facts = getLanguageFacts(lang);
   if (ID) {
     const id = ID - 1;