From 24d1de0b238efc5668eae1ad76e954bd10c20c10 Mon Sep 17 00:00:00 2001
From: Jack <3486688394@qq.com>
Date: Thu, 23 Jan 2025 23:02:15 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=9E=84?=
 =?UTF-8?q?=E9=80=A0=E5=87=BD=E6=95=B0=E5=B9=B6=E8=B0=83=E6=95=B4=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JackCraft.I18N.sln.DotSettings.user | 1 +
 JackCraft.I18N/I18NManager.cs       | 4 ++--
 Test/App.axaml.cs                   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/JackCraft.I18N.sln.DotSettings.user b/JackCraft.I18N.sln.DotSettings.user
index 3400518..b5fbb10 100644
--- a/JackCraft.I18N.sln.DotSettings.user
+++ b/JackCraft.I18N.sln.DotSettings.user
@@ -1,6 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEffectiveValue_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5a525a9d918b377baff5efc711876365dd6b28a67a526bca563509277c197_003FEffectiveValue_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIValueConverter_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F0d5de909919040338555601dd29873191e2000_003F6e_003F156c671e_003FIValueConverter_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AManifestBasedResourceGroveler_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Faa4010d4409494a18f9356117451768ad29a90b7ff96ac80dd7d963d6b383_003FManifestBasedResourceGroveler_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMultiBinding_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5cfc269cf6784f4a9dec8ed13ac9f75de600_003F49_003F860db364_003FMultiBinding_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATest_002EMainWindow_002Eg_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F1beb137ab36b71a8961f85c524c65a73ff2463ed_003FTest_002EMainWindow_002Eg_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F6d2342c247c64eb7a9b3702e481e4443f83e00_003Fc7_003F71d96ba5_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
diff --git a/JackCraft.I18N/I18NManager.cs b/JackCraft.I18N/I18NManager.cs
index 25a74bb..35842c8 100644
--- a/JackCraft.I18N/I18NManager.cs
+++ b/JackCraft.I18N/I18NManager.cs
@@ -8,10 +8,10 @@ namespace JackCraft.I18N;
 
 public sealed class I18NManager : INotifyPropertyChanged
 {
-    public I18NManager(string baseName, Assembly assembly)
+    public I18NManager(string baseName, Assembly? assembly = null)
     {
         I18NConfig.BaseName = baseName;
-        I18NConfig.Assembly = assembly;
+        I18NConfig.Assembly = assembly ?? Assembly.GetCallingAssembly();
         I18NConfig.Manager = this;
     }
 
diff --git a/Test/App.axaml.cs b/Test/App.axaml.cs
index 0ba308e..16e17ab 100644
--- a/Test/App.axaml.cs
+++ b/Test/App.axaml.cs
@@ -8,7 +8,7 @@ namespace Test;
 
 public class App : Application
 {
-    public static I18NManager I18NManager { get; set; } = new("Test.Assets.Resources", typeof(App).Assembly);
+    public static I18NManager I18NManager { get; } = new("Test.Assets.Resources");
 
     public override void Initialize()
     {