diff --git a/App.xaml b/App.xaml index c9d0ad7..aa7114c 100644 --- a/App.xaml +++ b/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"/> diff --git a/Language/zh_Pro.xaml b/Language/zh_Pro.xaml index a31aeb3..d4178d7 100644 --- a/Language/zh_Pro.xaml +++ b/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> diff --git a/Model/Helper/MultilingualHelper.cs b/Model/Helper/MultilingualHelper.cs index 4c9c681..5ccb052 100644 --- a/Model/Helper/MultilingualHelper.cs +++ b/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); } diff --git a/ViewModel/Configuration/SettingBaseVM.cs b/ViewModel/Configuration/SettingBaseVM.cs index 355afdd..47ed081 100644 --- a/ViewModel/Configuration/SettingBaseVM.cs +++ b/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($"ȫ���쳣����{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($"ȫ���쳣����{ex.Message}", ex); + Logger.Error($"全局异常捕获:{ex.Message}", ex); } } } \ No newline at end of file diff --git a/ViewModel/Grading/GradingResultVM.cs b/ViewModel/Grading/GradingResultVM.cs index 5e6c27b..caa018b 100644 --- a/ViewModel/Grading/GradingResultVM.cs +++ b/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();