Fix localization merge.

[cura.git] / Cura / util / resources.py

diff --git a/Cura/util/resources.py b/Cura/util/resources.py
index 473f496459e09e1ea212a23261164e00bbf7bcd9..a58792774abfff7694e5da5b9f5a6d00a9c8ddd0 100644 (file)
--- a/Cura/util/resources.py
+++ b/Cura/util/resources.py
@@ -48,7 +48,9 @@ def setupLocalization():
                if sys.platform.startswith('darwin'):
                        languages = NSLocale.preferredLanguages()
                else:
-                       languages = [wx.Locale(wx.LANGUAGE_DEFAULT).GetCanonicalName()]
+                       #Using wx.Locale before you created wx.App seems to cause an nasty exception. So default to 'en' at the moment.
+                       #languages = [wx.Locale(wx.LANGUAGE_DEFAULT).GetCanonicalName()]
+                       languages = ['en']
        except Exception as e:
                languages = ['en']