diff --git a/test/LocalizationWebsite/LocalizationWebsite.csproj b/test/LocalizationWebsite/LocalizationWebsite.csproj index b1eec2d5d4..082a8c4397 100644 --- a/test/LocalizationWebsite/LocalizationWebsite.csproj +++ b/test/LocalizationWebsite/LocalizationWebsite.csproj @@ -1,4 +1,4 @@ - + diff --git a/test/LocalizationWebsite/Resources/StartupCustomCulturePreserved.en-US.resx b/test/LocalizationWebsite/Resources/StartupCustomCulturePreserved.en-US.resx new file mode 100644 index 0000000000..e163149384 --- /dev/null +++ b/test/LocalizationWebsite/Resources/StartupCustomCulturePreserved.en-US.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + We shouldn't get the english hello! + + \ No newline at end of file diff --git a/test/LocalizationWebsite/StartupResourcesInFolder.cs b/test/LocalizationWebsite/StartupResourcesInFolder.cs index 52f47ce67b..36cc27e927 100644 --- a/test/LocalizationWebsite/StartupResourcesInFolder.cs +++ b/test/LocalizationWebsite/StartupResourcesInFolder.cs @@ -26,7 +26,10 @@ namespace LocalizationWebsite ILoggerFactory loggerFactory, IStringLocalizerFactory stringLocalizerFactory, IStringLocalizer startupStringLocalizer, - IStringLocalizer custromerStringLocalizer) + IStringLocalizer custromerStringLocalizer, + // This localizer is used in tests to prevent a regression of https://github.com/aspnet/Localization/issues/293 + // Namely that english was always being returned if it existed. + IStringLocalizer customCultureLocalizer) { loggerFactory.AddConsole(minLevel: LogLevel.Warning); @@ -53,6 +56,8 @@ namespace LocalizationWebsite await context.Response.WriteAsync(stringLocalizer["Hello"]); await context.Response.WriteAsync(" "); await context.Response.WriteAsync(custromerStringLocalizer["Hello"]); + await context.Response.WriteAsync(" "); + await context.Response.WriteAsync(customCultureLocalizer["Hello"]); }); } } diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs index 9e59360854..432abda469 100644 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs @@ -84,7 +84,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests "http://localhost:5074", "ResourcesInFolder", "fr-FR", - "Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder"); + "Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder Hello"); } [ConditionalFact] @@ -100,7 +100,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests "http://localhost:5075/", "ResourcesInFolder", "fr-FR", - "Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder"); + "Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder Hello"); } [Fact] @@ -114,7 +114,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests "http://localhost:5076", "ResourcesInFolder", "fr-FR-test", - "Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder"); + "Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder Hello"); } [ConditionalFact] @@ -130,7 +130,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests "http://localhost:5077", "ResourcesInFolder", "fr-FR-test", - "Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder"); + "Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder Hello"); } [Fact] @@ -144,7 +144,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests "http://localhost:5078/", "ResourcesInFolder", "fr-FR-test-again-too-deep-to-work", - "Hello Hello Hello"); + "Hello Hello Hello Hello"); } [ConditionalFact] @@ -160,7 +160,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests "http://localhost:5079/", "ResourcesInFolder", "fr-FR-test-again-too-deep-to-work", - "Hello Hello Hello"); + "Hello Hello Hello Hello"); } [Fact]