From 66d9f3b81a7ca5ceb050d7ff71a0ec096a62c10f Mon Sep 17 00:00:00 2001
From: next-autumn <next-autumn@google.com>
Date: Mon, 26 Apr 2021 10:43:50 +0800
Subject: [PATCH] multi language

---
 ProxySU_Core/Resources/Languages/en.xaml    | 18 ++++++++++++
 ProxySU_Core/Resources/Languages/zh_cn.xaml | 17 ++++++++++-
 ProxySU_Core/Views/MainWindow.xaml          | 31 ++++++++++-----------
 3 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/ProxySU_Core/Resources/Languages/en.xaml b/ProxySU_Core/Resources/Languages/en.xaml
index 5058372..3e36922 100644
--- a/ProxySU_Core/Resources/Languages/en.xaml
+++ b/ProxySU_Core/Resources/Languages/en.xaml
@@ -7,6 +7,23 @@
     <sys:String x:Key="LanguageEnglish">English</sys:String>
     <sys:String x:Key="Hosts">Hosts</sys:String>
     <sys:String x:Key="AddHost">Add Host</sys:String>
+    <sys:String x:Key="ViewConfig">Configuration</sys:String>
+    <sys:String x:Key="ViewSub">Subscription</sys:String>
+
+
+    <!--table-->
+    <sys:String x:Key="MainTableSelection">Selection</sys:String>
+    <sys:String x:Key="MainTableRemark">Remark</sys:String>
+    <sys:String x:Key="MainTableHost">Host</sys:String>
+    <sys:String x:Key="MainTablePort">Port</sys:String>
+    <sys:String x:Key="MainTableProxy">Proxy</sys:String>
+    <sys:String x:Key="MainTableActions">Actions</sys:String>
+    <sys:String x:Key="MainTableControl">Cnsole</sys:String>
+    <sys:String x:Key="MainTableViewConfig">Config</sys:String>
+    <sys:String x:Key="MainTableEditor">Edit</sys:String>
+    <sys:String x:Key="MainTableDelete">Del</sys:String>
+
+
     <sys:String x:Key="Actions">Actions</sys:String>
     <sys:String x:Key="Connect">Connect</sys:String>
     <sys:String x:Key="Edit">Edit</sys:String>
@@ -18,6 +35,7 @@
     <sys:String x:Key="Warning">Warning</sys:String>
     <sys:String x:Key="Error">Error</sys:String>
 
+
     <!--Host Window-->
     <sys:String x:Key="HostWindowTitle">Server Manager</sys:String>
     <sys:String x:Key="ConnectionGroupName">Connection</sys:String>
diff --git a/ProxySU_Core/Resources/Languages/zh_cn.xaml b/ProxySU_Core/Resources/Languages/zh_cn.xaml
index 7031dfd..168e8ae 100644
--- a/ProxySU_Core/Resources/Languages/zh_cn.xaml
+++ b/ProxySU_Core/Resources/Languages/zh_cn.xaml
@@ -7,7 +7,21 @@
     <sys:String x:Key="LanguageEnglish">英文</sys:String>
     <sys:String x:Key="Hosts">主机列表</sys:String>
     <sys:String x:Key="AddHost">添加主机</sys:String>
-    <sys:String x:Key="Actions">操作</sys:String>
+    <sys:String x:Key="ViewConfig">导出配置</sys:String>
+    <sys:String x:Key="ViewSub">导出订阅</sys:String>
+    
+    <!--table-->
+    <sys:String x:Key="MainTableSelection">选择</sys:String>
+    <sys:String x:Key="MainTableRemark">别名</sys:String>
+    <sys:String x:Key="MainTableHost">主机</sys:String>
+    <sys:String x:Key="MainTablePort">端口</sys:String>
+    <sys:String x:Key="MainTableProxy">代理</sys:String>
+    <sys:String x:Key="MainTableActions">操作</sys:String>
+    <sys:String x:Key="MainTableControl">控制台</sys:String>
+    <sys:String x:Key="MainTableViewConfig">查看配置</sys:String>
+    <sys:String x:Key="MainTableEditor">编辑</sys:String>
+    <sys:String x:Key="MainTableDelete">删除</sys:String>
+    
     <sys:String x:Key="Connect">连接</sys:String>
     <sys:String x:Key="Install">安装</sys:String>
     <sys:String x:Key="Edit">编辑</sys:String>
@@ -18,6 +32,7 @@
     <sys:String x:Key="Warning">提示</sys:String>
     <sys:String x:Key="Error">错误</sys:String>
 
+
     <!--Host Window-->
     <sys:String x:Key="HostWindowTitle">服务器管理</sys:String>
     <sys:String x:Key="ConnectionGroupName">连接</sys:String>
diff --git a/ProxySU_Core/Views/MainWindow.xaml b/ProxySU_Core/Views/MainWindow.xaml
index dab8d11..c8d2c11 100644
--- a/ProxySU_Core/Views/MainWindow.xaml
+++ b/ProxySU_Core/Views/MainWindow.xaml
@@ -25,8 +25,7 @@
                 <TextBlock Text="{DynamicResource LanguageText}" VerticalAlignment="Center" Margin="0,0,20,0" />
                 <ComboBox 
                     SelectionChanged="ChangeLanguage" 
-                    x:Name="cmbLanguage" 
-                    IsEnabled="False"
+                    x:Name="cmbLanguage"
                     SelectedIndex="0">
                     <ComboBoxItem x:Name="zh_cn" Content="{DynamicResource LanguageChinese}"></ComboBoxItem>
                     <ComboBoxItem x:Name="en" Content="{DynamicResource LanguageEnglish}"></ComboBoxItem>
@@ -59,19 +58,19 @@
                         <Button
                             Content="{DynamicResource AddHost}"
                             Click="AddHost"
-                            Width="100"/>
+                            Width="140"/>
 
                         <Button
                             Margin="10,0,0,0"
-                            Content="导出配置"
+                            Content="{DynamicResource ViewConfig}"
                             Click="ExportXraySettings"
-                            Width="100" />
+                            Width="140" />
 
                         <Button
                             Margin="10,0,0,0"
-                            Content="导出订阅"
+                            Content="{DynamicResource ViewSub}"
                             Click="ExportXraySub"
-                            Width="100" />
+                            Width="140" />
                     </StackPanel>
 
                     <DataGrid ItemsSource="{Binding Records}"
@@ -90,20 +89,20 @@
                               Width="1000"
                               AutoGenerateColumns="False">
                         <DataGrid.Columns>
-                            <DataGridCheckBoxColumn Header="选择"
+                            <DataGridCheckBoxColumn Header="{DynamicResource MainTableSelection}"
                                                     Binding="{Binding Path=IsChecked, UpdateSourceTrigger=PropertyChanged}"
                                                     IsReadOnly="False"
                                                     Width="80"/>
-                            <DataGridTextColumn Header="{DynamicResource HostTag}"  
+                            <DataGridTextColumn Header="{DynamicResource MainTableRemark}"  
                                                 Binding="{Binding Path=Host.Tag}" 
                                                 Width="180"/>
-                            <DataGridTextColumn Header="{DynamicResource HostAddress}"  
+                            <DataGridTextColumn Header="{DynamicResource MainTableHost}"  
                                                 Binding="{Binding Path=Host.Address}"
                                                 Width="180"/>
-                            <DataGridTextColumn Header="{DynamicResource HostPort}"  
+                            <DataGridTextColumn Header="{DynamicResource MainTablePort}"  
                                                 Binding="{Binding Path=Host.Port}" 
                                                 Width="100"/>
-                            <DataGridTextColumn Header="{DynamicResource ProxyGroupName}" 
+                            <DataGridTextColumn Header="{DynamicResource MainTableProxy}" 
                                                 Binding="{Binding Path=Host.Proxy.Type}"
                                                 Width="100"/>
                             <DataGridTemplateColumn>
@@ -113,10 +112,10 @@
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
                                         <StackPanel Orientation="Horizontal">
-                                            <Button Content="控制台" FontSize="12" Height="24" Click="Connect" />
-                                            <Button Content="查看配置" FontSize="12" Height="24" Margin="10,0,0,0" Click="ShowClientInfo" />
-                                            <Button Content="编辑" FontSize="12" Height="24" Margin="10,0,0,0" Click="EditHost" />
-                                            <Button Content="删除" FontSize="12"  Height="24" Margin="10,0,0,0" Click="DeleteHost" BorderBrush="IndianRed" Background="IndianRed" />
+                                            <Button Content="{DynamicResource MainTableControl}" FontSize="12" Height="24" Click="Connect" />
+                                            <Button Content="{DynamicResource MainTableViewConfig}" FontSize="12" Height="24" Margin="10,0,0,0" Click="ShowClientInfo" />
+                                            <Button Content="{DynamicResource MainTableEditor}" FontSize="12" Height="24" Margin="10,0,0,0" Click="EditHost" />
+                                            <Button Content="{DynamicResource MainTableDelete}" FontSize="12"  Height="24" Margin="10,0,0,0" Click="DeleteHost" BorderBrush="IndianRed" Background="IndianRed" />
                                         </StackPanel>
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>