Changes Language zh-Pro

App.xaml

@@ -20,6 +20,7 @@
                 <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
                 <!-- <ResourceDictionary Source="pack://application:,,,/HandyControl;component/themes/skindark.xaml"/> -->
                 <ResourceDictionary Source="/Language/en_US.xaml"/>
+                <ResourceDictionary Source="/Language/zh_Pro.xaml"/>
                 <ResourceDictionary Source="/Language/zh_CN.xaml"/>
             </ResourceDictionary.MergedDictionaries>
             <ResourceDictionary x:Key="zh-cn" Source="/Language/zh_CN.xaml"/>

Language/zh_Pro.xaml

@@ -10,7 +10,7 @@
     <sys:String x:Key="ConfigFan">SETTING</sys:String>
     <sys:String x:Key="Help">帮助</sys:String>
     <sys:String x:Key="HelpFan">HELP</sys:String>
-    <sys:String x:Key="NameType">NAME</sys:String>
+    <sys:String x:Key="NameType">EN_NAME</sys:String>
     
     <sys:String x:Key="DiamondSelect">钻石选择</sys:String>
     <sys:String x:Key="DetectionResult">检测结果</sys:String>

Model/Helper/MultilingualHelper.cs

@@ -41,6 +41,12 @@ public class MultilingualHelper
     public static void setLanguage(string language)
     {
         LoadResources(language);
+        if ("zh-pro".Equals(language))
+        {
+            ConfigHelper.Instance.SetLang("zn-ch");
+            return;
+        }
+
         ConfigHelper.Instance.SetLang(language);
     }
     

ViewModel/Configuration/SettingBaseVM.cs

@@ -27,7 +27,7 @@ public class SettingBaseVM : BaseViewModel
         catch (Exception ex)
         {
             new MessageBox().Show($"{MultilingualHelper.getString("ApplicationError")}{ex.Message}");
-            Logger.Error($"ȫ<EFBFBD><EFBFBD><EFBFBD>쳣<EFBFBD><EFBFBD><EFBFBD><EFBFBD>{ex.Message}", ex);
+            Logger.Error($"全局异常捕获：{ex.Message}", ex);
         }
     }
 
@@ -45,7 +45,7 @@ public class SettingBaseVM : BaseViewModel
         catch (Exception ex)
         {
             new MessageBox().Show($"{MultilingualHelper.getString("ApplicationError")}{ex.Message}");
-            Logger.Error($"ȫ<EFBFBD><EFBFBD><EFBFBD>쳣<EFBFBD><EFBFBD><EFBFBD><EFBFBD>{ex.Message}", ex);
+            Logger.Error($"全局异常捕获：{ex.Message}", ex);
         }
     }
 }

ViewModel/Grading/GradingResultVM.cs

@@ -2904,7 +2904,8 @@ public class Name
     {
         string sql = $"SELECT NAME, EN_NAME FROM NAME WHERE ID = '{id}'";
         DataTable data = DataBaseHelper.ExecuteQuery(sql);
-        string nameType = MultilingualHelper.getString("NameType");
+        var now = MultilingualHelper.getLangType();
+        string nameType = "zn-ch".Equals(now)?"NAME":MultilingualHelper.getString("NameType");
         if (data.Rows.Count>0)
         {
             return data.Rows[0][nameType].ToString();