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(skia): incorrect localization culture #16712

Merged
merged 1 commit into from
Jun 3, 2024
Merged

fix(skia): incorrect localization culture #16712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 16 additions & 9 deletions src/Uno.UI.RuntimeTests/Tests/Windows_ApplicationModel_Resources/Given_ResourceLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,32 @@
using System.Threading;
using Windows.ApplicationModel.Resources;
using Windows.ApplicationModel.Resources.Core;
using Windows.Globalization;

namespace Uno.UI.RuntimeTests.Tests
{
[TestClass]
public class Given_ResourceLoader
{
private const string DefaultLanguage = "en-US";

[TestInitialize]
public void Init()
{
CultureInfo.CurrentUICulture = new CultureInfo("en-US");
CultureInfo.CurrentUICulture = new CultureInfo(DefaultLanguage);
ApplicationLanguages.PrimaryLanguageOverride = DefaultLanguage;
#if __XAMARIN__ || __WASM__
ResourceLoader.DefaultLanguage = "en-US";
ResourceLoader.DefaultLanguage = DefaultLanguage;
#endif
}

[TestCleanup]
public void Cleanup()
{
CultureInfo.CurrentUICulture = new CultureInfo("en-US");
CultureInfo.CurrentUICulture = new CultureInfo(DefaultLanguage);
ApplicationLanguages.PrimaryLanguageOverride = DefaultLanguage;
#if __XAMARIN__ || __WASM__
ResourceLoader.DefaultLanguage = "en-US";
ResourceLoader.DefaultLanguage = DefaultLanguage;
#endif
}

Expand Down Expand Up @@ -130,7 +135,7 @@ public void When_LocalizedResource()

foreach (var language in languages)
{
CultureInfo.CurrentUICulture = new CultureInfo(language);
ApplicationLanguages.PrimaryLanguageOverride = language;
Assert.AreEqual($@"Text in '{language}'", SUT.GetString("Given_ResourceLoader/When_LocalizedResource"));
}
}
Expand All @@ -140,7 +145,7 @@ public void When_MissingLocalizedResource_FallbackOnParent()
{
var SUT = ResourceLoader.GetForViewIndependentUse();

CultureInfo.CurrentUICulture = new CultureInfo("fr-FR");
ApplicationLanguages.PrimaryLanguageOverride = "fr-FR";
Assert.AreEqual(@"Text in 'fr'", SUT.GetString("Given_ResourceLoader/When_LocalizedResource"));
}

Expand All @@ -149,16 +154,19 @@ public void When_MissingLocalizedResource_FallbackOnRegional()
{
var SUT = ResourceLoader.GetForViewIndependentUse();

CultureInfo.CurrentUICulture = new CultureInfo("es");
ApplicationLanguages.PrimaryLanguageOverride = "es";
Assert.AreEqual(@"Text in 'es-MX'", SUT.GetString("Given_ResourceLoader/When_LocalizedResource"));
}

[TestMethod]
#if __IOS__
[Ignore("Unstable test due to device language settings: NSLocale.PreferredLanguages can be 'en' or 'en-US'.")]
#endif
public void When_MissingLocalizedResource_FallbackOnDefault()
{
var SUT = ResourceLoader.GetForViewIndependentUse();

CultureInfo.CurrentUICulture = new CultureInfo("de-DE");
ApplicationLanguages.PrimaryLanguageOverride = "de-DE";
Assert.AreEqual(@"Text in 'en-US'", SUT.GetString("Given_ResourceLoader/When_LocalizedResource"));
}

Expand All @@ -174,6 +182,5 @@ public void When_FileAndStringNameFormat()
Assert.AreEqual(@"", SUT.GetString("/this-does-not-exist"));
Assert.AreEqual(@"", SUT.GetString("//this-does-not-exist"));
}

}
}
19 changes: 12 additions & 7 deletions src/Uno.UI.Tests/ResourceLoader/Given_ResourceLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,33 @@
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Uno.UI.Tests.ResourceLoader.Controls;
using Windows.Globalization;
using _ResourceLoader = Windows.ApplicationModel.Resources.ResourceLoader;

namespace Uno.UI.Tests.ResourceLoaderTests
{
[TestClass]
public class Given_ResourceLoader
{
private const string DefaultLanguage = "en-US";
private const string UITestResources = "Uno.UI.Tests/Resources";

[TestInitialize]
public void Init()
{
CultureInfo.CurrentUICulture = new CultureInfo("en-US");
_ResourceLoader.DefaultLanguage = "en-US";
CultureInfo.CurrentUICulture = new CultureInfo(DefaultLanguage);
ApplicationLanguages.PrimaryLanguageOverride = DefaultLanguage;
_ResourceLoader.DefaultLanguage = DefaultLanguage;

_ResourceLoader.AddLookupAssembly(GetType().Assembly);
}

[TestCleanup]
public void Cleanup()
{
CultureInfo.CurrentUICulture = new CultureInfo("en-US");
_ResourceLoader.DefaultLanguage = "en-US";
CultureInfo.CurrentUICulture = new CultureInfo(DefaultLanguage);
ApplicationLanguages.PrimaryLanguageOverride = DefaultLanguage;
_ResourceLoader.DefaultLanguage = DefaultLanguage;
}

[TestMethod]
Expand All @@ -52,7 +57,7 @@ public void When_ResourceFile_Neutral_Both()
{
void setResources(string language)
{
CultureInfo.CurrentUICulture = new CultureInfo(language);
ApplicationLanguages.PrimaryLanguageOverride = language;
_ResourceLoader.DefaultLanguage = language;
}

Expand All @@ -71,7 +76,7 @@ public void When_MissingLocalizedResource_FallbackOnParent()
{
var SUT = _ResourceLoader.GetForCurrentView(UITestResources);

CultureInfo.CurrentUICulture = new CultureInfo("fr-FR");
ApplicationLanguages.PrimaryLanguageOverride = "fr-FR";
Assert.AreEqual(@"Text in 'fr'", SUT.GetString("Given_ResourceLoader/When_LocalizedResource"));
}

Expand All @@ -80,7 +85,7 @@ public void When_MissingLocalizedResource_FallbackOnDefault()
{
var SUT = _ResourceLoader.GetForCurrentView(UITestResources);

CultureInfo.CurrentUICulture = new CultureInfo("de-DE");
ApplicationLanguages.PrimaryLanguageOverride = "de-DE";
Assert.AreEqual(@"Text in 'en'", SUT.GetString("Given_ResourceLoader/When_LocalizedResource"));
}

Expand Down
Loading
Loading