Merge branch 'next-gen' of https://github.com/manuelcortez/TWBlue into next-gen

This commit is contained in:
Manuel Cortez 2015-08-18 08:05:21 -05:00
commit 80cb70c9a6
2 changed files with 13 additions and 1 deletions

View File

@ -1,4 +1,7 @@
import wx import wx
import paths
import languageHandler
import sys
toolkit = "wx" toolkit = "wx"
@ -108,6 +111,15 @@ class mainLoopObject(wx.App):
def __init__(self): def __init__(self):
self.app = wx.App() self.app = wx.App()
self.lc = wx.Locale()
lang=languageHandler.getLanguage()
wxLang=self.lc.FindLanguageInfo(lang)
if not wxLang and '_' in lang:
wxLang=self.lc.FindLanguageInfo(lang.split('_')[0])
if hasattr(sys,'frozen'):
self.lc.AddCatalogLookupPathPrefix(paths.app_path("locales"))
if wxLang:
self.lc.Init(wxLang.Language)
def run(self): def run(self):
self.app.MainLoop() self.app.MainLoop()

@ -1 +1 @@
Subproject commit 0f65f42c9f752396b0567e597d96c0ab8a5a53f8 Subproject commit 4d106f04f7e6d2f9e160aca54ce107efb46ee099