From 8f5c496cc50cabd9a81f6bc391ee45a2b37aae49 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 28 Mar 2024 15:39:09 +0800
Subject: [PATCH] feat: add DatePicker & TimePicker support.

(cherry picked from commit 04ffd38e143eadbaa8657a5e241991f4c437c895)
---
 src/Semi.Avalonia/Controls/DatePicker.axaml | 6 +++---
 src/Semi.Avalonia/Controls/TimePicker.axaml | 6 ++++--
 src/Semi.Avalonia/Locale/en-us.axaml        | 7 +++++++
 src/Semi.Avalonia/Locale/zh-cn.axaml        | 7 +++++++
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml
index 7a3210a..a89bf1c 100644
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/DatePicker.axaml
@@ -171,7 +171,7 @@
                                         FontFamily="{TemplateBinding FontFamily}"
                                         FontSize="{TemplateBinding FontSize}"
                                         FontWeight="{TemplateBinding FontWeight}"
-                                        Text="day" />
+                                        Text="{DynamicResource STRING_DATEPICKER_DAY_TEXT}" />
                                     <TextBlock
                                         Name="PART_MonthTextBlock"
                                         Padding="12,4"
@@ -179,7 +179,7 @@
                                         FontFamily="{TemplateBinding FontFamily}"
                                         FontSize="{TemplateBinding FontSize}"
                                         FontWeight="{TemplateBinding FontWeight}"
-                                        Text="month"
+                                        Text="{DynamicResource STRING_DATEPICKER_MONTH_TEXT}"
                                         TextAlignment="Left" />
                                     <TextBlock
                                         Name="PART_YearTextBlock"
@@ -189,7 +189,7 @@
                                         FontFamily="{TemplateBinding FontFamily}"
                                         FontSize="{TemplateBinding FontSize}"
                                         FontWeight="{TemplateBinding FontWeight}"
-                                        Text="year" />
+                                        Text="{DynamicResource STRING_DATEPICKER_YEAR_TEXT}" />
                                     <Rectangle
                                         x:Name="PART_FirstSpacer"
                                         Grid.Column="1"
diff --git a/src/Semi.Avalonia/Controls/TimePicker.axaml b/src/Semi.Avalonia/Controls/TimePicker.axaml
index 3e34bd6..fe2539a 100644
--- a/src/Semi.Avalonia/Controls/TimePicker.axaml
+++ b/src/Semi.Avalonia/Controls/TimePicker.axaml
@@ -176,7 +176,8 @@
                                             VerticalAlignment="Center"
                                             FontFamily="{TemplateBinding FontFamily}"
                                             FontSize="{TemplateBinding FontSize}"
-                                            FontWeight="{TemplateBinding FontWeight}" />
+                                            FontWeight="{TemplateBinding FontWeight}"
+                                            Text="{DynamicResource STRING_TIMEPICKER_HOUR_TEXT}" />
                                     </Border>
 
                                     <Rectangle
@@ -199,7 +200,8 @@
                                             VerticalAlignment="Center"
                                             FontFamily="{TemplateBinding FontFamily}"
                                             FontSize="{TemplateBinding FontSize}"
-                                            FontWeight="{TemplateBinding FontWeight}" />
+                                            FontWeight="{TemplateBinding FontWeight}"
+                                            Text="{DynamicResource STRING_TIMEPICKER_MINUTE_TEXT}" />
                                     </Border>
 
                                     <Rectangle
diff --git a/src/Semi.Avalonia/Locale/en-us.axaml b/src/Semi.Avalonia/Locale/en-us.axaml
index a963085..e41759c 100644
--- a/src/Semi.Avalonia/Locale/en-us.axaml
+++ b/src/Semi.Avalonia/Locale/en-us.axaml
@@ -1,6 +1,13 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     x:Class="Semi.Avalonia.Locale.en_us"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- DatePicker -->
+    <x:String x:Key="STRING_DATEPICKER_DAY_TEXT">day</x:String>
+    <x:String x:Key="STRING_DATEPICKER_MONTH_TEXT">month</x:String>
+    <x:String x:Key="STRING_DATEPICKER_YEAR_TEXT">year</x:String>
+    <!-- TimePicker -->
+    <x:String x:Key="STRING_TIMEPICKER_HOUR_TEXT">hour</x:String>
+    <x:String x:Key="STRING_TIMEPICKER_MINUTE_TEXT">minute</x:String>
     <!-- TextBox/SelectableTextBox flyout -->
     <x:String x:Key="STRING_MENU_CUT">Cut</x:String>
     <x:String x:Key="STRING_MENU_COPY">Copy</x:String>
diff --git a/src/Semi.Avalonia/Locale/zh-cn.axaml b/src/Semi.Avalonia/Locale/zh-cn.axaml
index 6101cb5..e46fe54 100644
--- a/src/Semi.Avalonia/Locale/zh-cn.axaml
+++ b/src/Semi.Avalonia/Locale/zh-cn.axaml
@@ -1,6 +1,13 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     x:Class="Semi.Avalonia.Locale.zh_cn"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- DatePicker -->
+    <x:String x:Key="STRING_DATEPICKER_DAY_TEXT">日</x:String>
+    <x:String x:Key="STRING_DATEPICKER_MONTH_TEXT">月</x:String>
+    <x:String x:Key="STRING_DATEPICKER_YEAR_TEXT">年</x:String>
+    <!-- TimePicker -->
+    <x:String x:Key="STRING_TIMEPICKER_HOUR_TEXT">时</x:String>
+    <x:String x:Key="STRING_TIMEPICKER_MINUTE_TEXT">分</x:String>
     <!-- TextBox/SelectableTextBox flyout -->
     <x:String x:Key="STRING_MENU_CUT">剪切</x:String>
     <x:String x:Key="STRING_MENU_COPY">复制</x:String>