(98ad00fa2) v0.9.1.0

2019-07-10 13:52:12 +03:00
parent 2a791887ed
commit afa2137bd2
104 changed files with 3041 additions and 3134 deletions
@@ -322,6 +322,8 @@ namespace Barotrauma

            string[] messages = serverMessage.Split('/');

+            bool translationsFound = false;
+
            try
            {
                for (int i = 0; i < messages.Length; i++)
@@ -333,6 +335,7 @@ namespace Barotrauma
                        if (msg != null) // If a translation was found, otherwise use the original
                        {
                            messages[i] = msg;
+                            translationsFound = true;
                        }
                    }
                    else
@@ -343,6 +346,7 @@ namespace Barotrauma
                        if (msg != null) // If a translation was found, otherwise use the original
                        {
                            messages[i] = msg;
+                            translationsFound = true;
                        }
                        else
                        {
@@ -358,12 +362,19 @@ namespace Barotrauma
                    }
                }

-                string translatedServerMessage = string.Empty;
-                for (int i = 0; i < messages.Length; i++)
+                if (translationsFound)
                {
-                    translatedServerMessage += messages[i];
+                    string translatedServerMessage = string.Empty;
+                    for (int i = 0; i < messages.Length; i++)
+                    {
+                        translatedServerMessage += messages[i];
+                    }
+                    return translatedServerMessage;
+                }
+                else
+                {
+                    return serverMessage;
                }
-                return translatedServerMessage;
            }

            catch (IndexOutOfRangeException exception)