Index: Application/Application.Ringtoets/App.xaml.cs =================================================================== diff -u -re3fe000640536463811a1051aedf6da711ee0f56 -ra5e7f5cca253bd8c38f75d3830c55fbfc9cc4bb6 --- Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision e3fe000640536463811a1051aedf6da711ee0f56) +++ Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision a5e7f5cca253bd8c38f75d3830c55fbfc9cc4bb6) @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Configuration; using System.Diagnostics; +using System.Globalization; using System.IO; using System.Linq; using System.Reflection; @@ -14,7 +15,6 @@ using Core.Common.Controls.Swf; using Core.Common.Gui; using Core.Common.Gui.Forms.MainWindow; -using Core.Common.Utils.Globalization; using Core.Plugins.CommonTools; using Core.Plugins.CommonTools.Gui; using Core.Plugins.ProjectExplorer; @@ -55,7 +55,7 @@ static App() { - SetLanguageAndRegionalSettings(); + SetLanguage(); log.Info(Core.Common.Gui.Properties.Resources.App_App_Starting_Ringtoets); } @@ -364,12 +364,26 @@ } } - private static void SetLanguageAndRegionalSettings() + private static void SetLanguage() { var language = ConfigurationManager.AppSettings["language"]; if (language != null) { - RegionalSettingsManager.Language = language; + var localMachineDateTimeFormat = (DateTimeFormatInfo) Thread.CurrentThread.CurrentCulture.DateTimeFormat.Clone(); + localMachineDateTimeFormat.DayNames = CultureInfo.InvariantCulture.DateTimeFormat.DayNames; + localMachineDateTimeFormat.MonthNames = CultureInfo.InvariantCulture.DateTimeFormat.MonthNames; + localMachineDateTimeFormat.AbbreviatedDayNames = CultureInfo.InvariantCulture.DateTimeFormat.AbbreviatedDayNames; + localMachineDateTimeFormat.AbbreviatedMonthGenitiveNames = CultureInfo.InvariantCulture.DateTimeFormat.AbbreviatedMonthGenitiveNames; + localMachineDateTimeFormat.AbbreviatedMonthNames = CultureInfo.InvariantCulture.DateTimeFormat.AbbreviatedMonthNames; + + var cultureInfo = new CultureInfo(language) + { + NumberFormat = Thread.CurrentThread.CurrentCulture.NumberFormat, + DateTimeFormat = localMachineDateTimeFormat + }; + + Thread.CurrentThread.CurrentUICulture = cultureInfo; + Thread.CurrentThread.CurrentCulture = cultureInfo; } } } Index: Core/Common/src/Core.Common.Utils/Globalization/RegionalSettingsManager.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -ra5e7f5cca253bd8c38f75d3830c55fbfc9cc4bb6 --- Core/Common/src/Core.Common.Utils/Globalization/RegionalSettingsManager.cs (.../RegionalSettingsManager.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Utils/Globalization/RegionalSettingsManager.cs (.../RegionalSettingsManager.cs) (revision a5e7f5cca253bd8c38f75d3830c55fbfc9cc4bb6) @@ -12,40 +12,11 @@ /// public static class RegionalSettingsManager { - public static event Action LanguageChanged; public static event Action FormatChanged; private static readonly CustomFormatProvider customFormatProvider = new CustomFormatProvider(); private static string realNumberFormat = "G5"; - /// - /// Language in the form of standard cultures "en-US", "ru-RU" ... - /// - public static string Language - { - set - { - var ci = new CultureInfo(value) - { - NumberFormat = Thread.CurrentThread.CurrentCulture.NumberFormat, - DateTimeFormat = CreateDateTimeFormatFromSystemSettingsWithoutNameLocalization(), - }; - - Thread.CurrentThread.CurrentUICulture = ci; - Thread.CurrentThread.CurrentCulture = ci; - - if (LanguageChanged != null) - { - LanguageChanged(); - } - } - - get - { - return Thread.CurrentThread.CurrentCulture.Name; - } - } - public static CultureInfo CurrentCulture { get Index: Core/Common/test/Core.Common.Utils.Test/Globalization/RegionalSettingsManagerTest.cs =================================================================== diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -ra5e7f5cca253bd8c38f75d3830c55fbfc9cc4bb6 --- Core/Common/test/Core.Common.Utils.Test/Globalization/RegionalSettingsManagerTest.cs (.../RegionalSettingsManagerTest.cs) (revision 41c77f9f36ae74a406fd382187426cc06d2b0200) +++ Core/Common/test/Core.Common.Utils.Test/Globalization/RegionalSettingsManagerTest.cs (.../RegionalSettingsManagerTest.cs) (revision a5e7f5cca253bd8c38f75d3830c55fbfc9cc4bb6) @@ -10,20 +10,6 @@ public class RegionalSettingsManagerTest { [Test] - public void ChangeLanguage() - { - var languageChangedCallCount = 0; - - RegionalSettingsManager.LanguageChanged += delegate { languageChangedCallCount++; }; - - RegionalSettingsManager.Language = "ru-RU"; - - Assert.AreEqual(1, languageChangedCallCount, "event is fired when language is changed"); - - Assert.AreEqual("ru-RU", RegionalSettingsManager.Language); - } - - [Test] public void SetRealNumberFormat() { var formatChangedCallCount = 0;