From cdf129846df79c53b555401e0d2d57319f861af4 Mon Sep 17 00:00:00 2001
From: bluepilledgreat <97983689+bluepilledgreat@users.noreply.github.com>
Date: Thu, 13 Mar 2025 20:13:52 +0000
Subject: [PATCH] update custom theme strings
---
Bloxstrap/Resources/Strings.Designer.cs | 12 ++++-----
Bloxstrap/Resources/Strings.resx | 34 ++++++++++++++++++++-----
Bloxstrap/UI/Frontend.cs | 2 +-
3 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs
index 47190a4..eecb287 100644
--- a/Bloxstrap/Resources/Strings.Designer.cs
+++ b/Bloxstrap/Resources/Strings.Designer.cs
@@ -1064,7 +1064,7 @@ namespace Bloxstrap.Resources {
}
///
- /// Looks up a localized string similar to {0} {1} is not a valid {2}.
+ /// Looks up a localized string similar to {0}.{1} is not a valid {2}.
///
public static string CustomTheme_Errors_ElementAttributeInvalidType {
get {
@@ -1100,7 +1100,7 @@ namespace Bloxstrap.Resources {
}
///
- /// Looks up a localized string similar to {0} can only have one {1} defined.
+ /// Looks up a localized string similar to .
///
public static string CustomTheme_Errors_ElementAttributeMultipleDefinitions {
get {
@@ -1109,7 +1109,7 @@ namespace Bloxstrap.Resources {
}
///
- /// Looks up a localized string similar to {0} {1} must be larger than {2}.
+ /// Looks up a localized string similar to {0}.{1} must be larger than {2}.
///
public static string CustomTheme_Errors_ElementAttributeMustBeLargerThanMin {
get {
@@ -1118,7 +1118,7 @@ namespace Bloxstrap.Resources {
}
///
- /// Looks up a localized string similar to {0} {1} must be smaller than {2}.
+ /// Looks up a localized string similar to {0}.{1} must be smaller than {2}.
///
public static string CustomTheme_Errors_ElementAttributeMustBeSmallerThanMax {
get {
@@ -1191,7 +1191,7 @@ namespace Bloxstrap.Resources {
///
/// Looks up a localized string similar to Failed to setup custom bootstrapper: {0}.
- ///Defaulting to Fluent..
+ ///Defaulting to {1}..
///
public static string CustomTheme_Errors_SetupFailed {
get {
@@ -1218,7 +1218,7 @@ namespace Bloxstrap.Resources {
}
///
- /// Looks up a localized string similar to {0} Unknown {1} {2}.
+ /// Looks up a localized string similar to {0} Unknown {1} '{2}'.
///
public static string CustomTheme_Errors_UnknownEnumValue {
get {
diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx
index 56964f7..62b5aaf 100644
--- a/Bloxstrap/Resources/Strings.resx
+++ b/Bloxstrap/Resources/Strings.resx
@@ -1296,75 +1296,96 @@ Please close any applications that may be using Roblox's files, and relaunch.
Theme XML root is not {0}
+ {0} is the element name (e.g. Button)
Custom dialog has already been initialised
Custom bootstrappers can only have a maximum of {0} elements, got {1}.
+ {0} and {1} are numbers
{0} version is not set
+ {0} is the element name (e.g. Button)
{0} version is not a number
+ {0} is the element name (e.g. Button)
{0} version {1} is no longer supported
+ {0} is the element name (e.g. Button), {1} is the version number
{0} version {1} is not recognised
+ {0} is the element name (e.g. Button), {1} is the version number
{0} cannot have a child of {1}
+ {0} and {1} are element names (e.g. Button)
Unknown element {0}
+ {0} is the element name (e.g. Button)
Failed to parse the theme file: {0}
{0} has invalid {1}: {2}
+ {0} is the element name (e.g. Button), {1} is the attribute name (e.g. Text), {2} is the error reason
Element {0} is missing the {1} attribute
+ {0} is the element name (e.g. Button), {1} is the attribute name (e.g. Text)
- {0} {1} is not a valid {2}
+ {0}.{1} is not a valid {2}
+ {0}.{1} is the element & attribute name (e.g. Button.Text), {2} is the type name (e.g. string)
- {0} {1} must be larger than {2}
+ {0}.{1} must be larger than {2}
+ {0}.{1} is the element & attribute name (e.g. Button.Text), {2} is a number
- {0} {1} must be smaller than {2}
+ {0}.{1} must be smaller than {2}
+ {0}.{1} is the element & attribute name (e.g. Button.Text), {2} is a number
- {0} Unknown {1} {2}
+ {0} Unknown {1} '{2}'
+ {0} is the element name (e.g. Button), {1} is the enum name (e.g. WindowCornerType), {2} is the value
- {0} can only have one {1} defined
+
{0}.{1} can only have one child
+ {0}.{1} is the element & attribute name (e.g. Button.Text)
{0} can only have one child
+ {0} is the element name (e.g. Button)
{0}.{1} is missing it's child
+ {0}.{1} is the element & attribute name (e.g. Button.Text)
{0}.{1} could not be parsed into a {2}
+ {0}.{1} is the element & attribute name (e.g. Button.Text), {2} is the type name (e.g. string)
{0}.{1} {2} is null
+ {0}.{1} is the element & attribute name (e.g. Button.Text), {2} is the type name (e.g. string)
{0}.{1} uses blacklisted scheme {2}
+ {0}.{1} is the element & attribute name (e.g. Button.Text), {2} is the URI scheme (e.g. http)
{0} failed to create {1}: {2}
+ {0} is the element name (e.g. Button), {1} is the attribute name (e.g. Text), {2} is the error reason
Editing "{0}"
@@ -1428,7 +1449,8 @@ Please close any applications that may be using Roblox's files, and relaunch.
Failed to setup custom bootstrapper: {0}.
-Defaulting to Fluent.
+Defaulting to {1}.
+ {0} is the error reason, {1} is the theme name (e.g. Bloxstrap (Classic))
No custom theme selected.
diff --git a/Bloxstrap/UI/Frontend.cs b/Bloxstrap/UI/Frontend.cs
index 318a45f..c15bc10 100644
--- a/Bloxstrap/UI/Frontend.cs
+++ b/Bloxstrap/UI/Frontend.cs
@@ -78,7 +78,7 @@ namespace Bloxstrap.UI
App.Logger.WriteException(LOG_IDENT, ex);
if (!App.LaunchSettings.QuietFlag.Active)
- ShowMessageBox(string.Format(Strings.CustomTheme_Errors_SetupFailed, ex.Message), MessageBoxImage.Error);
+ ShowMessageBox(string.Format(Strings.CustomTheme_Errors_SetupFailed, ex.Message, "Bloxstrap"), MessageBoxImage.Error); // NOTE: Bloxstrap is the theme name
return GetBootstrapperDialog(BootstrapperStyle.FluentDialog);
}