Changed how line endings are handled in import and export

thesupersonic16 · Sep 8, 2024 · 622e0d6 · 622e0d6
1 parent c91b993
commit 622e0d6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/DALTools/DALLib/ImportExport/TranslationCSVFile.cs b/DALTools/DALLib/ImportExport/TranslationCSVFile.cs
@@ -88,7 +88,7 @@ public string[] ReadCSVRow()
                 // Next column
                 if (!escape && _buffer[_bufferIndex] == ',')
                 {
-                    splits.Add(buffer.Replace("\r", "").Replace("\n", "\\n"));
+                    splits.Add(buffer.Replace("\r", "").Replace("\\n", "\n"));
                     buffer = "";
                     continue;
                 }
@@ -100,7 +100,7 @@ public string[] ReadCSVRow()
                 {
                     _bufferIndex = _bufferIndex + 1;
                     // Escape the LF and add the last column
-                    splits.Add(buffer.Replace("\r", "").Replace("\n", "\\n"));
+                    splits.Add(buffer.Replace("\r", "").Replace("\\n", "\n"));
                     break;
                 }
                 // Add char
@@ -113,9 +113,9 @@ public string AddRow(params string[] fields)
         {
             for (int i = 0; i < fields.Length; ++i)
             {
-                // Add double-quotes if field contains an escaped line feed
-                if (fields[i].Length > 0 && fields[i][0] != '"' && fields[i].Contains("\\n"))
-                    fields[i] = $"\"{fields[i].Replace("\\n", LINEBREAK)}\"";
+                if (fields[i].Length > 0 && fields[i][0] != '"' && 
+                    (fields[i].Contains("\n") || fields[i].Contains(",")))
+                    fields[i] = $"\"{fields[i].Replace("\n", "\\n")}\"";
             }
             return string.Join(",", fields) + LINEBREAK;
         }

diff --git a/DALTools/DALLib/ImportExport/TranslationPOFile.cs b/DALTools/DALLib/ImportExport/TranslationPOFile.cs
@@ -31,10 +31,10 @@ public override TranslationLine[] ImportTranslation(string data)
                     continue;
 
                 if (line.StartsWith("msgid"))
-                    id = line.Substring(7, line.Length - 8).Replace("\\\"", "\"");
+                    id = line.Substring(7, line.Length - 8).Replace("\\\"", "\"").Replace("\\n", "\n");
                 if (line.StartsWith("msgstr"))
                 {
-                    str = line.Substring(8, line.Length - 9).Replace("\\\"", "\"");
+                    str = line.Substring(8, line.Length - 9).Replace("\\\"", "\"").Replace("\\n", "\n");
                     lines.Add(new TranslationLine("", "", id, str));
                 }
             }
@@ -48,7 +48,7 @@ public override string ExportTranslation(TranslationLine[] lines)
 
             // Fields
             foreach (var translation in lines)
-                AddEntry(translation.Comment, translation.Key);
+                AddEntry(translation.Comment, translation.Key.Replace("\n", "\\n"));
 
             return FinaliseExport();
         }

diff --git a/DALTools/DALLib/ImportExport/TranslationSTSCHandler.cs b/DALTools/DALLib/ImportExport/TranslationSTSCHandler.cs
@@ -87,8 +87,8 @@ public static TranslationLine[] ExportTranslationLines(STSC2File script, Diction
                         break;
                     case "Mes":
                         // Add Entry to file
-                        string name = names.ContainsKey(nameID) ? names[nameID] : $"0x{nameID:X2}";
-                        lines.Add(new TranslationLine("Message", $"Unknown [{name}]", line.arguments[3] as string));
+                        string name = names.ContainsKey(nameID) ? names[nameID] : $"Unknown 0x{nameID:X2}";
+                        lines.Add(new TranslationLine("Message", name, line.arguments[3] as string));
                         break;
                     case "Choice":
                     case "SetChoice":

diff --git a/DALTools/DALLib/ImportExport/TranslationTSVFile.cs b/DALTools/DALLib/ImportExport/TranslationTSVFile.cs
@@ -88,7 +88,7 @@ public string[] ReadTSVRow()
                 // Next column
                 if (!escape && _buffer[_bufferIndex] == '\t')
                 {
-                    splits.Add(buffer.Replace("\r", "").Replace("\n", "\\n"));
+                    splits.Add(buffer.Replace("\r", "").Replace("\\n", "\n"));
                     buffer = "";
                     continue;
                 }
@@ -100,7 +100,7 @@ public string[] ReadTSVRow()
                 {
                     _bufferIndex = _bufferIndex + 1;
                     // Escape the LF and add the last column
-                    splits.Add(buffer.Replace("\r", "").Replace("\n", "\\n"));
+                    splits.Add(buffer.Replace("\r", "").Replace("\\n", "\n"));
                     break;
                 }
                 // Add char
@@ -113,9 +113,9 @@ public string AddRow(params string[] fields)
         {
             for (int i = 0; i < fields.Length; ++i)
             {
-                // Add double-quotes if field contains an escaped line feed
-                if (fields[i].Length > 0 && fields[i][0] != '"' && fields[i].Contains("\\n"))
-                    fields[i] = $"\"{fields[i].Replace("\\n", LINEBREAK)}\"";
+                if (fields[i].Length > 0 && fields[i][0] != '"' &&
+                    (fields[i].Contains("\n")))
+                    fields[i] = $"\"{fields[i].Replace("\n", "\\n")}\"";
             }
             return string.Join("\t", fields) + LINEBREAK;
         }