Skip to content

Commit

Permalink
Replace strings from code with localizable resource
Browse files Browse the repository at this point in the history
  • Loading branch information
@qe201020335
qe201020335 committed Apr 16, 2024
1 parent 8bb70f2 commit 650a862
Show file tree
Hide file tree
Showing 17 changed files with 1,742 additions and 279 deletions.
22 changes: 19 additions & 3 deletions QuestPatcher/App.axaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Avalonia.Markup.Xaml;
using QuestPatcher.Core;
using QuestPatcher.Models;
using QuestPatcher.Resources;
using QuestPatcher.Services;
using Serilog;

Expand Down Expand Up @@ -95,10 +96,25 @@ public override void OnFrameworkInitializationCompleted()
Theme.LoadEmbeddedTheme("Styles/Themes/QuestPatcherDark.axaml", "Dark").ThemeStying);
}

DialogBuilder dialog = new()
string title;
string text;
try
{
Title = "Critical Error",
Text = "QuestPatcher encountered a critical error during early startup, which was unrecoverable.",
title = Strings.Loading_CriticalError_Title;
text = Strings.Loading_CriticalError_Text;
}
catch (Exception e)
{
// In case the resources failed to load
title = "Critical Error";
text = "QuestPatcher encountered a critical error during early startup, which was unrecoverable.";
Log.Error(e, "Failed to load critical error message from resource, using default");
}

var dialog = new DialogBuilder
{
Title = title,
Text = text,
HideCancelButton = true
};
dialog.WithException(ex);
Expand Down
58 changes: 29 additions & 29 deletions QuestPatcher/BrowseImportManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using QuestPatcher.Core;
using QuestPatcher.Core.Modding;
using QuestPatcher.Models;
using QuestPatcher.Resources;
using QuestPatcher.Services;
using Serilog;

Expand Down Expand Up @@ -169,8 +170,8 @@ public async Task AttemptImportUri(Uri uri)
{
var builder = new DialogBuilder
{
Title = "Failed to download file",
Text = $"Downloading the file from {uri} failed, and thus the file could not be imported.",
Title = Strings.BrowseImport_DownloadFailed_Title,
Text = String.Format(Strings.BrowseImport_DownloadFailed_Text, uri),
HideCancelButton = true
};
await builder.OpenDialogue(_mainWindow);
Expand All @@ -191,8 +192,8 @@ public async Task AttemptImportUri(Uri uri)
{
var builder = new DialogBuilder
{
Title = "Failed to import file from URL",
Text = $"The server at {uri} did not provide a valid file extension, and so QuestPatcher doesn't know how the import the file.",
Title = Strings.BrowseImport_BadUrl_Title,
Text = String.Format(Strings.BrowseImport_BadUrl_Text, uri),
HideCancelButton = true
};
await builder.OpenDialogue(_mainWindow);
Expand Down Expand Up @@ -259,16 +260,16 @@ private async Task ProcessImportQueue()

bool multiple = failedFiles.Count > 1;

DialogBuilder builder = new()
var builder = new DialogBuilder
{
Title = "Import Failed",
Title = Strings.BrowseImport_ImportFailed_Title,
HideCancelButton = true
};

if (multiple)
{
// Show the exceptions for multiple files in the logs to avoid a giagantic dialog
builder.Text = "Multiple files failed to install. Check logs for details about each";
builder.Text = Strings.BrowseImport_ImportFailed_Multiple_Text;
foreach (var pair in failedFiles)
{
Log.Error("Failed to install {FileName}: {Error}", Path.GetFileName(pair.Key), pair.Value.Message);
Expand All @@ -279,20 +280,20 @@ private async Task ProcessImportQueue()
{
// Display single files with more detail for the user
string filePath = failedFiles.Keys.First();
var exception = failedFiles.Values.First();

var ex = failedFiles.Values.First();
string fileName = Path.GetFileName(filePath);
// Don't display the full stack trace for InstallationExceptions, since these are thrown by QP and are not bugs/issues
if (exception is InstallationException)
if (ex is InstallationException)
{
builder.Text = $"{Path.GetFileName(filePath)} failed to install: {exception.Message}";
builder.Text = String.Format(Strings.BrowseImport_ImportFailed_Single_Exception_Text, fileName, ex.Message);
}
else
{
builder.Text = $"The file {Path.GetFileName(filePath)} failed to install";
builder.WithException(exception);
builder.Text = String.Format(Strings.BrowseImport_ImportFailed_Single_Text, fileName);
builder.WithException(ex);
}
Log.Error("Failed to install {FileName}: {Error}", Path.GetFileName(filePath), exception.Message);
Log.Debug(exception, "Full Error");
Log.Error("Failed to install {FileName}: {Error}", fileName, ex.Message);
Log.Debug(ex, "Full Error");
}

await builder.OpenDialogue(_mainWindow);
Expand Down Expand Up @@ -423,10 +424,10 @@ private async Task ImportUnknownFile(FileImportInfo importInfo)
{
FileCopyType? selectedType = null;

DialogBuilder builder = new()
var builder = new DialogBuilder
{
Title = "Multiple Import Options",
Text = $"{Path.GetFileName(path)} can be imported as multiple types of file. Please select what you would like it to be installed as.",
Title = Strings.BrowseImport_MultipleImport_Title,
Text = String.Format(Strings.BrowseImport_MultipleImport_Text, Path.GetFileName(path)),
HideOkButton = true,
HideCancelButton = true
};
Expand Down Expand Up @@ -468,14 +469,13 @@ private async Task<bool> TryImportMod(FileImportInfo importInfo)

if (mod.ModLoader != _installManager.InstalledApp?.ModLoader)
{
DialogBuilder builder = new()
var builder = new DialogBuilder
{
Title = "Wrong Mod Loader",
Text = $"The mod you are trying to install needs the modloader {mod.ModLoader}, however your app has the modloader {_installManager.InstalledApp?.ModLoader} installed."
+ "\nWould you like to repatch your app with the required modloader?"
Title = Strings.Mod_WrongModLoader_Title,
Text = String.Format(Strings.Mod_WrongModLoader_Text, mod.ModLoader, _installManager.InstalledApp?.ModLoader)
};
builder.OkButton.Text = "Repatch";
builder.CancelButton.Text = "Not now";
builder.OkButton.Text = Strings.Mod_WrongModLoader_Repatch;
builder.CancelButton.Text = Strings.Generic_NotNow;
if (await builder.OpenDialogue(_mainWindow))
{
_uiService.OpenRepatchMenu(mod.ModLoader);
Expand All @@ -489,13 +489,13 @@ private async Task<bool> TryImportMod(FileImportInfo importInfo)
// Prompt the user for outdated mods instead of enabling them automatically
if (mod.PackageVersion != null && mod.PackageVersion != _installManager.InstalledApp.Version)
{
DialogBuilder builder = new()
var builder = new DialogBuilder
{
Title = "Outdated Mod",
Text = $"The mod just installed is for version {mod.PackageVersion} of your app, however you have {_installManager.InstalledApp.Version}. Enabling the mod may crash the game, or not work."
Title = Strings.Mod_OutdatedMod_Title,
Text = String.Format(Strings.Mod_OutdatedMod_Text, mod.PackageVersion, _installManager.InstalledApp.Version),
};
builder.OkButton.Text = "Enable Now";
builder.CancelButton.Text = "Cancel";
builder.OkButton.Text = Strings.Mod_OutdatedMod_EnableNow;
builder.CancelButton.Text = Strings.Generic_Cancel;

if (!await builder.OpenDialogue(_mainWindow))
{
Expand Down
4 changes: 2 additions & 2 deletions QuestPatcher/DialogBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class DialogBuilder
/// </summary>
public ButtonInfo OkButton { get; set; } = new()
{
Text = "OK",
Text = Resources.Strings.Generic_OK,
ReturnValue = true,
CloseDialogue = true
};
Expand All @@ -71,7 +71,7 @@ public class DialogBuilder
/// </summary>
public ButtonInfo CancelButton { get; set; } = new()
{
Text = "Cancel",
Text = Resources.Strings.Generic_Cancel,
ReturnValue = false,
CloseDialogue = true
};
Expand Down
Loading

0 comments on commit 650a862

Please sign in to comment.