Check English translation if language doesn't exist (#361)

Need this because of #316
facebook · Dec 27, 2017 · 5a77f18 · 5a77f18 · neilsutcliffe · Dec 28, 2017
1 parent 5805149
commit 5a77f18
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/lib/server/translate.js b/lib/server/translate.js
@@ -26,22 +26,26 @@ function setLanguage(lang) {
   language = lang;
 }
 
+function doesTranslationExist(str, lang) {
+  return (
+    translation[lang] &&
+    translation[lang]['pages-strings'] &&
+    translation[lang]['pages-strings'][str]
+  );
+}
+
 function translate(str) {
   if (!language || language === '') {
+    // Check English, just in case; otherwise, just return the raw string back
+    if (doesTranslationExist(str, 'en')) {
+      return parseEscapeSequences(translation['en']['pages-strings'][str]);
+    }
     return str;
   }
 
-  if (
-    !translation[language] ||
-    !translation[language]['pages-strings'] ||
-    !translation[language]['pages-strings'][str]
-  ) {
+  if (!doesTranslationExist(str, language)) {
     // if a translated string doesn't exist, but english does then fallback
-    if (
-      translation['en'] &&
-      translation['en']['pages-strings'] &&
-      translation['en']['pages-strings'][str]
-    ) {
+    if (doesTranslationExist(str, 'en')) {
       console.error(
         "Could not find a string translation in '" +
           language +