System for better management of enum names

eradicates all those redundant translations
pizzaboxer · Jul 4, 2024 · cc4c380 · cc4c380
1 parent f99978b
commit cc4c380
Show file tree

Hide file tree

Showing 20 changed files with 145 additions and 321 deletions.
diff --git a/Bloxstrap/App.xaml b/Bloxstrap/App.xaml
@@ -34,9 +34,9 @@
  </Setter>
  </Style>
 
- <converters:ResourceConverter x:Key="ResourceConverter" />
  <converters:StringFormatConverter x:Key="StringFormatConverter" />
  <converters:RangeConverter x:Key="RangeConverter" />
+ <converters:EnumNameConverter x:Key="EnumNameConverter" />
  </ResourceDictionary>
  </Application.Resources>
 </Application>
diff --git a/Bloxstrap/Enums/BootstrapperIcon.cs b/Bloxstrap/Enums/BootstrapperIcon.cs
@@ -2,14 +2,21 @@
 {
  public enum BootstrapperIcon
  {
+ [EnumName(StaticName = "Bloxstrap")]
  IconBloxstrap,
+ [EnumName(StaticName = "2008")]
  Icon2008,
+ [EnumName(StaticName = "2011")]
  Icon2011,
  IconEarly2015,
  IconLate2015,
+ [EnumName(StaticName = "2017")]
  Icon2017,
+ [EnumName(StaticName = "2019")]
  Icon2019,
+ [EnumName(StaticName = "2022")]
  Icon2022,
+ [EnumName(FromTranslation = "Common.Custom")]
  IconCustom
  }
 }
diff --git a/Bloxstrap/Enums/BootstrapperStyle.cs b/Bloxstrap/Enums/BootstrapperStyle.cs
@@ -8,6 +8,7 @@ public enum BootstrapperStyle
  ProgressDialog,
  ClassicFluentDialog,
  ByfronDialog,
+ [EnumName(StaticName = "Bloxstrap")]
  FluentDialog,
  FluentAeroDialog
  }

diff --git a/Bloxstrap/Enums/CursorType.cs b/Bloxstrap/Enums/CursorType.cs
@@ -2,6 +2,7 @@
 {
  public enum CursorType
  {
+ [EnumName(FromTranslation = "Common.Default")]
  Default,
  From2006,
  From2013

diff --git a/Bloxstrap/Enums/FlagPresets/InGameMenuVersion.cs b/Bloxstrap/Enums/FlagPresets/InGameMenuVersion.cs
@@ -2,6 +2,7 @@
 {
  public enum InGameMenuVersion
  {
+ [EnumName(FromTranslation = "Common.Default")]
  Default,
  V1,
  V2,

diff --git a/Bloxstrap/Enums/FlagPresets/MSAAMode.cs b/Bloxstrap/Enums/FlagPresets/MSAAMode.cs
@@ -2,9 +2,13 @@
 {
  public enum MSAAMode
  {
+ [EnumName(FromTranslation = "Common.Automatic")]
  Default,
+ [EnumName(StaticName = "1x")]
  x1,
+ [EnumName(StaticName = "2x")]
  x2,
+ [EnumName(StaticName = "4x")]
  x4
  }
 }
diff --git a/Bloxstrap/Enums/FlagPresets/MaterialVersion.cs b/Bloxstrap/Enums/FlagPresets/MaterialVersion.cs
diff --git a/Bloxstrap/Enums/FlagPresets/RenderingMode.cs b/Bloxstrap/Enums/FlagPresets/RenderingMode.cs
@@ -2,10 +2,11 @@
 {
  public enum RenderingMode
  {
+ [EnumName(FromTranslation = "Common.Automatic")]
  Default,
- Vulkan,
+ // Vulkan,
  D3D11,
  D3D10,
- OpenGL
+ // OpenGL
  }
 }
diff --git a/Bloxstrap/Enums/FlagPresets/TextureQuality.cs b/Bloxstrap/Enums/FlagPresets/TextureQuality.cs
@@ -2,6 +2,7 @@
 {
  public enum TextureQuality
  {
+ [EnumName(FromTranslation = "Common.Automatic")]
  Default,
  Level0,
  Level1,

diff --git a/Bloxstrap/Enums/Theme.cs b/Bloxstrap/Enums/Theme.cs
@@ -2,6 +2,7 @@
 {
  public enum Theme
  {
+ [EnumName(FromTranslation = "Common.SystemDefault")]
  Default,
  Light,
  Dark

diff --git a/Bloxstrap/Locale.cs b/Bloxstrap/Locale.cs
@@ -12,7 +12,7 @@ internal static class Locale
 
  public static readonly Dictionary<string, string> SupportedLocales = new()
  {
- { "nil", Strings.Enums_Theme_Default }, // /shrug
+ { "nil", Strings.Common_SystemDefault },
  { "en", "English" },
  { "en-US", "English (United States)" },
  { "ar", "العربية" },
@@ -55,13 +55,9 @@ internal static class Locale
 
  public static List<string> GetLanguages()
  {
- var languages = new List<string>()
- {
- Strings.Enums_Theme_Default,
- "English",
- "English (United States)"
- };
-
+ var languages = new List<string>();
+
+ languages.AddRange(SupportedLocales.Values.Take(3));
  languages.AddRange(SupportedLocales.Values.Where(x => !languages.Contains(x)).OrderBy(x => x));
 
  return languages;

diff --git a/Bloxstrap/Models/Attributes/EnumNameAttribute.cs b/Bloxstrap/Models/Attributes/EnumNameAttribute.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bloxstrap.Models.Attributes
+{
+ class EnumNameAttribute : Attribute
+ {
+ public string? StaticName { get; set; }
+ public string? FromTranslation { get; set; }
+ }
+}
diff --git a/Bloxstrap/Models/BootstrapperIconEntry.cs b/Bloxstrap/Models/BootstrapperIconEntry.cs
@@ -5,7 +5,6 @@ namespace Bloxstrap.Models
  public class BootstrapperIconEntry
  {
  public BootstrapperIcon IconType { get; set; }
- public string Name => IconType.ToString();
  public ImageSource ImageSource => IconType.GetIcon().GetImageSource();
  }
 }