t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pulled localization into Plugin.cs

Browse Source
This commit is contained in:
xPumaa
2022-07-24 00:43:22 +02:00
parent e774827f57
commit c16a4b7b00
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MareSynchronos/Plugin.cs
View File

@@ -36,6 +36,7 @@ namespace MareSynchronos
private readonly FileDialogManager _fileDialogManager; private readonly FileDialogManager _fileDialogManager;
private readonly CompactUi _compactUi; private readonly CompactUi _compactUi;
private readonly UiShared _uiSharedComponent; private readonly UiShared _uiSharedComponent;
private readonly Dalamud.Localization _localization;
public Plugin(DalamudPluginInterface pluginInterface, CommandManager commandManager, public Plugin(DalamudPluginInterface pluginInterface, CommandManager commandManager,
@@ -49,6 +50,9 @@ namespace MareSynchronos
_configuration.Initialize(PluginInterface); _configuration.Initialize(PluginInterface);
_configuration.Migrate(); _configuration.Migrate();
_localization = new Dalamud.Localization("MareSynchronos.Localization.", "", true);
_localization.SetupWithLangCode("en");
_windowSystem = new WindowSystem("MareSynchronos"); _windowSystem = new WindowSystem("MareSynchronos");
new FileCacheContext().Dispose(); // make sure db is initialized I guess new FileCacheContext().Dispose(); // make sure db is initialized I guess
@@ -63,7 +67,7 @@ namespace MareSynchronos
_fileDialogManager = new FileDialogManager(); _fileDialogManager = new FileDialogManager();
_uiSharedComponent = _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); _settingsUi = new SettingsUi(_windowSystem, _uiSharedComponent, _configuration, _apiController);
_compactUi = new CompactUi(_windowSystem, _uiSharedComponent, _configuration, _apiController); _compactUi = new CompactUi(_windowSystem, _uiSharedComponent, _configuration, _apiController);

6
MareSynchronos/UI/UIShared.cs
View File

@@ -30,6 +30,7 @@ namespace MareSynchronos.UI
private readonly Configuration _pluginConfiguration; private readonly Configuration _pluginConfiguration;
private readonly DalamudUtil _dalamudUtil; private readonly DalamudUtil _dalamudUtil;
private readonly DalamudPluginInterface _pluginInterface; private readonly DalamudPluginInterface _pluginInterface;
private readonly Dalamud.Localization _localization;
public long FileCacheSize => _fileCacheManager.FileCacheSize; public long FileCacheSize => _fileCacheManager.FileCacheSize;
public bool ShowClientSecret = true; public bool ShowClientSecret = true;
public string PlayerName => _dalamudUtil.PlayerName; 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 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; _ipcManager = ipcManager;
_apiController = apiController; _apiController = apiController;
@@ -49,6 +50,7 @@ namespace MareSynchronos.UI
_pluginConfiguration = pluginConfiguration; _pluginConfiguration = pluginConfiguration;
_dalamudUtil = dalamudUtil; _dalamudUtil = dalamudUtil;
_pluginInterface = pluginInterface; _pluginInterface = pluginInterface;
_localization = localization;
_isDirectoryWritable = IsDirectoryWritable(_pluginConfiguration.CacheFolder); _isDirectoryWritable = IsDirectoryWritable(_pluginConfiguration.CacheFolder);
_pluginInterface.UiBuilder.BuildFonts += BuildFont; _pluginInterface.UiBuilder.BuildFonts += BuildFont;
@@ -207,7 +209,7 @@ namespace MareSynchronos.UI
public void LoadLocalization(string languageCode) public void LoadLocalization(string languageCode)
{ {
_dalamudUtil.Localization.SetupWithLangCode(languageCode); _localization.SetupWithLangCode(languageCode);
Strings.ToS = new Strings.ToSStrings(); Strings.ToS = new Strings.ToSStrings();
} }

4
MareSynchronos/Utils/DalamudUtil.cs
View File

@@ -26,7 +26,6 @@ namespace MareSynchronos.Utils
public event LogIn? LogIn; public event LogIn? LogIn;
public event LogOut? LogOut; public event LogOut? LogOut;
public event FrameworkUpdate? FrameworkUpdate; public event FrameworkUpdate? FrameworkUpdate;
public readonly Dalamud.Localization Localization;
public DalamudUtil(ClientState clientState, ObjectTable objectTable, Framework framework) public DalamudUtil(ClientState clientState, ObjectTable objectTable, Framework framework)
{ {
@@ -40,9 +39,6 @@ namespace MareSynchronos.Utils
{ {
ClientStateOnLogin(null, EventArgs.Empty); ClientStateOnLogin(null, EventArgs.Empty);
} }
Localization = new Dalamud.Localization("MareSynchronos.Localization.", "", true);
Localization.SetupWithLangCode("en");
} }
private void FrameworkOnUpdate(Framework framework) private void FrameworkOnUpdate(Framework framework)