Merge pull request #190 from HandyOrg/pr/187

Pr/187
This commit is contained in:
NaBian authored and GitHub committed 2019-09-29 23:23:07 +08:00
commit 654752254a
2 files changed
+4 -2

No files matched your search

@@ -23,7 +23,7 @@
<PackageReference Include="CommonServiceLocator" Version="2.0.2" /> <PackageReference Include="CommonServiceLocator" Version="2.0.2" />
<PackageReference Include="MvvmLightLibs" Version="5.4.1.1" /> <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="System.Management" Version="4.6.0-rc1.19456.4" /> <PackageReference Include="System.Management" Version="4.6.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\..\Shared\HandyControlDemo_Shared\Data\MessageToken.cs"> <Compile Include="..\..\Shared\HandyControlDemo_Shared\Data\MessageToken.cs">
@@ -8,6 +8,7 @@ using System.Windows;
using System.Windows.Markup; using System.Windows.Markup;
using HandyControl.Controls; using HandyControl.Controls;
using HandyControl.Data; using HandyControl.Data;
using System.Threading;
namespace HandyControl.Tools namespace HandyControl.Tools
{ {
@@ -43,6 +44,7 @@ namespace HandyControl.Tools
public void SetLang(string lang) public void SetLang(string lang)
{ {
Application.Current.Dispatcher.Thread.CurrentUICulture = new CultureInfo(lang); Application.Current.Dispatcher.Thread.CurrentUICulture = new CultureInfo(lang);
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
Lang = XmlLanguage.GetLanguage(lang); Lang = XmlLanguage.GetLanguage(lang);
} }
@@ -66,4 +68,4 @@ namespace HandyControl.Tools
} }
#endif #endif
} }
} }