From 04dccc8ba956bb617df6fe33d4157c062f6a7243 Mon Sep 17 00:00:00 2001
From: ABA2396 <2396806385@qq.com>
Date: Mon, 25 Jul 2022 16:00:13 +0800
Subject: [PATCH] feat: FightSettingsUserContral module translation

---
 .../Resources/Localizations/en-us.xaml        | 15 +++++++++++++
 .../Resources/Localizations/zh-cn.xaml        | 15 +++++++++++++
 .../UserControl/FightSettingsUserControl.xaml | 21 ++++++++-----------
 .../InfrastSettingsUserControl.xaml           |  2 +-
 src/MeoAsstGui/Views/TaskQueueView.xaml       |  2 +-
 5 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
index f91ebfaec2..d3bd935042 100644
--- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
@@ -10,7 +10,11 @@
     <system:String x:Key="ManualRestart">Later</system:String>
     <system:String x:Key="Tip">Tip</system:String>
     <system:String x:Key="AboutUs">About us</system:String>
+
+    <system:String x:Key="LabelSequenceTip">The label sequence can be dragged</system:String>
     <!--Settings-->
+
+    <!--Farming-->
     <system:String x:Key="Farming">Farming</system:String>
 
     <system:String x:Key="WakeUp">Wake Up</system:String>
@@ -37,4 +41,15 @@
 
     <system:String x:Key="LinkStart">Link Start!</system:String>
     <system:String x:Key="Stop">Stop</system:String>
+
+    <!--FightSettings-->
+    <system:String x:Key="UseSanityPotion">Use Sanity Potion</system:String>
+    <system:String x:Key="UseOriginitePrime">Use Originite Prime*</system:String>
+    <system:String x:Key="PerformBattles">Perform Battles*</system:String>
+    <system:String x:Key="AssignedMaterial">Material</system:String>
+    <system:String x:Key="Quantity">quantity</system:String>
+    <system:String x:Key="StageSelect">Stage</system:String>
+    <system:String x:Key="Amend">Amend</system:String>
+    <!--FightSettings-->
+    <!--Farming-->
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
index 1a9666cb08..3d77c58f40 100644
--- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
@@ -10,7 +10,11 @@
     <system:String x:Key="ManualRestart">稍后</system:String>
     <system:String x:Key="Tip">提示</system:String>
     <system:String x:Key="AboutUs">关于我们</system:String>
+
+    <system:String x:Key="LabelSequenceTip">标签顺序可拖动</system:String>
     <!--设置-->
+
+    <!--一键长草-->
     <system:String x:Key="Farming">一键长草</system:String>
 
     <system:String x:Key="WakeUp">开始唤醒</system:String>
@@ -37,4 +41,15 @@
 
     <system:String x:Key="LinkStart">开始长草！</system:String>
     <system:String x:Key="Stop">停止</system:String>
+
+    <!--战斗设置-->
+    <system:String x:Key="UseSanityPotion">吃理智药</system:String>
+    <system:String x:Key="UseOriginitePrime">吃源石*</system:String>
+    <system:String x:Key="PerformBattles">指定次数*</system:String>
+    <system:String x:Key="AssignedMaterial">指定材料</system:String>
+    <system:String x:Key="Quantity">掉落数量</system:String>
+    <system:String x:Key="StageSelect">关卡选择</system:String>
+    <system:String x:Key="Amend">修改</system:String>
+    <!--战斗设置-->
+    <!--一键长草-->
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml
index 3015a6279e..9800973c7f 100644
--- a/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml
+++ b/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml
@@ -22,33 +22,30 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" Grid.Row="0" VerticalAlignment="Center">
-            <CheckBox IsChecked="{Binding UseMedicine}" Content="吃理智药" Margin="10" />
+            <CheckBox IsChecked="{Binding UseMedicine}" Content="{DynamicResource UseSanityPotion}" Margin="10" />
             <hc:TextBox Text="{Binding MedicineNumber}" TextWrapping="Wrap" Margin="10"
                      Width="50" InputMethod.IsInputMethodEnabled="False" 
                      TextType="Int"/>
-            <TextBlock Style="{StaticResource TextBlockDefault}" Text="个" />
             <!--<TextBlock Style="{StaticResource TextBlockDefaultBold}" Text="{Binding MedicineInfo}" Margin="30, 0, 0, 0" VerticalAlignment="Center" />-->
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" Grid.Row="1" VerticalAlignment="Center">
-            <CheckBox IsChecked="{Binding UseStone}" Content="吃源石*" Margin="10 10 16.5 10" 
+            <CheckBox IsChecked="{Binding UseStone}" Content="{DynamicResource UseOriginitePrime}" Margin="10 10 16.5 10" 
                       ToolTip="该选项设置重启后不保存"/>
             <hc:TextBox Text="{Binding StoneNumber}" TextWrapping="Wrap" Margin="10"
                         Width="50" InputMethod.IsInputMethodEnabled="False" 
                         TextType="Int"/>
-            <TextBlock Style="{StaticResource TextBlockDefault}" Text="颗" />
             <!--<TextBlock Style="{StaticResource TextBlockDefaultBold}" Text="{Binding StoneInfo}" Margin="30, 0, 0, 0" VerticalAlignment="Center" />-->
         </StackPanel>
         <StackPanel Orientation="Horizontal" Grid.Row="2" VerticalAlignment="Center">
-            <CheckBox IsChecked="{Binding HasTimesLimited}" Content="指定次数*" Margin="10 10 4.5 10"
+            <CheckBox IsChecked="{Binding HasTimesLimited}" Content="{DynamicResource PerformBattles}" Margin="10 10 4.5 10"
                       ToolTip="该选项设置重启后不保存"/>
             <hc:TextBox Text="{Binding MaxTimes}" TextWrapping="Wrap" Margin="10"
                         Width="50" InputMethod.IsInputMethodEnabled="False" 
                         TextType="Int"/>
-            <TextBlock Style="{StaticResource TextBlockDefault}" Text="次" />
         </StackPanel>
         <StackPanel Orientation="Horizontal" Grid.Row="3" VerticalAlignment="Center">
-            <CheckBox IsChecked="{Binding IsSpecifiedDrops}" Content="指定材料" Margin="10"
+            <CheckBox IsChecked="{Binding IsSpecifiedDrops}" Content="{DynamicResource AssignedMaterial}" Margin="10"
                       ToolTip="该选项不会自动导航至对应关卡"/>
             <ComboBox Width="120" Margin="10"
                       IsEditable="True"
@@ -61,15 +58,15 @@
                       SelectedValue="{Binding DropsItemId}" />
         </StackPanel>
         <StackPanel Orientation="Horizontal" Grid.Row="4" VerticalAlignment="Center">
-            <!--<TextBlock Style="{StaticResource TextBlockDefault}" Margin="35,10,0,10" Text="掉落数 " />-->
+            <TextBlock Style="{StaticResource TextBlockDefault}" Margin="32,10,0,10" Text="{DynamicResource Quantity}" />
             <hc:TextBox Text="{Binding DropsQuantity}" TextWrapping="Wrap"
-                        Width="95" Margin="100,10,10,10" InputMethod.IsInputMethodEnabled="False" 
+                        Width="95" Margin="20,10,0,10" 
+                        InputMethod.IsInputMethodEnabled="False" 
                         TextType="Int"/>
-            <TextBlock Style="{StaticResource TextBlockDefault}" Text="个" />
         </StackPanel>
         <StackPanel Grid.Row="5"  Orientation="Horizontal">
             <TextBlock Style="{StaticResource TextBlockDefault}" Margin="20,10,0,10" VerticalAlignment="Center"
-                   Text="关卡选择" FontSize="14" />
+                   Text="{DynamicResource StageSelect}" TextWrapping="Wrap" FontSize="14" />
             <ComboBox Width="120" Margin="24,10,10,10"
                       IsHitTestVisible ="{c:Binding !FightTaskRunning}"
                       ItemsSource="{Binding StageList}"
@@ -77,6 +74,6 @@
                       SelectedValuePath="Value"
                       SelectedValue="{Binding Stage}" />
         </StackPanel>
-        <Button Grid.Row="6" Command="{s:Action SetParams}" Visibility="{c:Binding !Idle}" HorizontalAlignment="Left" Content="修改" Width="50" Height="30" Margin="166,10,10,10" />
+        <Button Grid.Row="6" Command="{s:Action SetParams}" Visibility="{c:Binding !Idle}" HorizontalAlignment="Center" Content="{DynamicResource Amend}" Width="80" Margin="150,10,0,40" FontSize="10" />
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/src/MeoAsstGui/UserControl/InfrastSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/InfrastSettingsUserControl.xaml
index ae12536d2a..b46d7d4e95 100644
--- a/src/MeoAsstGui/UserControl/InfrastSettingsUserControl.xaml
+++ b/src/MeoAsstGui/UserControl/InfrastSettingsUserControl.xaml
@@ -16,7 +16,7 @@
         </Grid.ColumnDefinitions>
         <ListBox Width="200" Grid.Column="0" Margin="10"
                   dd:DragDrop.IsDragSource="True" dd:DragDrop.IsDropTarget="True"
-                  ItemsSource="{Binding Path=InfrastItemViewModels}" ToolTip="标签顺序可拖动">
+                  ItemsSource="{Binding Path=InfrastItemViewModels}" ToolTip="{DynamicResource LabelSequenceTip}">
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Orientation="Horizontal">
diff --git a/src/MeoAsstGui/Views/TaskQueueView.xaml b/src/MeoAsstGui/Views/TaskQueueView.xaml
index b5b15e404d..41d752179a 100644
--- a/src/MeoAsstGui/Views/TaskQueueView.xaml
+++ b/src/MeoAsstGui/Views/TaskQueueView.xaml
@@ -38,7 +38,7 @@
                     </Grid.ColumnDefinitions>
                     <ListBox x:Name="TaskList" Grid.Row="0" Grid.ColumnSpan="2" Width="200" Margin="0,10,0,0" HorizontalAlignment="Center"
                  dd:DragDrop.IsDragSource="{Binding Idle}" dd:DragDrop.IsDropTarget="{Binding Idle}"
-                  ItemsSource="{Binding Path=TaskItemViewModels}" BorderThickness="0" ToolTip="标签顺序可拖动">
+                  ItemsSource="{Binding Path=TaskItemViewModels}" BorderThickness="0" ToolTip="{DynamicResource LabelSequenceTip}">
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">