From c16a4b7b0053a229649dcc5d856cac43af846245 Mon Sep 17 00:00:00 2001
From: xPumaa <35280763+xPumaa@users.noreply.github.com>
Date: Sun, 24 Jul 2022 00:43:22 +0200
Subject: [PATCH] pulled localization into Plugin.cs

---
 MareSynchronos/Plugin.cs            | 6 +++++-
 MareSynchronos/UI/UIShared.cs       | 6 ++++--
 MareSynchronos/Utils/DalamudUtil.cs | 4 ----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/MareSynchronos/Plugin.cs b/MareSynchronos/Plugin.cs
index 81360dd..5388591 100644
--- a/MareSynchronos/Plugin.cs
+++ b/MareSynchronos/Plugin.cs
@@ -36,6 +36,7 @@ namespace MareSynchronos
         private readonly FileDialogManager _fileDialogManager;
         private readonly CompactUi _compactUi;
         private readonly UiShared _uiSharedComponent;
+        private readonly Dalamud.Localization _localization;
 
 
         public Plugin(DalamudPluginInterface pluginInterface, CommandManager commandManager,
@@ -48,6 +49,9 @@ namespace MareSynchronos
             _configuration = PluginInterface.GetPluginConfig() as Configuration ?? new Configuration();
             _configuration.Initialize(PluginInterface);
             _configuration.Migrate();
+            
+            _localization = new Dalamud.Localization("MareSynchronos.Localization.", "", true);
+            _localization.SetupWithLangCode("en");
 
             _windowSystem = new WindowSystem("MareSynchronos");
 
@@ -63,7 +67,7 @@ namespace MareSynchronos
             _fileDialogManager = new FileDialogManager();
 
             _uiSharedComponent =
-                new UiShared(_ipcManager, _apiController, _fileCacheManager, _fileDialogManager, _configuration, _dalamudUtil, PluginInterface);
+                new UiShared(_ipcManager, _apiController, _fileCacheManager, _fileDialogManager, _configuration, _dalamudUtil, PluginInterface, _localization);
             _settingsUi = new SettingsUi(_windowSystem, _uiSharedComponent, _configuration, _apiController);
             _compactUi = new CompactUi(_windowSystem, _uiSharedComponent, _configuration, _apiController);
 
diff --git a/MareSynchronos/UI/UIShared.cs b/MareSynchronos/UI/UIShared.cs
index cd28c01..7a42caa 100644
--- a/MareSynchronos/UI/UIShared.cs
+++ b/MareSynchronos/UI/UIShared.cs
@@ -30,6 +30,7 @@ namespace MareSynchronos.UI
         private readonly Configuration _pluginConfiguration;
         private readonly DalamudUtil _dalamudUtil;
         private readonly DalamudPluginInterface _pluginInterface;
+        private readonly Dalamud.Localization _localization;
         public long FileCacheSize => _fileCacheManager.FileCacheSize;
         public bool ShowClientSecret = true;
         public string PlayerName => _dalamudUtil.PlayerName;
@@ -40,7 +41,7 @@ namespace MareSynchronos.UI
 
         public static bool CtrlPressed() => (GetKeyState(0xA2) & 0x8000) != 0 || (GetKeyState(0xA3) & 0x8000) != 0;
 
-        public UiShared(IpcManager ipcManager, ApiController apiController, FileCacheManager fileCacheManager, FileDialogManager fileDialogManager, Configuration pluginConfiguration, DalamudUtil dalamudUtil, DalamudPluginInterface pluginInterface)
+        public UiShared(IpcManager ipcManager, ApiController apiController, FileCacheManager fileCacheManager, FileDialogManager fileDialogManager, Configuration pluginConfiguration, DalamudUtil dalamudUtil, DalamudPluginInterface pluginInterface, Dalamud.Localization localization)
         {
             _ipcManager = ipcManager;
             _apiController = apiController;
@@ -49,6 +50,7 @@ namespace MareSynchronos.UI
             _pluginConfiguration = pluginConfiguration;
             _dalamudUtil = dalamudUtil;
             _pluginInterface = pluginInterface;
+            _localization = localization;
             _isDirectoryWritable = IsDirectoryWritable(_pluginConfiguration.CacheFolder);
 
             _pluginInterface.UiBuilder.BuildFonts += BuildFont;
@@ -207,7 +209,7 @@ namespace MareSynchronos.UI
 
         public void LoadLocalization(string languageCode)
         {
-            _dalamudUtil.Localization.SetupWithLangCode(languageCode);
+            _localization.SetupWithLangCode(languageCode);
             Strings.ToS = new Strings.ToSStrings();
         }
 
diff --git a/MareSynchronos/Utils/DalamudUtil.cs b/MareSynchronos/Utils/DalamudUtil.cs
index e5d2026..f110654 100644
--- a/MareSynchronos/Utils/DalamudUtil.cs
+++ b/MareSynchronos/Utils/DalamudUtil.cs
@@ -26,7 +26,6 @@ namespace MareSynchronos.Utils
         public event LogIn? LogIn;
         public event LogOut? LogOut;
         public event FrameworkUpdate? FrameworkUpdate;
-        public readonly Dalamud.Localization Localization;
 
         public DalamudUtil(ClientState clientState, ObjectTable objectTable, Framework framework)
         {
@@ -40,9 +39,6 @@ namespace MareSynchronos.Utils
             {
                 ClientStateOnLogin(null, EventArgs.Empty);
             }
-
-            Localization = new Dalamud.Localization("MareSynchronos.Localization.", "", true);
-            Localization.SetupWithLangCode("en");
         }
 
         private void FrameworkOnUpdate(Framework framework)