Index: Application/Application.Ringtoets/App.xaml.cs =================================================================== diff -u -r78a113ae4b3a1cd879ff171bed5e5562bf13a62e -rc12ff7f28c27dd40613a002c2053f6457f40854a --- Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 78a113ae4b3a1cd879ff171bed5e5562bf13a62e) +++ Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision c12ff7f28c27dd40613a002c2053f6457f40854a) @@ -2,15 +2,13 @@ using System.Collections.Generic; using System.Configuration; using System.Diagnostics; -using System.Globalization; using System.IO; using System.Linq; using System.Reflection; using System.Threading; using System.Windows; using System.Windows.Controls.Primitives; using System.Windows.Forms; -using System.Windows.Markup; using Core.Common.Base; using Core.Common.Base.Workflow; using Core.Common.Controls.Swf; @@ -61,11 +59,6 @@ { RingtoetsApplication.SetLanguageAndRegionalSettions(Settings.Default); - FrameworkElement.LanguageProperty.OverrideMetadata( - typeof(FrameworkElement), - new FrameworkPropertyMetadata( - XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag))); - log.Info(Core.Common.Gui.Properties.Resources.App_App_Starting_Ringtoets____); } Index: Core/Common/src/Core.Common.Base/RingtoetsApplication.cs =================================================================== diff -u -r399729e0e6586b50d1b3987d3e28322c35901698 -rc12ff7f28c27dd40613a002c2053f6457f40854a --- Core/Common/src/Core.Common.Base/RingtoetsApplication.cs (.../RingtoetsApplication.cs) (revision 399729e0e6586b50d1b3987d3e28322c35901698) +++ Core/Common/src/Core.Common.Base/RingtoetsApplication.cs (.../RingtoetsApplication.cs) (revision c12ff7f28c27dd40613a002c2053f6457f40854a) @@ -202,8 +202,6 @@ // load all assemblies from current assembly directory AssemblyUtils.LoadAllAssembliesFromDirectory(Path.GetFullPath(Path.GetDirectoryName(GetType().Assembly.Location))).ToList(); - SetLanguageAndRegionalSettions(); - //Disabled trace logging this causes focus bugs combined with avalon dock (KeyPreview debug messages) //InitializeLogging(); Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs =================================================================== diff -u -r12b208bce52521e35c10a94241698529f1594b6f -rc12ff7f28c27dd40613a002c2053f6457f40854a --- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 12b208bce52521e35c10a94241698529f1594b6f) +++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision c12ff7f28c27dd40613a002c2053f6457f40854a) @@ -86,8 +86,6 @@ public MainWindow(RingtoetsGui gui) { - RingtoetsApplication.SetLanguageAndRegionalSettions(Properties.Settings.Default); - Gui = gui; InitializeComponent();