From 5bcb1a678ccae1556bef1a015e6690b86536f4c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 22 May 2023 21:44:46 +0200 Subject: [PATCH] Fix fluent plural forms. --- OpenRA.Game/Translation.cs | 6 +++--- OpenRA.Test/OpenRA.Game/FluentTest.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Game/Translation.cs b/OpenRA.Game/Translation.cs index e3f01e7404..520c1a0d94 100644 --- a/OpenRA.Game/Translation.cs +++ b/OpenRA.Game/Translation.cs @@ -56,7 +56,7 @@ namespace OpenRA return; bundle = LinguiniBuilder.Builder() - .CultureInfo(CultureInfo.InvariantCulture) + .CultureInfo(new CultureInfo(language)) .SkipResources() .SetUseIsolating(false) .UseConcurrent() @@ -65,7 +65,7 @@ namespace OpenRA ParseTranslations(language, translations, fileSystem, onError); } - public Translation(string text, Action onError) + public Translation(string language, string text, Action onError) { var parser = new LinguiniParser(text); var resource = parser.Parse(); @@ -73,7 +73,7 @@ namespace OpenRA onError(error); bundle = LinguiniBuilder.Builder() - .CultureInfo(CultureInfo.InvariantCulture) + .CultureInfo(new CultureInfo(language)) .SkipResources() .SetUseIsolating(false) .UseConcurrent() diff --git a/OpenRA.Test/OpenRA.Game/FluentTest.cs b/OpenRA.Test/OpenRA.Game/FluentTest.cs index 6d33cef4aa..62365a6e11 100644 --- a/OpenRA.Test/OpenRA.Game/FluentTest.cs +++ b/OpenRA.Test/OpenRA.Game/FluentTest.cs @@ -27,7 +27,7 @@ label-players = {$player -> [TestCase(TestName = "Fluent Plural Terms")] public void TestOne() { - var translation = new Translation(pluralForms, e => Console.WriteLine(e.Message)); + var translation = new Translation("en", pluralForms, e => Console.WriteLine(e.Message)); var label = translation.GetString("label-players", Translation.Arguments("player", 1)); Assert.That("One player", Is.EqualTo(label)); label = translation.GetString("label-players", Translation.Arguments("player", 2));