From f926ad9861dd8e1ac9d4d3bc2e9fef8bd31489d1 Mon Sep 17 00:00:00 2001 From: "waffle.lord" Date: Wed, 23 Aug 2023 18:24:56 -0400 Subject: [PATCH] update locales per CWXs suggestion --- .../Helpers/LocalizationProvider.cs | 48 +++++++++---------- .../Locales/Chinese (Simplified).json | 6 +-- .../Locales/Chinese (Traditional).json | 6 +-- .../Aki_Data/Launcher/Locales/English.json | 6 +-- .../Aki_Data/Launcher/Locales/French.json | 6 +-- .../Aki_Data/Launcher/Locales/German.json | 6 +-- .../Aki_Data/Launcher/Locales/Italian.json | 6 +-- .../Aki_Data/Launcher/Locales/Japanese.json | 6 +-- .../Aki_Data/Launcher/Locales/Korean.json | 6 +-- .../Aki_Data/Launcher/Locales/Russian.json | 6 +-- .../Aki_Data/Launcher/Locales/Spanish.json | 6 +-- .../ViewModels/SettingsViewModel.cs | 6 +-- project/Aki.Launcher/Views/SettingsView.axaml | 2 +- 13 files changed, 58 insertions(+), 58 deletions(-) diff --git a/project/Aki.Launcher.Base/Helpers/LocalizationProvider.cs b/project/Aki.Launcher.Base/Helpers/LocalizationProvider.cs index fe42f93..b343b79 100644 --- a/project/Aki.Launcher.Base/Helpers/LocalizationProvider.cs +++ b/project/Aki.Launcher.Base/Helpers/LocalizationProvider.cs @@ -125,9 +125,9 @@ namespace Aki.Launcher.Helpers englishLocale.clear_game_settings = "Clear Game Settings"; englishLocale.clear_game_settings_succeeded = "Game settings cleared."; englishLocale.clear_game_settings_failed = "An issue occurred while clearing game settings."; - englishLocale.reset_game_settings = "Reset Game Settings"; - englishLocale.reset_game_settings_succeeded = "Game settings reset"; - englishLocale.reset_game_settings_failed = "Failed to reset game settings"; + englishLocale.load_live_settings = "Load Live Settings"; + englishLocale.load_live_settings_succeeded = "Game settings copied from live"; + englishLocale.load_live_settings_failed = "Failed to copy live settings"; englishLocale.remove_registry_keys = "Remove Registry Keys"; englishLocale.remove_registry_keys_succeeded = "Registry keys removed."; englishLocale.remove_registry_keys_failed = "An issue occurred while removing registry keys."; @@ -772,49 +772,49 @@ namespace Aki.Launcher.Helpers } #endregion - #region reset_game_settings - private string _reset_game_settings; - public string reset_game_settings + #region load_live_settings + private string _load_live_settings; + public string load_live_settings { - get => _reset_game_settings; + get => _load_live_settings; set { - if (_reset_game_settings != value) + if (_load_live_settings != value) { - _reset_game_settings = value; - RaisePropertyChanged(nameof(reset_game_settings)); + _load_live_settings = value; + RaisePropertyChanged(nameof(load_live_settings)); } } } #endregion - #region reset_game_settings_failed - private string _reset_game_settings_failed; - public string reset_game_settings_failed + #region load_live_settings_failed + private string _load_live_settings_failed; + public string load_live_settings_failed { - get => _reset_game_settings_failed; + get => _load_live_settings_failed; set { - if (_reset_game_settings_failed != value) + if (_load_live_settings_failed != value) { - _reset_game_settings_failed = value; - RaisePropertyChanged(nameof(reset_game_settings_failed)); + _load_live_settings_failed = value; + RaisePropertyChanged(nameof(load_live_settings_failed)); } } } #endregion - #region reset_game_settings_succeeded - private string _reset_game_settings_succeeded; - public string reset_game_settings_succeeded + #region load_live_settings_succeeded + private string _load_live_settings_succeeded; + public string load_live_settings_succeeded { - get => _reset_game_settings_succeeded; + get => _load_live_settings_succeeded; set { - if (_reset_game_settings_succeeded != value) + if (_load_live_settings_succeeded != value) { - _reset_game_settings_succeeded = value; - RaisePropertyChanged(nameof(reset_game_settings_succeeded)); + _load_live_settings_succeeded = value; + RaisePropertyChanged(nameof(load_live_settings_succeeded)); } } } diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Simplified).json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Simplified).json index 7c8cf46..90b8970 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Simplified).json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Simplified).json @@ -83,7 +83,7 @@ "server_mods": "Server Mods", "profile_mods": "Profile Mods", "author": "Author", - "reset_game_settings": "Reset Game Settings", - "reset_game_settings_failed": "Failed to reset game settings", - "reset_game_settings_succeeded": "Game settings reset" + "load_live_settings": "Load Live Settings", + "load_live_settings_succeeded": "Game settings copied from live", + "load_live_settings_failed": "Failed to copy live settings" } diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Traditional).json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Traditional).json index 0b48153..2637628 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Traditional).json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Traditional).json @@ -83,7 +83,7 @@ "server_mods": "Server Mods", "profile_mods": "Profile Mods", "author": "Author", - "reset_game_settings": "Reset Game Settings", - "reset_game_settings_failed": "Failed to reset game settings", - "reset_game_settings_succeeded": "Game settings reset" + "load_live_settings": "Load Live Settings", + "load_live_settings_succeeded": "Game settings copied from live", + "load_live_settings_failed": "Failed to copy live settings" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/English.json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/English.json index 8e45411..0739763 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/English.json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/English.json @@ -83,7 +83,7 @@ "server_mods": "Server Mods", "profile_mods": "Profile Mods", "author": "Author", - "reset_game_settings": "Reset Game Settings", - "reset_game_settings_failed": "Failed to reset game settings", - "reset_game_settings_succeeded": "Game settings reset" + "load_live_settings": "Load Live Settings", + "load_live_settings_succeeded": "Game settings copied from live", + "load_live_settings_failed": "Failed to copy live settings" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/French.json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/French.json index 645c251..d28065f 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/French.json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/French.json @@ -83,7 +83,7 @@ "server_mods": "Server Mods", "profile_mods": "Profile Mods", "author": "Author", - "reset_game_settings": "Reset Game Settings", - "reset_game_settings_failed": "Failed to reset game settings", - "reset_game_settings_succeeded": "Game settings reset" + "load_live_settings": "Load Live Settings", + "load_live_settings_succeeded": "Game settings copied from live", + "load_live_settings_failed": "Failed to copy live settings" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/German.json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/German.json index 9403820..9afa428 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/German.json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/German.json @@ -83,7 +83,7 @@ "server_mods": "Server Mods", "profile_mods": "Profile Mods", "author": "Author", - "reset_game_settings": "Reset Game Settings", - "reset_game_settings_failed": "Failed to reset game settings", - "reset_game_settings_succeeded": "Game settings reset" + "load_live_settings": "Load Live Settings", + "load_live_settings_succeeded": "Game settings copied from live", + "load_live_settings_failed": "Failed to copy live settings" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Italian.json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Italian.json index 97e818a..b58de25 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Italian.json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Italian.json @@ -83,7 +83,7 @@ "server_mods": "Server Mods", "profile_mods": "Profile Mods", "author": "Author", - "reset_game_settings": "Reset Game Settings", - "reset_game_settings_failed": "Failed to reset game settings", - "reset_game_settings_succeeded": "Game settings reset" + "load_live_settings": "Load Live Settings", + "load_live_settings_succeeded": "Game settings copied from live", + "load_live_settings_failed": "Failed to copy live settings" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Japanese.json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Japanese.json index d9db0b1..22b63cb 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Japanese.json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Japanese.json @@ -83,7 +83,7 @@ "server_mods": "Server Mods", "profile_mods": "Profile Mods", "author": "Author", - "reset_game_settings": "Reset Game Settings", - "reset_game_settings_failed": "Failed to reset game settings", - "reset_game_settings_succeeded": "Game settings reset" + "load_live_settings": "Load Live Settings", + "load_live_settings_succeeded": "Game settings copied from live", + "load_live_settings_failed": "Failed to copy live settings" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Korean.json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Korean.json index a83fe7b..005b808 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Korean.json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Korean.json @@ -83,7 +83,7 @@ "server_mods": "Server Mods", "profile_mods": "Profile Mods", "author": "Author", - "reset_game_settings": "Reset Game Settings", - "reset_game_settings_failed": "Failed to reset game settings", - "reset_game_settings_succeeded": "Game settings reset" + "load_live_settings": "Load Live Settings", + "load_live_settings_succeeded": "Game settings copied from live", + "load_live_settings_failed": "Failed to copy live settings" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Russian.json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Russian.json index 64937fb..ee19220 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Russian.json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Russian.json @@ -83,7 +83,7 @@ "server_mods": "Server Mods", "profile_mods": "Profile Mods", "author": "Author", - "reset_game_settings": "Reset Game Settings", - "reset_game_settings_failed": "Failed to reset game settings", - "reset_game_settings_succeeded": "Game settings reset" + "load_live_settings": "Load Live Settings", + "load_live_settings_succeeded": "Game settings copied from live", + "load_live_settings_failed": "Failed to copy live settings" } \ No newline at end of file diff --git a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Spanish.json b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Spanish.json index c3d2498..16393f1 100644 --- a/project/Aki.Launcher/Aki_Data/Launcher/Locales/Spanish.json +++ b/project/Aki.Launcher/Aki_Data/Launcher/Locales/Spanish.json @@ -83,7 +83,7 @@ "server_mods": "Server Mods", "profile_mods": "Profile Mods", "author": "Author", - "reset_game_settings": "Reset Game Settings", - "reset_game_settings_failed": "Failed to reset game settings", - "reset_game_settings_succeeded": "Game settings reset" + "load_live_settings": "Load Live Settings", + "load_live_settings_succeeded": "Game settings copied from live", + "load_live_settings_failed": "Failed to copy live settings" } \ No newline at end of file diff --git a/project/Aki.Launcher/ViewModels/SettingsViewModel.cs b/project/Aki.Launcher/ViewModels/SettingsViewModel.cs index bd61bd3..c76c621 100644 --- a/project/Aki.Launcher/ViewModels/SettingsViewModel.cs +++ b/project/Aki.Launcher/ViewModels/SettingsViewModel.cs @@ -82,7 +82,7 @@ namespace Aki.Launcher.ViewModels if (!Directory.Exists(EFTSettingsFolder)) { LogManager.Instance.Warning($"EFT settings folder not found, can't reset :: Path: {EFTSettingsFolder}"); - SendNotification("", LocalizationProvider.Instance.reset_game_settings_failed, Avalonia.Controls.Notifications.NotificationType.Error); + SendNotification("", LocalizationProvider.Instance.load_live_settings_failed, Avalonia.Controls.Notifications.NotificationType.Error); return; } @@ -104,11 +104,11 @@ namespace Aki.Launcher.ViewModels catch (Exception ex) { LogManager.Instance.Exception(ex); - SendNotification("", LocalizationProvider.Instance.reset_game_settings_failed, Avalonia.Controls.Notifications.NotificationType.Error); + SendNotification("", LocalizationProvider.Instance.load_live_settings_failed, Avalonia.Controls.Notifications.NotificationType.Error); return; } - SendNotification("", LocalizationProvider.Instance.reset_game_settings_succeeded, Avalonia.Controls.Notifications.NotificationType.Success); + SendNotification("", LocalizationProvider.Instance.load_live_settings_succeeded, Avalonia.Controls.Notifications.NotificationType.Success); } public async Task ClearGameSettingsCommand() diff --git a/project/Aki.Launcher/Views/SettingsView.axaml b/project/Aki.Launcher/Views/SettingsView.axaml index 2cfc5df..9c1dd33 100644 --- a/project/Aki.Launcher/Views/SettingsView.axaml +++ b/project/Aki.Launcher/Views/SettingsView.axaml @@ -31,7 +31,7 @@ Classes="borderedlink" Margin="0 0 10 5" /> -