Fix bad string resources

iNKORE-NET · Aug 31, 2024 · 97c4cad · 97c4cad
1 parent def9b1c
commit 97c4cad
Show file tree

Hide file tree

Showing 16 changed files with 93 additions and 19 deletions.
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Common/ControlStrings.cs b/source/iNKORE.UI.WPF.Modern.Controls/Common/ControlStrings.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace iNKORE.UI.WPF.Modern.Common
+{
+ internal class ControlStrings : ResourceAccessor
+ {
+ public ControlStrings(Type controlType, ModernControlCategory category) : base(GetControlBaseName(controlType, category), GetControlAssembly(controlType))
+ {
+
+ }
+
+
+ internal static string GetControlBaseName(Type controlType, ModernControlCategory category)
+ {
+ var root = controlType.Assembly.GetName().Name;
+
+ root = root + "." + category.ToString() + "." + controlType.Name;
+ root = root + "." + "Strings.Resources";
+
+ return root;
+ }
+
+ internal static Assembly GetControlAssembly(Type controlType)
+ {
+ return controlType.Assembly;
+ }
+ }
+
+ internal enum ModernControlCategory
+ {
+ Windows,
+ Community,
+ Extended
+ }
+
+}
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/InfoBar/InfoBar.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/InfoBar/InfoBar.cs
@@ -35,7 +35,7 @@ public partial class InfoBar : Control, IControlProtected
  private const string c_iconTextBlockName ="StandardIcon";
  private const string c_contentRootName = "ContentRoot";
 
- private static readonly ResourceAccessor ResourceAccessor = new ResourceAccessor(typeof(InfoBar));
+ private static readonly ControlStrings ResourceAccessor = new ControlStrings(typeof(InfoBar), ModernControlCategory.Windows);
 
  static InfoBar()
  {

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/NavigationView/NavigationView.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/NavigationView/NavigationView.cs
@@ -113,7 +113,7 @@ public partial class NavigationView : ContentControl, IControlProtected
 
  static readonly Size c_infSize = new Size(double.PositiveInfinity, double.PositiveInfinity);
 
- private static readonly ResourceAccessor ResourceAccessor = new ResourceAccessor(typeof(NavigationView));
+ internal static readonly ControlStrings ResourceAccessor = new ControlStrings(typeof(NavigationView), ModernControlCategory.Windows);
 
  /*
  ~NavigationView()

diff --git a/...I.WPF.Modern.Controls/Controls/Windows/NavigationView/NavigationViewItemAutomationPeer.cs b/...I.WPF.Modern.Controls/Controls/Windows/NavigationView/NavigationViewItemAutomationPeer.cs
@@ -17,7 +17,7 @@ public class NavigationViewItemAutomationPeer :
  ISelectionItemProvider,
  IExpandCollapseProvider
  {
- private static readonly ResourceAccessor ResourceAccessor = new ResourceAccessor(typeof(NavigationView));
+ private static  ControlStrings ResourceAccessor => NavigationView.ResourceAccessor;
 
  public NavigationViewItemAutomationPeer(NavigationViewItem owner) :
  base(owner)

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/NumberBox/NumberBox.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/NumberBox/NumberBox.cs
@@ -48,7 +48,7 @@ public partial class NumberBox : Control
  const double c_popupShadowDepth = 16.0;
  const string c_numberBoxPopupShadowDepthName = "NumberBoxPopupShadowDepth";
 
- private static readonly ResourceAccessor ResourceAccessor = new ResourceAccessor(typeof(NumberBox));
+ private static readonly ControlStrings ResourceAccessor = new ControlStrings(typeof(NumberBox), ModernControlCategory.Windows);
 
  static NumberBox()
  {

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/PersonPicture/PersonPicture.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/PersonPicture/PersonPicture.cs
@@ -16,7 +16,7 @@ namespace iNKORE.UI.WPF.Modern.Controls
 {
  public partial class PersonPicture : Control
  {
- private static readonly ResourceAccessor ResourceAccessor = new ResourceAccessor(typeof(PersonPicture));
+ private static readonly ControlStrings ResourceAccessor = new ControlStrings(typeof(PersonPicture), ModernControlCategory.Windows);
 
  static PersonPicture()
  {

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/PipsPager/PipsPager.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/PipsPager/PipsPager.cs
@@ -57,7 +57,7 @@ public partial class PipsPager : Control, IControlProtected
  private const string c_pipsPagerButtonVerticalOrientationVisualState = "VerticalOrientation";
  private const string c_pipsPagerButtonHorizontalOrientationVisualState = "HorizontalOrientation";
 
- private static readonly ResourceAccessor ResourceAccessor = new ResourceAccessor(typeof(PipsPager));
+ private static readonly ControlStrings ResourceAccessor = new ControlStrings(typeof(PipsPager), ModernControlCategory.Windows);
 
  static PipsPager()
  {

diff --git a/...e/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/ProgressBar/ProgressBarAutomationPeer.cs b/...e/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/ProgressBar/ProgressBarAutomationPeer.cs
@@ -14,7 +14,7 @@ namespace iNKORE.UI.WPF.Modern.Automation.Peers
  /// </summary>
  public class ProgressBarAutomationPeer : RangeBaseAutomationPeer, IRangeValueProvider
  {
- private static readonly ResourceAccessor ResourceAccessor = new ResourceAccessor(typeof(ProgressBar));
+ private static readonly ControlStrings ResourceAccessor = new ControlStrings(typeof(ProgressBar), ModernControlCategory.Windows);
 
  /// <summary>
  /// Initializes a new instance of the ProgressBarAutomationPeer class.

diff --git a/...iNKORE.UI.WPF.Modern.Controls/Controls/Windows/ProgressRing/ProgressRingAutomationPeer.cs b/...iNKORE.UI.WPF.Modern.Controls/Controls/Windows/ProgressRing/ProgressRingAutomationPeer.cs
@@ -10,7 +10,7 @@ namespace iNKORE.UI.WPF.Modern.Automation.Peers
 {
  public class ProgressRingAutomationPeer : FrameworkElementAutomationPeer
  {
- private static readonly ResourceAccessor ResourceAccessor = new ResourceAccessor(typeof(ProgressRing));
+ private static readonly ControlStrings ResourceAccessor = new ControlStrings(typeof(ProgressRing), ModernControlCategory.Windows);
 
  public ProgressRingAutomationPeer(ProgressRing owner) : base(owner)
  {

diff --git a/...KORE.UI.WPF.Modern.Controls/Controls/Windows/RatingControl/RatingControlAutomationPeer.cs b/...KORE.UI.WPF.Modern.Controls/Controls/Windows/RatingControl/RatingControlAutomationPeer.cs
@@ -16,7 +16,7 @@ public class RatingControlAutomationPeer :
  IValueProvider,
  IRangeValueProvider
  {
- private static readonly ResourceAccessor ResourceAccessor = new ResourceAccessor(typeof(RatingControl));
+ private static readonly ControlStrings ResourceAccessor = new ControlStrings(typeof(RatingControl), ModernControlCategory.Windows);
 
  public RatingControlAutomationPeer(RatingControl owner)
  : base(owner)

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/SplitButton/SplitButton.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/SplitButton/SplitButton.cs
@@ -20,7 +20,7 @@ namespace iNKORE.UI.WPF.Modern.Controls
 {
  public class SplitButton : ContentControl, ICommandSource
  {
- private static readonly ResourceAccessor ResourceAccessor = new ResourceAccessor(typeof(SplitButton));
+ private static readonly ControlStrings ResourceAccessor = new ControlStrings(typeof(SplitButton), ModernControlCategory.Windows);
 
  static SplitButton()
  {

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/TeachingTip/TeachingTip.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/TeachingTip/TeachingTip.cs
@@ -36,7 +36,7 @@ public partial class TeachingTip : ContentControl, IControlProtected
 
  private const string c_OverlayCornerRadiusName = "OverlayCornerRadius";
 
- private static readonly ResourceAccessor ResourceAccessor = new ResourceAccessor(typeof(TeachingTip));
+ private static readonly ControlStrings ResourceAccessor = new ControlStrings(typeof(TeachingTip), ModernControlCategory.Windows);
 
  static TeachingTip()
  {

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/TimePicker/TimePicker.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/TimePicker/TimePicker.cs
@@ -40,7 +40,7 @@ public class TimePicker : TimePickerBase
  private Button _acceptButton;
  private Button _dismissButton;
 
- private static readonly ResourceAccessor ResourceAccessor = new ResourceAccessor(typeof(TimePicker));
+ private static readonly ControlStrings ResourceAccessor = new ControlStrings(typeof(TimePicker), ModernControlCategory.Windows);
 
  static TimePicker()
  {

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/iNKORE.UI.WPF.Modern.Controls.csproj b/source/iNKORE.UI.WPF.Modern.Controls/iNKORE.UI.WPF.Modern.Controls.csproj
@@ -63,6 +63,10 @@
  </None>
  </ItemGroup>
 
+ <ItemGroup>
+ <Folder Include="Resources\Strings\" />
+ </ItemGroup>
+
  <!--<Target Name="GetDocumentationFile">
  <ItemGroup>
  <BuildOutputInPackage Include="$(OutputPath)$(AssemblyName).xml" />

diff --git a/source/iNKORE.UI.WPF.Modern/Common/ResourceAccessor.cs b/source/iNKORE.UI.WPF.Modern/Common/ResourceAccessor.cs
@@ -1,5 +1,9 @@
 using System;
+using System.Reflection;
 using System.Resources;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Threading;
 
 namespace iNKORE.UI.WPF.Modern.Common
 {
@@ -172,25 +176,29 @@ internal class ResourceAccessor
 
  #endregion
 
- private readonly Type _controlType;
+ private readonly Type? _controlType;
+ private readonly string? _baseName;
+ private readonly Assembly? _assembly;
  private ResourceManager _resourceManager;
 
  public ResourceAccessor(Type controlType)
  {
  _controlType = controlType ?? throw new ArgumentNullException(nameof(controlType));
  }
 
+ public ResourceAccessor(string baseName, Assembly assembly)
+ {
+ _baseName = baseName;
+ _assembly = assembly;
+ }
+
  public string GetLocalizedStringResource(string resourceName)
  {
  try
  {
  if (_resourceManager is null)
  {
- var assembly = _controlType.Assembly;
- var assemblyName = assembly.GetName().Name;
- var controlName = _controlType.Name;
- var baseName = $"{assemblyName}.{controlName}.Strings.Resources";
- _resourceManager = new ResourceManager(baseName, assembly);
+ _resourceManager = CreateResourceManager();
  }
 
  return _resourceManager.GetString(resourceName);
@@ -200,5 +208,25 @@ public string GetLocalizedStringResource(string resourceName)
  return Strings.ResourceManager.GetString(resourceName) ?? resourceName;
  }
  }
+
+ private ResourceManager CreateResourceManager()
+ {
+ var baseName = _baseName;
+ var assembly = _assembly;
+
+ if (_controlType != null)
+ {
+ assembly = _controlType.Assembly;
+ var assemblyName = assembly.GetName().Name;
+
+ var controlName = _controlType.Name;
+ if (assemblyName != null)
+ {
+ baseName = $"{assemblyName}.{controlName}.Strings.Resources";
+ }
+ }
+
+ return new ResourceManager(baseName, assembly);
+ }
  }
 }
diff --git a/source/iNKORE.UI.WPF.Modern/iNKORE.UI.WPF.Modern.csproj b/source/iNKORE.UI.WPF.Modern/iNKORE.UI.WPF.Modern.csproj
@@ -12,7 +12,7 @@
  <AssemblyOriginatorKeyFile>..\..\assets\others\iNKORE.Pulic.snk</AssemblyOriginatorKeyFile>
  <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
  <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <NoWarn>$(NoWarn);CS1591;1701;1702;CA1416</NoWarn>
+ <NoWarn>$(NoWarn);CS1591;1701;1702;CA1416;CS8632</NoWarn>
  </PropertyGroup>
 
  <PropertyGroup>