L10N: read config in advance

magicrub · Sep 16, 2015 · 9e0155f · 9e0155f
1 parent 75daff0
commit 9e0155f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/Controls/ConnectionControl.cs b/Controls/ConnectionControl.cs
@@ -7,13 +7,15 @@
 using System.Text;
 using System.Windows.Forms;
 using MissionPlanner.Comms;
+using System.Threading;
 
 namespace MissionPlanner.Controls
 {
     public partial class ConnectionControl : UserControl
     {
         public ConnectionControl()
         {
+            Thread.CurrentThread.CurrentUICulture = L10N.ConfigLang;
             InitializeComponent();
             this.linkLabel1.Click += (sender, e) =>
                                          {

diff --git a/L10N.cs b/L10N.cs
@@ -9,9 +9,17 @@
 
 namespace MissionPlanner
 {
-    public static class L10N
+    public class L10N
     {
-        public static CultureInfo ConfigLang = GetConfigLang();
+        public static CultureInfo ConfigLang;
+
+        static L10N()
+        {
+            MainV2.xmlconfig(false);
+            ConfigLang = GetConfigLang();
+            Strings.Culture = ConfigLang;
+            //In .NET 4.5,System.Globalization.CultureInfo.DefaultThreadCurrentCulture & DefaultThreadCurrentUICulture is avaiable
+        }
 
         public static CultureInfo GetConfigLang()
         {
@@ -22,7 +30,7 @@ public static CultureInfo GetConfigLang()
             }
             else
             {
-                return CultureInfo.GetCultureInfo("en-US");
+                return System.Globalization.CultureInfo.CurrentUICulture;
             }
         }
 

diff --git a/MainV2.cs b/MainV2.cs
@@ -1432,7 +1432,7 @@ protected override void OnFormClosed(FormClosedEventArgs e)
         }
 
 
-        private void xmlconfig(bool write)
+        internal static void xmlconfig(bool write)
         {
             if (write || !File.Exists(Path.GetDirectoryName(Application.ExecutablePath) + Path.DirectorySeparatorChar + @"config.xml"))
             {
@@ -2556,8 +2556,6 @@ public void changelanguage(CultureInfo ci)
                 config["language"] = ci.Name;
                 //System.Threading.Thread.CurrentThread.CurrentCulture = ci;
 
-                L10N.ConfigLang = ci;
-
                 HashSet<Control> views = new HashSet<Control> { this, FlightData, FlightPlanner, Simulation };
 
                 foreach (Control view in MyView.Controls)