Merge pull request #292 from diluculo/useInvariantCulture

Using Resources.resx with InvariantCulture
tgjones · May 31, 2018 · ac0b9da · ac0b9da
2 parents fbddde7 + 55fb0a1
commit ac0b9da
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Gemini/AppBootstrapper.cs b/src/Gemini/AppBootstrapper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.ComponentModel.Composition.Hosting;
@@ -39,6 +39,10 @@ protected virtual void PreInitialize()
             if (!string.IsNullOrWhiteSpace(code))
             {
                 var culture = CultureInfo.GetCultureInfo(code);
+                // If code == "en", force to use default resource (Resources.resx)
+                // See PO #243
+                if (!Translator.Cultures.Contains(culture))
+                    culture = CultureInfo.InvariantCulture;
                 Translator.Culture = culture;
                 Thread.CurrentThread.CurrentUICulture = culture;
                 Thread.CurrentThread.CurrentCulture = culture;
@@ -122,4 +126,4 @@ protected override IEnumerable<Assembly> SelectAssemblies()
             return new[] { Assembly.GetEntryAssembly() };
         }
 	}
-}
+}