Reverted translation changes

lib/server/translate.js

@@ -6,11 +6,8 @@
  */
 
 const translation = require('./translation.js');
-const chalk = require('chalk');
 
-let language = undefined;
-
-const env = require('./env.js');
+let language = 'en';
 
 /* handle escaped characters that get converted into json strings */
 function parseEscapeSequences(str) {
@@ -25,48 +22,46 @@ function parseEscapeSequences(str) {
     .replace(new RegExp('\\\\', 'g'), '\\');
 }
 
-const setLanguage = lang => {
+function setLanguage(lang) {
   language = lang;
-};
-
-const translate = str => {
-  const translationFile = language ? language : 'default';
-  let result;
-
-  // Fallback order. Eventually we can get rid of en.
-  [translationFile, 'default', 'en'].every(language => {
-    let found =
-      translation[language] &&
-      translation[language]['pages-strings'] &&
-      translation[language]['pages-strings'][str];
-
-    let keepLooking = found == undefined;
+}
 
-    if (keepLooking) return true;
+function translate(str) {
+  if (!language || language === '') {
+    return str;
+  }
 
-    if (language != translationFile && translationFile != 'en') {
-      // We only warn when falling back from a non-english language
-      // Because this module is recreated every page load, it is impossible to cache this without using a global variable. Spam is inevitable
+  if (
+    !translation[language] ||
+    !translation[language]['pages-strings'] ||
+    !translation[language]['pages-strings'][str]
+  ) {
+    // if a translated string doesn't exist, but english does then fallback
+    if (
+      translation['en'] &&
+      translation['en']['pages-strings'] &&
+      translation['en']['pages-strings'][str]
+    ) {
       console.error(
-        chalk.yellow(
-          `Warning: Translation strings are missing in '${translationFile}' for string ${str} Using '${language}' instead.`
-        )
+        "Could not find a string translation in '" +
+          language +
+          "' for string '" +
+          str +
+          "'. Using English version instead."
       );
-    }
-
-    result = parseEscapeSequences(found);
-    return false;
-  });
-
-  if (result) return result;
 
-  throw new Error(
-    `Text that you've identified for translation '${str}' hasn't been added to the global list in 'default.json'. 
-  To solve this problem run 'yarn write-translations'.`
-  );
-};
+      return parseEscapeSequences(translation['en']['pages-strings'][str]);
+    }
+    throw new Error(
+      "Text that you've identified for translation ('" +
+        str +
+        "') hasn't been added to the global list in 'en.json'. To solve this problem run 'yarn write-translations'."
+    );
+  }
+  return parseEscapeSequences(translation[language]['pages-strings'][str]);
+}
 
 module.exports = {
   setLanguage: setLanguage,
   translate: translate,
-};
+};

lib/write-translations.js

@@ -164,7 +164,7 @@ function execute() {
     currentTranslations['localized-strings']
   );
   writeFileAndCreateFolder(
-    CWD + '/i18n/default.json',
+    CWD + '/i18n/en.json',
     JSON.stringify(
       Object.assign(
         {
@@ -180,4 +180,4 @@ function execute() {
 
 execute();
 
-module.exports = execute;
+module.exports = execute;