From 6cc848e2c90bb4a115e9c122f7c07c00fdfe1b6b Mon Sep 17 00:00:00 2001
From: "Nick J. Connors" <nicholasconnors@hotmail.ca>
Date: Fri, 25 Feb 2022 18:26:27 -0500
Subject: [PATCH] Properly default to English for UI text

---
 NewHorizons/AssetBundle/translations/english.json |  6 +++---
 NewHorizons/AssetBundle/translations/french.json  |  6 +++---
 NewHorizons/Builder/Props/SignalBuilder.cs        |  6 +++---
 NewHorizons/Handlers/TranslationHandler.cs        | 14 ++++----------
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/NewHorizons/AssetBundle/translations/english.json b/NewHorizons/AssetBundle/translations/english.json
index 2c10a7f9..5de572c5 100644
--- a/NewHorizons/AssetBundle/translations/english.json
+++ b/NewHorizons/AssetBundle/translations/english.json
@@ -9,8 +9,8 @@
 	"UIDictionary": 
 	{
 		"INTERSTELLAR_MODE" : "Interstellar Mode",
-		"Statue" : "Nomai Statue",
-		"WarpCore" : "Anit-Graviton Flux",
-		"???" : "???"
+		"FREQ_STATUE" : "Nomai Statue",
+		"FREQ_WARP_CORE" : "Anti-Graviton Flux",
+		"FREQ_UNKNOWN" : "???"
 	}	
 }
\ No newline at end of file
diff --git a/NewHorizons/AssetBundle/translations/french.json b/NewHorizons/AssetBundle/translations/french.json
index 92c81673..0fa19f16 100644
--- a/NewHorizons/AssetBundle/translations/french.json
+++ b/NewHorizons/AssetBundle/translations/french.json
@@ -9,8 +9,8 @@
 	"UIDictionary": 
 	{
 		"INTERSTELLAR_MODE" : "Mode Interstellaire",
-		"Statue" : "Statue Nomaï",
-		"WarpCore" : "Flux Anti-Gravitonique",
-		"???" : "???"
+		"FREQ_STATUE" : "Statue Nomaï",
+		"FREQ_WARP_CORE" : "Flux Anti-Gravitonique",
+		"FREQ_UNKNOWN" : "???"
 	}	
 }
\ No newline at end of file
diff --git a/NewHorizons/Builder/Props/SignalBuilder.cs b/NewHorizons/Builder/Props/SignalBuilder.cs
index b496b672..5ad6b26e 100644
--- a/NewHorizons/Builder/Props/SignalBuilder.cs
+++ b/NewHorizons/Builder/Props/SignalBuilder.cs
@@ -68,9 +68,9 @@ namespace NewHorizons.Builder.Props
                 SignalName.WhiteHole_GD_Receiver,
             });
             _customFrequencyNames = new Dictionary<SignalFrequency, string>() {
-                { SignalFrequency.Statue, "Nomai Statue" }, 
-                { SignalFrequency.Default, "???" }, 
-                { SignalFrequency.WarpCore, "Anti-Graviton Flux" } 
+                { SignalFrequency.Statue, "FREQ_STATUE" }, 
+                { SignalFrequency.Default, "FREQ_UNKNOWN" }, 
+                { SignalFrequency.WarpCore, "FREQ_WARP_CORE" } 
             };
             _nextCustomSignalName = 200;
             _nextCustomFrequencyName = 256;
diff --git a/NewHorizons/Handlers/TranslationHandler.cs b/NewHorizons/Handlers/TranslationHandler.cs
index e8e419b8..db19631a 100644
--- a/NewHorizons/Handlers/TranslationHandler.cs
+++ b/NewHorizons/Handlers/TranslationHandler.cs
@@ -53,6 +53,7 @@ namespace NewHorizons.Handlers
             // Try to default to English
             if(dictionary.TryGetValue(TextTranslation.Language.ENGLISH, out var englishTable))
             {
+
                 if (englishTable.TryGetValue(text, out var englishText))
                 {
                     return englishText;
@@ -109,10 +110,8 @@ namespace NewHorizons.Handlers
         public static void AddDialogue(string rawText, params string[] rawPreText)
         {
             var key = string.Join(string.Empty, rawPreText) + rawText;
-            var language = TextTranslation.Get().m_language;
 
-            string text = rawText;
-            if (_dialogueTranslationDictionary.TryGetValue(language, out var dict) && dict.TryGetValue(rawText, out var translatedText)) text = translatedText;
+            var text = GetTranslation(rawText, TextType.DIALOGUE);
 
             TextTranslation.Get().m_table.Insert(key, text);
         }
@@ -120,10 +119,8 @@ namespace NewHorizons.Handlers
         public static void AddShipLog(string rawText, params string[] rawPreText)
         {
             var key = string.Join(string.Empty, rawPreText) + rawText;
-            var language = TextTranslation.Get().m_language;
 
-            string text = rawText;
-            if (_shipLogTranslationDictionary.TryGetValue(language, out var dict) && dict.TryGetValue(rawText, out var translatedText)) text = translatedText;
+            string text = GetTranslation(rawText, TextType.SHIPLOG);
 
             TextTranslation.Get().m_table.InsertShipLog(key, text);
         }
@@ -131,11 +128,8 @@ namespace NewHorizons.Handlers
         public static int AddUI(string rawText)
         {
             var uiTable = TextTranslation.Get().m_table.theUITable;
-            var language = TextTranslation.Get().m_language;
 
-            string text = rawText;
-            if (_shipLogTranslationDictionary.TryGetValue(language, out var dict) && dict.TryGetValue(rawText, out var translatedText)) text = translatedText;
-            text = text.ToUpper();
+            var text = GetTranslation(rawText, TextType.UI).ToUpper();
 
             var key = uiTable.Keys.Max() + 1;
             try