diff --git a/Bloxstrap/Extensions/ServerTypeEx.cs b/Bloxstrap/Extensions/ServerTypeEx.cs index 88956d0..2b65d8b 100644 --- a/Bloxstrap/Extensions/ServerTypeEx.cs +++ b/Bloxstrap/Extensions/ServerTypeEx.cs @@ -4,9 +4,9 @@ { public static string ToTranslatedString(this ServerType value) => value switch { - ServerType.Public => Resources.Strings.Enums_ServerType_Public, - ServerType.Private => Resources.Strings.Enums_ServerType_Private, - ServerType.Reserved => Resources.Strings.Enums_ServerType_Reserved, + ServerType.Public => Strings.Enums_ServerType_Public, + ServerType.Private => Strings.Enums_ServerType_Private, + ServerType.Reserved => Strings.Enums_ServerType_Reserved, _ => "?" }; } diff --git a/Bloxstrap/UI/Converters/EnumNameConverter.cs b/Bloxstrap/UI/Converters/EnumNameConverter.cs index 52e1cf0..e0b9638 100644 --- a/Bloxstrap/UI/Converters/EnumNameConverter.cs +++ b/Bloxstrap/UI/Converters/EnumNameConverter.cs @@ -32,11 +32,11 @@ namespace Bloxstrap.UI.Converters return attribute.StaticName; if (attribute.FromTranslation is not null) - return Resources.Strings.ResourceManager.GetStringSafe(attribute.FromTranslation); + return Strings.ResourceManager.GetStringSafe(attribute.FromTranslation); } } - return Resources.Strings.ResourceManager.GetStringSafe(String.Format( + return Strings.ResourceManager.GetStringSafe(String.Format( "{0}.{1}", typeName.Substring(typeName.IndexOf('.', StringComparison.Ordinal) + 1), stringVal diff --git a/Bloxstrap/UI/Elements/Bootstrapper/LegacyDialog2008.cs b/Bloxstrap/UI/Elements/Bootstrapper/LegacyDialog2008.cs index 5543902..2842a94 100644 --- a/Bloxstrap/UI/Elements/Bootstrapper/LegacyDialog2008.cs +++ b/Bloxstrap/UI/Elements/Bootstrapper/LegacyDialog2008.cs @@ -43,7 +43,7 @@ namespace Bloxstrap.UI.Elements.Bootstrapper { InitializeComponent(); - this.buttonCancel.Text = Resources.Strings.Common_Cancel; + this.buttonCancel.Text = Strings.Common_Cancel; ScaleWindow(); SetupDialog(); diff --git a/Bloxstrap/UI/Elements/Bootstrapper/LegacyDialog2011.cs b/Bloxstrap/UI/Elements/Bootstrapper/LegacyDialog2011.cs index 2349eda..93192c1 100644 --- a/Bloxstrap/UI/Elements/Bootstrapper/LegacyDialog2011.cs +++ b/Bloxstrap/UI/Elements/Bootstrapper/LegacyDialog2011.cs @@ -43,7 +43,7 @@ namespace Bloxstrap.UI.Elements.Bootstrapper InitializeComponent(); this.IconBox.BackgroundImage = App.Settings.Prop.BootstrapperIcon.GetIcon().ToBitmap(); - this.buttonCancel.Text = Resources.Strings.Common_Cancel; + this.buttonCancel.Text = Strings.Common_Cancel; ScaleWindow(); SetupDialog(); diff --git a/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.cs b/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.cs index fc2974a..da4bd57 100644 --- a/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.cs +++ b/Bloxstrap/UI/Elements/Bootstrapper/ProgressDialog.cs @@ -52,8 +52,8 @@ namespace Bloxstrap.UI.Elements.Bootstrapper this.BackColor = Color.FromArgb(25, 27, 29); } - this.labelMessage.Text = Resources.Strings.Bootstrapper_StylePreview_TextCancel; - this.buttonCancel.Text = Resources.Strings.Common_Cancel; + this.labelMessage.Text = Strings.Bootstrapper_StylePreview_TextCancel; + this.buttonCancel.Text = Strings.Common_Cancel; this.IconBox.BackgroundImage = App.Settings.Prop.BootstrapperIcon.GetIcon().GetSized(128, 128).ToBitmap(); SetupDialog(); diff --git a/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml.cs b/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml.cs index 47a4c39..29a708c 100644 --- a/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml.cs +++ b/Bloxstrap/UI/Elements/Dialogs/FluentMessageBox.xaml.cs @@ -121,13 +121,13 @@ namespace Bloxstrap.UI.Elements.Dialogs switch (result) { case MessageBoxResult.OK: - return Bloxstrap.Resources.Strings.Common_OK; + return Strings.Common_OK; case MessageBoxResult.Cancel: - return Bloxstrap.Resources.Strings.Common_Cancel; + return Strings.Common_Cancel; case MessageBoxResult.Yes: - return Bloxstrap.Resources.Strings.Common_Yes; + return Strings.Common_Yes; case MessageBoxResult.No: - return Bloxstrap.Resources.Strings.Common_No; + return Strings.Common_No; default: Debug.Assert(false); return result.ToString(); diff --git a/Bloxstrap/UI/ViewModels/Installer/WelcomeViewModel.cs b/Bloxstrap/UI/ViewModels/Installer/WelcomeViewModel.cs index e6838ba..41190d8 100644 --- a/Bloxstrap/UI/ViewModels/Installer/WelcomeViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Installer/WelcomeViewModel.cs @@ -5,7 +5,7 @@ { // formatting is done here instead of in xaml, it's just a bit easier public string MainText => String.Format( - Resources.Strings.Installer_Welcome_MainText, + Strings.Installer_Welcome_MainText, "[github.com/pizzaboxer/bloxstrap](https://github.com/pizzaboxer/bloxstrap)", "[bloxstraplabs.com](https://bloxstraplabs.com)" ); diff --git a/Bloxstrap/UI/ViewModels/Settings/AppearanceViewModel.cs b/Bloxstrap/UI/ViewModels/Settings/AppearanceViewModel.cs index 60c6f1c..21ae1d3 100644 --- a/Bloxstrap/UI/ViewModels/Settings/AppearanceViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Settings/AppearanceViewModel.cs @@ -23,9 +23,9 @@ namespace Bloxstrap.UI.ViewModels.Settings IBootstrapperDialog dialog = App.Settings.Prop.BootstrapperStyle.GetNew(); if (App.Settings.Prop.BootstrapperStyle == BootstrapperStyle.ByfronDialog) - dialog.Message = Resources.Strings.Bootstrapper_StylePreview_ImageCancel; + dialog.Message = Strings.Bootstrapper_StylePreview_ImageCancel; else - dialog.Message = Resources.Strings.Bootstrapper_StylePreview_TextCancel; + dialog.Message = Strings.Bootstrapper_StylePreview_TextCancel; dialog.CancelEnabled = true; dialog.ShowBootstrapper(); @@ -35,7 +35,7 @@ namespace Bloxstrap.UI.ViewModels.Settings { var dialog = new OpenFileDialog { - Filter = $"{Resources.Strings.Menu_IconFiles}|*.ico" + Filter = $"{Strings.Menu_IconFiles}|*.ico" }; if (dialog.ShowDialog() != true) diff --git a/Bloxstrap/UI/ViewModels/Settings/FastFlagEditorWarningViewModel.cs b/Bloxstrap/UI/ViewModels/Settings/FastFlagEditorWarningViewModel.cs index 8519549..c335d35 100644 --- a/Bloxstrap/UI/ViewModels/Settings/FastFlagEditorWarningViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Settings/FastFlagEditorWarningViewModel.cs @@ -31,13 +31,13 @@ namespace Bloxstrap.UI.ViewModels.Settings { for (int i = 10; i > 0; i--) { - ContinueButtonText = $"({i}) {Resources.Strings.Menu_FastFlagEditor_Warning_Continue}"; + ContinueButtonText = $"({i}) {Strings.Menu_FastFlagEditor_Warning_Continue}"; OnPropertyChanged(nameof(ContinueButtonText)); await Task.Delay(1000); } - ContinueButtonText = Resources.Strings.Menu_FastFlagEditor_Warning_Continue; + ContinueButtonText = Strings.Menu_FastFlagEditor_Warning_Continue; OnPropertyChanged(nameof(ContinueButtonText)); CanContinue = true; diff --git a/Bloxstrap/UI/ViewModels/Settings/IntegrationsViewModel.cs b/Bloxstrap/UI/ViewModels/Settings/IntegrationsViewModel.cs index 78b000e..3ea1352 100644 --- a/Bloxstrap/UI/ViewModels/Settings/IntegrationsViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Settings/IntegrationsViewModel.cs @@ -19,7 +19,7 @@ namespace Bloxstrap.UI.ViewModels.Settings { CustomIntegrations.Add(new CustomIntegration() { - Name = Resources.Strings.Menu_Integrations_Custom_NewIntegration + Name = Strings.Menu_Integrations_Custom_NewIntegration }); SelectedCustomIntegrationIndex = CustomIntegrations.Count - 1;