Fix locale bug.

bump version to 0.8.6

Author: benjie-git

designer.py

@@ -25,10 +25,6 @@
 from wx.lib.mixins.inspection import InspectionMixin
 from stackExporter import StackExporter
 
-# Fix locale error with wxPython, python3.8+, and Windows on a non-engligh locale.
-import locale
-locale.setlocale(locale.LC_ALL, 'C')
-
 HERE = os.path.dirname(os.path.realpath(__file__))
 
 # ----------------------------------------------------------------------
@@ -721,7 +717,7 @@ def ReadConfig(self):
 class DesignerApp(wx.App, InspectionMixin):
     def OnInit(self):
         self.Init() # for InspectionMixin
-
+        self.locale = wx.Locale(wx.LANGUAGE_ENGLISH)
         self.frame = DesignerFrame(None)
         self.frame.app = self
         self.frame.Show(True)
@@ -745,7 +741,7 @@ def MacReopenApp(self):
 
 if __name__ == '__main__':
     app = DesignerApp(redirect=False)
-    app.InitLocale()
+
     if len(sys.argv) > 1:
         filename = sys.argv[1]
         app.frame.ReadFile(filename)

standalone.py

@@ -21,10 +21,6 @@
 from findEngineViewer import FindEngine
 from wx.lib.mixins.inspection import InspectionMixin
 
-# Fix locale error with wxPython, python3.8+, and Windows on a non-engligh locale.
-import locale
-locale.setlocale(locale.LC_ALL, 'C')
-
 ID_MENU_FIND = wx.NewIdRef()
 ID_MENU_FIND_SEL = wx.NewIdRef()
 ID_MENU_FIND_NEXT = wx.NewIdRef()
@@ -271,7 +267,7 @@ def RunAllSetupHandlers(model):
 class StandaloneApp(wx.App, InspectionMixin):
     def OnInit(self):
         self.Init(self)  # for InspectionMixin
-
+        self.locale = wx.Locale(wx.LANGUAGE_ENGLISH)
         self.SetAppDisplayName('CardStock')
 
         bundle_dir = sys._MEIPASS
@@ -319,5 +315,4 @@ def MacReopenApp(self):
 
 if __name__ == '__main__':
     app = StandaloneApp(redirect=False)
-    app.InitLocale()
     app.MainLoop()

version.py

@@ -1 +1 @@
-VERSION='0.8.5'
+VERSION='0.8.6'

viewer.py

@@ -21,10 +21,6 @@
 from findEngineViewer import FindEngine
 from wx.lib.mixins.inspection import InspectionMixin
 
-# Fix locale error with wxPython, python3.8+, and Windows on a non-engligh locale.
-import locale
-locale.setlocale(locale.LC_ALL, 'C')
-
 HERE = os.path.dirname(os.path.abspath(__file__))
 
 ID_MENU_FIND = wx.NewIdRef()
@@ -306,7 +302,7 @@ def RunAllSetupHandlers(model):
 class ViewerApp(wx.App, InspectionMixin):
     def OnInit(self):
         self.Init(self)  # for InspectionMixin
-
+        self.locale = wx.Locale(wx.LANGUAGE_ENGLISH)
         self.SetAppDisplayName('CardStock')
         self.frame = None
 
@@ -361,7 +357,6 @@ def MacReopenApp(self):
 
 if __name__ == '__main__':
     app = ViewerApp(redirect=False)
-    app.InitLocale()
     if len(sys.argv) > 1:
         filename = sys.argv[1]
         app.OpenFile(filename)