2.2发布 同时支持4.6和net6

Author: GiantappMan

MultiLanguageForXAML.WPF/DB/EmbeddedJsonDB.cs

@@ -4,11 +4,79 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using System.Text.Json;
 using System.Threading.Tasks;
 
 namespace MultiLanguageForXAML.DB
 {
+#if NET46
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Linq;
+    public class EmbeddedJsonDB : IDataBase
+    {
+        private readonly string? basePath;
+        private readonly Dictionary<string, JObject?> dataDict = new();
+
+        public EmbeddedJsonDB()
+        {
+
+        }
+
+        public EmbeddedJsonDB(string basePath)
+        {
+            this.basePath = basePath;
+        }
+
+        public string? Get(string key, string cultureName)
+        {
+            if (basePath == null)
+                return null;
+
+            if (!dataDict.ContainsKey(cultureName))
+            {
+                var files = GetEmbeddedJsonFile(basePath, cultureName);
+                //找不到匹配的，找近似的。例如 zh-CHS找不到,zh也可以
+                if (files.Length == 0)
+                {
+                    bool isSubLan = cultureName.Split('-').Length > 1;
+                    if (isSubLan)
+                        files = GetEmbeddedJsonFile(basePath, $"{cultureName.Split('-')[0]}*");
+                }
+
+                if (files.Length == 0)
+                    return null;
+
+                string json = GetEmbeddedResource(files[0]);
+                var data = JsonConvert.DeserializeObject<JObject>(json);
+                dataDict.Add(cultureName, data);
+            }
+
+            string result = dataDict[cultureName]?[key]?.ToString() ?? string.Empty;
+            return result;
+        }
+
+        private static string[] GetEmbeddedJsonFile(string basePath, string cultureName)
+        {
+            var files = Assembly.GetEntryAssembly()!.GetManifestResourceNames().Where(m => m.StartsWith($"{basePath}.{cultureName}")).ToArray();
+            return files;
+        }
+
+        public static string GetEmbeddedResource(string path)
+        {
+            try
+            {
+                using var reader = new StreamReader(Assembly.GetEntryAssembly()!.GetManifestResourceStream(path)!);
+                return reader.ReadToEnd();
+            }
+            catch (Exception)
+            {
+                return string.Empty;
+            }
+        }
+    }
+#endif
+
+#if NETCOREAPP
+    using System.Text.Json;
     public class EmbeddedJsonDB : IDataBase
     {
         private readonly string? basePath;
@@ -71,4 +139,5 @@ public static string GetEmbeddedResource(string path)
             }
         }
     }
+#endif
 }

MultiLanguageForXAML.WPF/DB/JsonFileDB.cs

@@ -1,9 +1,58 @@
 using System.Collections.Generic;
 using System.IO;
-using System.Text.Json;
 
 namespace MultiLanguageForXAML.DB
 {
+#if NET46
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Linq;
+    public class JsonFileDB : IDataBase
+    {
+        private readonly string? jsonDir;
+        private readonly Dictionary<string, JObject?> dataDict = new();
+
+        public JsonFileDB()
+        {
+
+        }
+
+        public JsonFileDB(string jsonDir)
+        {
+            this.jsonDir = jsonDir;
+        }
+
+        public string? Get(string key, string cultureName)
+        {
+            if (jsonDir == null)
+                return null;
+
+            if (!dataDict.ContainsKey(cultureName))
+            {
+                var files = Directory.GetFiles(jsonDir, $"{cultureName}.json");
+                //找不到匹配的，找近似的。例如 zh-CHS找不到,zh也可以
+                if (files.Length == 0)
+                {
+                    bool isSubLan = cultureName.Split('-').Length > 1;
+                    if (isSubLan)
+                        files = Directory.GetFiles(jsonDir, $"{cultureName.Split('-')[0]}*");
+                }
+
+                if (files.Length == 0)
+                    return null;
+
+                string json = File.ReadAllText(files[0]);
+                var data = JsonConvert.DeserializeObject<JObject>(json);
+                dataDict.Add(cultureName, data);
+            }
+
+            string? result = dataDict[cultureName]?[key]?.ToString();
+            return result;
+        }
+    }
+#endif
+
+#if NETCOREAPP
+    using System.Text.Json;
     public class JsonFileDB : IDataBase
     {
         private readonly string? jsonDir;
@@ -47,4 +96,5 @@ public JsonFileDB(string jsonDir)
             return result;
         }
     }
+#endif
 }

MultiLanguageForXAML.WPF/MultiLanguageForXAML.WPF.csproj

@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFrameworks>net46;net6.0-windows</TargetFrameworks>
+    <LangVersion>10.0</LangVersion>
+    <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
-    <Version>2.1.8</Version>
+    <Version>2.2.0</Version>
     <AssemblyName>MultiLanguageForXAML</AssemblyName>
     <RootNamespace>MultiLanguageForXAML</RootNamespace>
     <Platforms>AnyCPU</Platforms>
@@ -13,6 +14,7 @@
     <Description>Multilanguage support for WPF </Description>
     <Authors>DaZiYuan</Authors>
     <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,4 +23,9 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="IndexRange" Version="1.0.2" />
+  </ItemGroup>
 </Project>

Samples.WPF/Samples.WPF.csproj

@@ -2,7 +2,9 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <!--<TargetFramework>net6.0-windows</TargetFramework>-->
+    <LangVersion>10.0</LangVersion>
+    <TargetFramework>net46</TargetFramework>
     <UseWPF>true</UseWPF>
     <Platforms>AnyCPU</Platforms>
     <Nullable>enable</Nullable>