Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix TextManager.GetLocalizedTextList returning spurious ^M characters #2514

Merged
merged 3 commits into from
Jun 19, 2023
Merged

fix TextManager.GetLocalizedTextList returning spurious ^M characters #2514

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1457be
fix TextManager.GetLocalizedTextList returning spurious ^M characters
Apr 27, 2023
74a6692
Merge branch 'master' into portable-textmanager-getlocalizedtextlist
May 2, 2023
1cf2c03
trim ending newlines to prevent empty entries
May 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Assets/Scripts/Game/TextManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ public class TextManager : MonoBehaviour
const string textFolderName = "Text";
const string textColumn = "text";

readonly char[] trimAtEnd = { '\n', '\r' };
readonly string[] newlineSequences = { "\r\n", "\r", "\n" };

public string runtimeInternalStrings = defaultInternalStringsCollectionName;
public string runtimeRSCStrings = defaultInternalRSCCollectionName;
public string runtimeFlatStrings = defaultInternalFlatsCollectionName;
Expand Down Expand Up @@ -380,7 +383,7 @@ public string[] GetLocalizedTextListFromKeyArray(string[] keyArray, TextCollecti

/// <summary>
/// Gets an array of text where each line is considered an item in array.
/// Entry will be read from table and split by newline '\n' character into array.
/// Entry will be read from table and split by newline characters into array.
/// </summary>
/// <param name="key">Key of text in table.</param>
/// <param name="collection">Enum value to lookup collection name in TextManager.</param>
Expand Down Expand Up @@ -575,7 +578,7 @@ private bool TryGetLocalizedText(string collectionName, string key, out string l

/// <summary>
/// Gets an array of text where each line is considered an item in array.
/// Entry will be read from table and split by newline '\n' character into array.
/// Entry will be read from table and split by newline characters into array.
/// </summary>
/// <param name="collectionName">Name of table collection.</param>
/// <param name="key">Key of text in table.</param>
Expand All @@ -597,7 +600,7 @@ private string[] GetLocalizedTextList(string collectionName, string key, bool ex
return null;
}

cachedList = localizedString.Split('\n');
cachedList = localizedString.TrimEnd(trimAtEnd).Split(newlineSequences, StringSplitOptions.None);
cachedLocalizedTextLists.Add(cacheKey, cachedList);

return cachedList;
Expand Down