V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Showing only changes of commit 4b88922104 - Show all commits

View File

@ -67,11 +67,13 @@ def _translate(context, text):
def change_translation(locale): def change_translation(locale):
global qtranslator global qtranslator
qtranslator = QtCore.QTranslator() qtranslator = QtCore.QTranslator()
translationpath = os.path.join( if shared.frozen == "macosx_app":
getattr(sys, '_MEIPASS', sys.path[0]), translationpath = os.environ.get("RESOURCEPATH")
'translations', elif shared.frozen: # windows
'bitmessage_' + locale translationpath = sys._MEIPASS
) else:
translationpath = os.path.dirname(os.path.dirname(__file__))
translationpath = os.path.join (translationpath, 'translations', 'bitmessage_' + locale)
qtranslator.load(translationpath) qtranslator.load(translationpath)
QtGui.QApplication.installTranslator(qtranslator) QtGui.QApplication.installTranslator(qtranslator)