Modify to use embeeded resources if file does not exist and remove PathHelpers and move the logic to LoadJsonResources

Author: LunaWanderer1

LocalizationSample.Blazor.WebApp/LocalizationSample.Blazor.WebApp.Client/LocalizationSample.Blazor.WebApp.Client.csproj

@@ -1,13 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
     <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
+	<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Content Remove="Resources\fr-FR.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\fr-FR.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
 	<ProjectReference Include="..\..\src\My.Extensions.Localization.Json\My.Extensions.Localization.Json.csproj" />

LocalizationSample.Blazor.WebApp/LocalizationSample.Blazor.WebApp.Client/Program.cs

@@ -1,7 +1,11 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using System.Globalization;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
 builder.Services.AddJsonLocalization(options => options.ResourcesPath = "Resources");
 
+CultureInfo.CurrentCulture = new CultureInfo("fr-FR");
+CultureInfo.CurrentUICulture = new CultureInfo("fr-FR");
+
 await builder.Build().RunAsync();

LocalizationSample.Blazor.WebApp/LocalizationSample.Blazor.WebApp.Client/Resources/en-US.json

@@ -0,0 +1,3 @@
+{
+  "Hello": "Bonjour English"
+}

LocalizationSample.Blazor.WebApp/LocalizationSample.Blazor.WebApp.Client/Resources/fr-FR.json

@@ -1,3 +1,3 @@
 {
-  "Hello": "Bonjour"
+  "Hello": "Bonjour French"
 }

LocalizationSample.Blazor.WebApp/LocalizationSample.Blazor.WebApp/LocalizationSample.Blazor.WebApp.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
   </PropertyGroup>
 
   <ItemGroup>

src/My.Extensions.Localization.Json/Internal/JsonResourceManager.cs

@@ -3,6 +3,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text.Json;
 
 namespace My.Extensions.Localization.Json.Internal
@@ -182,13 +183,33 @@ IEnumerable<string> GetResourceFiles(string culture)
         private static IDictionary<string, string> LoadJsonResources(string filePath)
         {
             var resources = new Dictionary<string, string>();
+            var assemblyLocation = Assembly.GetExecutingAssembly().Location;
+            var directory = !string.IsNullOrEmpty(assemblyLocation) ?  Path.GetDirectoryName(assemblyLocation) : "";
+            filePath = Path.Combine(directory, filePath);
+
             if (File.Exists(filePath))
             {
                 using var reader = new StreamReader(filePath);
 
                 using var document = JsonDocument.Parse(reader.BaseStream, _jsonDocumentOptions);
 
                 resources = document.RootElement.EnumerateObject().ToDictionary(e => e.Name, e => e.Value.ToString());
+            } else
+            {
+                var resources_embedded = Assembly.GetEntryAssembly().GetManifestResourceNames();
+                foreach (var resourceName in resources_embedded)
+                {
+                    if (resourceName.Contains(filePath.Replace("/", "."))) {
+                        using (Stream stream = Assembly.GetEntryAssembly().GetManifestResourceStream(resourceName))
+                        {
+                            using (StreamReader reader =  new StreamReader(stream))
+                            {
+                                using var document = JsonDocument.Parse(reader.BaseStream, _jsonDocumentOptions);
+                                resources = document.RootElement.EnumerateObject().ToDictionary(e => e.Name, e => e.Value.ToString());
+                            }
+                        }
+                    }
+                }
             }
 
             return resources;

src/My.Extensions.Localization.Json/Internal/PathHelpers.cs

@@ -46,7 +46,7 @@ public IStringLocalizer Create(Type resourceSource)
             // TODO: Check why an exception happen before the host build
             if (resourceSource.Name == "Controller")
             {
-                resourcesPath = Path.Combine(PathHelpers.GetApplicationRoot(), GetResourcePath(resourceSource.Assembly));
+                resourcesPath = GetResourcePath(resourceSource.Assembly);
 
                 return _localizerCache.GetOrAdd(resourceSource.Name, _ => CreateJsonStringLocalizer(resourcesPath, TryFixInnerClassPath("Controller")));
             }
@@ -58,7 +58,7 @@ public IStringLocalizer Create(Type resourceSource)
                 ? typeInfo.Name
                 : TrimPrefix(typeInfo.FullName, assemblyName + ".");
 
-            resourcesPath = Path.Combine(PathHelpers.GetApplicationRoot(), GetResourcePath(assembly));
+            resourcesPath = GetResourcePath(assembly);
             typeName = TryFixInnerClassPath(typeName);
 
             return _localizerCache.GetOrAdd($"culture={CultureInfo.CurrentUICulture.Name}, typeName={typeName}", _ => CreateJsonStringLocalizer(resourcesPath, typeName));
@@ -80,7 +80,7 @@ public IStringLocalizer Create(string baseName, string location)
             {
                 var assemblyName = new AssemblyName(location);
                 var assembly = Assembly.Load(assemblyName);
-                var resourcesPath = Path.Combine(PathHelpers.GetApplicationRoot(), GetResourcePath(assembly));
+                var resourcesPath = GetResourcePath(assembly);
                 string resourceName = null;
                 if (baseName == string.Empty)
                 {