Fix escaping characters when writing to disk.

NPBruce · Apr 19, 2018 · 49c0338 · 49c0338
1 parent 18af6ae
commit 49c0338
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 4 deletions.
diff --git a/unity/Assets/Plugins/FFGAppImport.dll b/unity/Assets/Plugins/FFGAppImport.dll
diff --git a/unity/Assets/Plugins/FFGAppImport.dll.mdb b/unity/Assets/Plugins/FFGAppImport.dll.mdb
diff --git a/unity/Assets/Plugins/FFGAppImport.dll.mdb.meta b/unity/Assets/Plugins/FFGAppImport.dll.mdb.meta
diff --git a/unity/Assets/Plugins/FFGAppImport.pdb b/unity/Assets/Plugins/FFGAppImport.pdb
diff --git a/unity/Assets/Plugins/ValkyrieTools.dll b/unity/Assets/Plugins/ValkyrieTools.dll
diff --git a/unity/Assets/Plugins/ValkyrieTools.dll.mdb b/unity/Assets/Plugins/ValkyrieTools.dll.mdb
diff --git a/unity/Assets/Plugins/ValkyrieTools.dll.mdb.meta b/unity/Assets/Plugins/ValkyrieTools.dll.mdb.meta
diff --git a/unity/Assets/Plugins/ValkyrieTools.pdb b/unity/Assets/Plugins/ValkyrieTools.pdb
diff --git a/unity/Assets/Resources/version.txt b/unity/Assets/Resources/version.txt
@@ -1 +1 @@
-1.7.0c
+1.7.0d
diff --git a/unity/Assets/Scripts/Content/DictionaryI18n.cs b/unity/Assets/Scripts/Content/DictionaryI18n.cs
@@ -391,7 +391,13 @@ public Dictionary<string,List<string>> SerializeMultiple()
                 rawData[kv.Key].Add(".," + kv.Key);
                 foreach (KeyValuePair<string, string> entry in kv.Value)
                 {
-                    rawData[kv.Key].Add(entry.Key + ',' + entry.Value.Replace("\n", "\\n"));
+                    string entryDiskFormat = entry.Value.Replace("\r\n", "\n");
+                    entryDiskFormat = entryDiskFormat.Replace("\r", "\n").Replace("\n", "\\n");
+                    if (entryDiskFormat.Contains("\""))
+                    {
+                        entryDiskFormat = "\"" + entryDiskFormat.Replace("\"", "\"\"") + "\"";
+                    }
+                    rawData[kv.Key].Add(entry.Key + ',' + entryDiskFormat);
                 }
             }