feat: Use newly added resources

jeromelaban · Dec 1, 2023 · 082bfaf · 082bfaf
1 parent c47e54f
commit 082bfaf
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 432 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/DatePicker/DatePicker.cs b/src/Uno.UI/UI/Xaml/Controls/DatePicker/DatePicker.cs
@@ -6,6 +6,7 @@
 using System.Collections.ObjectModel;
 using System.Text;
 using System.Threading.Tasks;
+using DirectUI;
 using Uno.Disposables;
 using Uno.UI.Helpers.WinUI;
 using Windows.ApplicationModel.Resources;
@@ -331,7 +332,7 @@ protected override void OnApplyTemplate()
 
 				string strAutomationName;
 				string strParentAutomationName;
-				// string strComboAutomationName;
+				string strComboAutomationName;
 
 				//Clean up existing parts
 				if (m_tpDayPicker != null)
@@ -448,8 +449,7 @@ protected override void OnApplyTemplate()
 					spHeaderAsInspectable = Header;
 					if (spHeaderAsInspectable != null)
 					{
-						// UNO TODO
-						// (FrameworkElement.GetStringFromObject(spHeaderAsInspectable, strParentAutomationName));
+						strParentAutomationName = FrameworkElement.GetStringFromObject(spHeaderAsInspectable);
 					}
 				}
 				// Hook up the selection changed events for selectors, we will be reacting to these events.
@@ -462,10 +462,9 @@ protected override void OnApplyTemplate()
 					strAutomationName = AutomationProperties.GetName(m_tpDayPicker);
 					if (strAutomationName == null)
 					{
-						// UNO TODO
-						//(DXamlCore.GetCurrentNoCreate().GetLocalizedResourceString(UIA_DATEPICKER_DAY, strAutomationName));
-						//strAutomationName += strParentAutomationName + strComboAutomationName;
-						//AutomationProperties.SetName(m_tpDayPicker as ComboBox, strComboAutomationName);
+						strAutomationName = DXamlCore.Current.GetLocalizedResourceString("UIA_DATEPICKER_DAY");
+						strComboAutomationName = strAutomationName + strParentAutomationName;
+						AutomationProperties.SetName(m_tpDayPicker as ComboBox, strComboAutomationName);
 					}
 				}
 				if (m_tpMonthPicker != null)
@@ -477,10 +476,9 @@ protected override void OnApplyTemplate()
 					strAutomationName = AutomationProperties.GetName(m_tpMonthPicker as ComboBox);
 					if (strAutomationName == null)
 					{
-						// UNO TODO
-						//(DXamlCore.GetCurrentNoCreate().GetLocalizedResourceString(UIA_DATEPICKER_MONTH, strAutomationName));
-						//strAutomationName += strParentAutomationName + strComboAutomationName;
-						//AutomationProperties.SetName(m_tpMonthPicker as ComboBox, strComboAutomationName));
+						strAutomationName = DXamlCore.Current.GetLocalizedResourceString("UIA_DATEPICKER_MONTH");
+						strComboAutomationName = strAutomationName + strParentAutomationName;
+						AutomationProperties.SetName(m_tpMonthPicker as ComboBox, strComboAutomationName);
 					}
 				}
 				if (m_tpYearPicker != null)
@@ -492,10 +490,9 @@ protected override void OnApplyTemplate()
 					strAutomationName = AutomationProperties.GetName(m_tpYearPicker as ComboBox);
 					if (strAutomationName == null)
 					{
-						// UNO TODO
-						//DXamlCore.GetCurrentNoCreate().GetLocalizedResourceString(UIA_DATEPICKER_YEAR, strAutomationName);
-						//strAutomationName += strParentAutomationName + strComboAutomationName;
-						//AutomationProperties.SetName(m_tpYearPicker as ComboBox, strComboAutomationName);
+						strAutomationName = DXamlCore.Current.GetLocalizedResourceString("UIA_DATEPICKER_YEAR");
+						strComboAutomationName = strAutomationName + strParentAutomationName;
+						AutomationProperties.SetName(m_tpYearPicker as ComboBox, strComboAutomationName);
 					}
 				}
 

diff --git a/src/Uno.UI/UI/Xaml/Controls/DatePicker/Strings/en-US/Resources.resw b/src/Uno.UI/UI/Xaml/Controls/DatePicker/Strings/en-US/Resources.resw