Fix localization rule \Localization\[CultureName]\[ModuleId].po

.gitignore

@@ -195,6 +195,7 @@ node_modules/
 
 wwwroot
 **/Localization/**/*.po
+!test/OrchardCore.Tests/Localization/**/*.po
 !src/OrchardCore.Modules/**/wwwroot
 !src/OrchardCore.Themes/**/wwwroot
 !src/OrchardCore.Modules/**/Localization/**/*.po

src/OrchardCore.Modules/OrchardCore.Localization/ModularPoFileLocationProvider.cs

@@ -74,6 +74,9 @@ public IEnumerable<IFileInfo> GetLocations(string cultureName)
 
                 // \src\OrchardCore.Cms.Web\Localization\OrchardCore.Cms.Web-fr-CA.po
                 yield return _fileProvider.GetFileInfo(PathExtensions.Combine(_resourcesContainer, extension.Id + CultureDelimiter + poFileName));
+
+                // \Localization\[CultureName]\[ModuleId].po
+                yield return new PhysicalFileInfo(new FileInfo(PathExtensions.Combine(_resourcesContainer, cultureName, extension.Id + PoFileExtension)));
             }
 
             // Load all .po files from a culture specific folder

test/OrchardCore.Tests/Localization/LocalizationManagerTests.cs

@@ -1,5 +1,9 @@
+using OrchardCore.Environment.Shell;
 using OrchardCore.Localization;
-
+using OrchardCore.Localization.Models;
+using OrchardCore.Settings;
+using OrchardCore.Tests.Apis.Context;
+using OrchardCore.Entities;
 namespace OrchardCore.Tests.Localization
 {
     public class LocalizationManagerTests
@@ -43,7 +47,7 @@ public void GetDictionaryReturnsDictionaryWithTranslationsFromProvider()
                 .Setup(o => o.LoadTranslations(It.Is<string>(culture => culture == "cs"), It.IsAny<CultureDictionary>()))
                 .Callback<string, CultureDictionary>((culture, dictioanry) => dictioanry.MergeTranslations(new[] { dictionaryRecord }));
 
-            var manager = new LocalizationManager(new[] { _pluralRuleProvider.Object }, new[] { _translationProvider.Object }, _memoryCache);
+            var manager = new LocalizationManager([_pluralRuleProvider.Object], [_translationProvider.Object], _memoryCache);
 
             var dictionary = manager.GetDictionary(CultureInfo.GetCultureInfo("cs"));
             var key = new CultureDictionaryRecordKey { MessageId = "ball" };
@@ -67,11 +71,49 @@ public void GetDictionarySelectsPluralRuleFromProviderWithHigherPriority()
                 It.IsAny<CultureDictionary>())
             );
 
-            var manager = new LocalizationManager(new[] { _pluralRuleProvider.Object, highPriorityRuleProvider.Object }, new[] { _translationProvider.Object }, _memoryCache);
+            var manager = new LocalizationManager([_pluralRuleProvider.Object, highPriorityRuleProvider.Object], [_translationProvider.Object], _memoryCache);
 
             var dictionary = manager.GetDictionary(CultureInfo.GetCultureInfo("cs"));
 
             Assert.Equal(dictionary.PluralRule, csPluralRuleOverride);
         }
+
+
+        [Theory]
+        [InlineData("en", "Hello en !")]
+        [InlineData("zh-CN", "你好！")]
+        public async Task TestLocalizationRule(string culture, string expected)
+        {
+            var context = new SiteContext();
+            await context.InitializeAsync();
+            await context.UsingTenantScopeAsync(async scope =>
+            {
+                var shellFeaturesManager = scope.ServiceProvider.GetRequiredService<IShellFeaturesManager>();
+                var availableFeatures = await shellFeaturesManager.GetAvailableFeaturesAsync();
+                var featureIds = new string[] { "OrchardCore.Localization.ContentLanguageHeader", "OrchardCore.Localization" };
+                var features = availableFeatures.Where(feature => featureIds.Contains(feature.Id));
+                await shellFeaturesManager.EnableFeaturesAsync(features, true);
+                var siteService = scope.ServiceProvider.GetRequiredService<ISiteService>();
+                var siteSettings = await siteService.LoadSiteSettingsAsync();
+                siteSettings.Alter<LocalizationSettings>("LocalizationSettings", localizationSettings =>
+                {
+                    localizationSettings.DefaultCulture = culture;
+                    localizationSettings.SupportedCultures = [culture];
+                });
+                await siteService.UpdateSiteSettingsAsync(siteSettings);
+                var shellSettings = scope.ServiceProvider.GetRequiredService<ShellSettings>();
+                var shellHost = scope.ServiceProvider.GetRequiredService<IShellHost>();
+                await shellHost.ReleaseShellContextAsync(shellSettings);
+            });
+
+            await context.UsingTenantScopeAsync(scope =>
+            {
+                var S = scope.ServiceProvider.GetRequiredService<IStringLocalizer<LocalizationManagerTests>>();
+
+                Assert.Equal(expected, S["hello!"]);
+                return Task.CompletedTask;
+            });
+        }
+
     }
 }

test/OrchardCore.Tests/Localization/en/OrchardCore.Tests.po

@@ -0,0 +1,3 @@
+msgctxt "OrchardCore.Tests.Localization.LocalizationManagerTests"
+msgid "hello!"
+msgstr "Hello en !"

test/OrchardCore.Tests/Localization/zh-CN/OrchardCore.Tests.po

@@ -0,0 +1,3 @@
+msgctxt "OrchardCore.Tests.Localization.LocalizationManagerTests"
+msgid "hello!"
+msgstr "你好！"

test/OrchardCore.Tests/OrchardCore.Tests.csproj

@@ -80,6 +80,19 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Localization\en\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="Localization\en\OrchardCore.Tests.po">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Localization\zh-CN\OrchardCore.Tests.po">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <Import Project="..\..\src\OrchardCore.Build\OrchardCore.Commons.targets" />
 
 </Project>