(57c46943d) Quick fix watchman graphics (not quite right yet, but better). Re-enable the variant 2.

Barotrauma/BarotraumaShared/Source/TextManager.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace Barotrauma
 {
@@ -42,6 +43,26 @@ namespace Barotrauma
                 GetTextFilesRecursive(subDir, ref list);
             }
         }
+
+        /// <summary>
+        /// Returns the name of the language in the respective language
+        /// </summary>
+        public static string GetTranslatedLanguageName(string language)
+        {
+            if (!textPacks.ContainsKey(language))
+            {
+                return language;
+            }
+
+            foreach (var textPack in textPacks[language])
+            {
+                if (textPack.Language == language)
+                {
+                    return textPack.TranslatedName;
+                }
+            }
+            return language;
+        }
         
         public static void LoadTextPacks(IEnumerable<ContentPackage> selectedContentPackages)
         {
@@ -80,6 +101,26 @@ namespace Barotrauma
             }
         }
 
+        public static bool ContainsTag(string textTag)
+        {
+            if (string.IsNullOrEmpty(textTag)) { return false; }
+
+            if (!textPacks.ContainsKey(Language))
+            {
+                DebugConsole.ThrowError("No text packs available for the selected language (" + Language + ")! Switching to English...");
+                Language = "English";
+                if (!textPacks.ContainsKey(Language))
+                {
+                    throw new Exception("No text packs available in English!");
+                }
+            }
+            foreach (TextPack textPack in textPacks[Language])
+            {
+                if (textPack.Get(textTag) != null) { return true; }
+            }
+            return false;
+        }
+
         public static string Get(string textTag, bool returnNull = false, string fallBackTag = null)
         {
             if (!textPacks.ContainsKey(Language))
@@ -91,8 +132,6 @@ namespace Barotrauma
                     throw new Exception("No text packs available in English!");
                 }
             }
-            return false;
-        }
 
             foreach (TextPack textPack in textPacks[Language])
             {
@@ -116,7 +155,13 @@ namespace Barotrauma
                 foreach (TextPack textPack in textPacks["English"])
                 {
                     string text = textPack.Get(textTag);
-                    if (text != null) return text;
+                    if (text != null)
+                    {
+#if DEBUG
+                        DebugConsole.NewMessage("Text \"" + textTag + "\" not found for the language \"" + Language + "\". Using the English text \"" + text + "\" instead.");
+#endif
+                        return text;
+                    }
                 }
             }
 
@@ -367,42 +412,6 @@ namespace Barotrauma
             return isCJK.IsMatch(text);
         }
 
-#if DEBUG
-        public static void CheckForDuplicates(string lang)
-        {
-            if (!textPacks.ContainsKey(lang))
-            {
-                DebugConsole.ThrowError("No text packs available for the selected language (" + lang + ")!");
-                return;
-            }
-
-            int packIndex = 0;
-            foreach (TextPack textPack in textPacks[lang])
-            {
-                textPack.CheckForDuplicates(packIndex);
-                packIndex++;
-            }
-        }
-
-        public static void WriteToCSV()
-        {
-            string lang = "English";
-
-            if (!textPacks.ContainsKey(lang))
-            {
-                DebugConsole.ThrowError("No text packs available for the selected language (" + lang + ")!");
-                return;
-            }
-
-            int packIndex = 0;
-            foreach (TextPack textPack in textPacks[lang])
-            {
-                textPack.WriteToCSV(packIndex);
-                packIndex++;
-            }
-        }
-#endif
-
 #if DEBUG
         public static void CheckForDuplicates(string lang)
         {