spt/launcher
spt/launcher
0
0
Fork 0
mirror of https://github.com/sp-tarkov/launcher.git synced 2025-02-12 16:50:43 -05:00
Code

Merge pull request 'master' (!18) from waffle.lord/Launcher:master into master

Browse Source 
Reviewed-on: SPT-AKI/Launcher#18
This commit is contained in:
IsWaffle 2023-08-23 22:26:26 +00:00
commit c2100e2329
13 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
project/Aki.Launcher.Base/Helpers/LocalizationProvider.cs
View File

@ -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));
}
}
}

6
project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Simplified).json
View File

@ -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"
}

6
project/Aki.Launcher/Aki_Data/Launcher/Locales/Chinese (Traditional).json
View File

@ -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"
}

6
project/Aki.Launcher/Aki_Data/Launcher/Locales/English.json
View File

@ -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"
}

6
project/Aki.Launcher/Aki_Data/Launcher/Locales/French.json
View File

@ -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"
}

6
project/Aki.Launcher/Aki_Data/Launcher/Locales/German.json
View File

@ -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"
}

6
project/Aki.Launcher/Aki_Data/Launcher/Locales/Italian.json
View File

@ -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"
}

6
project/Aki.Launcher/Aki_Data/Launcher/Locales/Japanese.json
View File

@ -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"
}

6
project/Aki.Launcher/Aki_Data/Launcher/Locales/Korean.json
View File

@ -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"
}

6
project/Aki.Launcher/Aki_Data/Launcher/Locales/Russian.json
View File

@ -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"
}

6
project/Aki.Launcher/Aki_Data/Launcher/Locales/Spanish.json
View File

@ -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"
}

6
project/Aki.Launcher/ViewModels/SettingsViewModel.cs
View File

@ -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()

2
project/Aki.Launcher/Views/SettingsView.axaml
View File

@ -31,7 +31,7 @@
Classes="borderedlink"
Margin="0 0 10 5"
/>
<Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=reset_game_settings}"
<Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=load_live_settings}"
Command="{Binding ResetGameSettingsCommand}"
Classes="borderedlink"
Margin="0 0 10 5"