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

Fix language code not recognizable due to inconsistent case #178

Merged
merged 3 commits into from
Mar 1, 2024
Merged

Fix language code not recognizable due to inconsistent case #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ac86aa
Fix language code not recognizable due to inconsistent case
JLChnToZ Feb 28, 2024
d7865ba
Fix compiler error
JLChnToZ Feb 29, 2024
754fc0f
documentation: update change log
JLChnToZ Mar 1, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [unreleased]

### Fixed
- Fix language code not recognizable due to inconsistent case

### Changed

Expand Down
8 changes: 4 additions & 4 deletions Editor/UI/Localization/Localizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public Localizer(string defaultLanguage, Func<List<LocalizationAsset>> assetLoad
})).ToList();
};

languages = ImmutableSortedDictionary<string, Func<string, string>>.Empty;
languages = ImmutableSortedDictionary<string, Func<string, string>>.Empty.WithComparers(StringComparer.OrdinalIgnoreCase);
LoadLocalizations();
_reloadLocalizations += LoadLocalizations;
}
Expand All @@ -88,7 +88,7 @@ void LoadLocalizations()

if (_localizationLoader == null) return;

var newLanguages = ImmutableSortedDictionary<string, Func<string, string>>.Empty;
var newLanguages = ImmutableSortedDictionary<string, Func<string, string>>.Empty.WithComparers(StringComparer.OrdinalIgnoreCase);
foreach (var (lang, lookup) in _localizationLoader())
{
var normalizedLang = CultureInfo.GetCultureInfo(lang).Name;
Expand Down Expand Up @@ -129,10 +129,10 @@ public bool TryGetLocalizedString(string key, out string value)
.Select(l => languages[l])
.ToList();

if (languages.ContainsKey(LanguagePrefs.Language))
if (languages.TryGetValue(LanguagePrefs.Language, out var currentLookup))
{
// Always try the exact match first
lookups.Insert(0, languages[LanguagePrefs.Language]);
lookups.Insert(0, currentLookup);
}

_lookupCache = k =>
Expand Down
Loading