Skip to content

Fix LT-22125: Clear out DefaultCollations that don't Validate #359

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

Merged
jasonleenaylor merged 3 commits into from
May 30, 2025
Merged

Fix LT-22125: Clear out DefaultCollations that don't Validate #359

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32b2c9f
Fix LT-22125: Clear out DefaultCollations that don't Validate
jasonleenaylor May 30, 2025
f120d16
Merge branch 'release/9.2' into LT-22125
jasonleenaylor May 30, 2025
f1e9616
Merge branch 'release/9.2' into LT-22125
jtmaxwell3 May 30, 2025
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
10 changes: 7 additions & 3 deletions Src/Common/FieldWorks/FieldWorks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,16 +872,20 @@ private static void EnsureDefaultCollationsPresent(LcmCache cache)
StringBuilder nullCollationWs = new StringBuilder();
foreach (CoreWritingSystemDefinition ws in cache.ServiceLocator.WritingSystems.AllWritingSystems)
{
if (ws != null && ws.DefaultCollation == null)
if (ws != null && (ws.DefaultCollation == null || !ws.DefaultCollation.Validate(out _)))
{
ws.DefaultCollation = new IcuRulesCollationDefinition("standard");
nullCollationWs.Append(ws.DisplayLabel + ",");
}
// Check for invalid collation here rather than in RecordSorter to avoid LT-21461 problem.
// This may also repair the previous if statement.
if (ws != null && ws.DefaultCollation != null && InvalidCollation(ws.DefaultCollation))
{
ws.DefaultCollation = new SystemCollationDefinition { LanguageTag = ws.LanguageTag };
CollationDefinition cd;
if (SystemCollator.ValidateLanguageTag(ws.LanguageTag, out _))
cd = new SystemCollationDefinition { LanguageTag = ws.LanguageTag };
else
cd = new IcuRulesCollationDefinition("standard");
ws.DefaultCollation = cd;
}
}
if (nullCollationWs.Length > 0)
Expand Down
Loading