epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some bugs in Translation.

Browse Source 
- Use error.Message to reports errors, as error.ToString isn't overridden.
- Ensure multiple translation languages are handled correctly, we need to use a list to maintain English being the first one.
This commit is contained in:
RoosterDragon
2024-04-05 18:47:13 +01:00
committed by Gustas
parent 2c96f6ec8b
commit 5fcda6a1a4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Translation.cs
View File

@@ -54,7 +54,7 @@ namespace OpenRA
readonly FluentBundle bundle;
public Translation(string language, string[] translations, IReadOnlyFileSystem fileSystem)
: this(language, translations, fileSystem, error => Log.Write("debug", error.ToString())) { }
: this(language, translations, fileSystem, error => Log.Write("debug", error.Message)) { }
public Translation(string language, string[] translations, IReadOnlyFileSystem fileSystem, Action<ParseError> onError)
{
@@ -92,12 +92,12 @@ namespace OpenRA
{
// Always load english strings to provide a fallback for missing translations.
// It is important to load the english files first so the chosen language's files can override them.
var paths = translations.Where(t => t.EndsWith("en.ftl", StringComparison.Ordinal)).ToHashSet();
var paths = translations.Where(t => t.EndsWith("en.ftl", StringComparison.Ordinal)).ToList();
foreach (var t in translations)
if (t.EndsWith($"{language}.ftl", StringComparison.Ordinal))
paths.Add(t);
foreach (var path in paths)
foreach (var path in paths.Distinct())
{
var stream = fileSystem.Open(path);
using (var reader = new StreamReader(stream))