Merge pull request #736 from digital-dreamer/translate-without-restart
Change interface language without restart
This commit is contained in:
commit
4aded87837
|
@ -154,6 +154,17 @@ def avatarize(address):
|
||||||
return idcon
|
return idcon
|
||||||
# If no avatar is found
|
# If no avatar is found
|
||||||
return identiconize(address)
|
return identiconize(address)
|
||||||
|
|
||||||
|
def change_translation(locale):
|
||||||
|
global qtranslator
|
||||||
|
qtranslator = QtCore.QTranslator()
|
||||||
|
translationpath = os.path.join(
|
||||||
|
getattr(sys, '_MEIPASS', sys.path[0]),
|
||||||
|
'translations',
|
||||||
|
'bitmessage_' + locale
|
||||||
|
)
|
||||||
|
qtranslator.load(translationpath)
|
||||||
|
QtGui.QApplication.installTranslator(qtranslator)
|
||||||
|
|
||||||
|
|
||||||
class MyForm(QtGui.QMainWindow):
|
class MyForm(QtGui.QMainWindow):
|
||||||
|
@ -1423,6 +1434,8 @@ class MyForm(QtGui.QMainWindow):
|
||||||
self.click_actionSettings()
|
self.click_actionSettings()
|
||||||
|
|
||||||
def changeEvent(self, event):
|
def changeEvent(self, event):
|
||||||
|
if event.type() == QtCore.QEvent.LanguageChange:
|
||||||
|
self.ui.retranslateUi(self)
|
||||||
if event.type() == QtCore.QEvent.WindowStateChange:
|
if event.type() == QtCore.QEvent.WindowStateChange:
|
||||||
if self.windowState() & QtCore.Qt.WindowMinimized:
|
if self.windowState() & QtCore.Qt.WindowMinimized:
|
||||||
self.actionShow.setChecked(False)
|
self.actionShow.setChecked(False)
|
||||||
|
@ -2279,6 +2292,7 @@ class MyForm(QtGui.QMainWindow):
|
||||||
lang_ind = int(self.settingsDialogInstance.ui.languageComboBox.currentIndex())
|
lang_ind = int(self.settingsDialogInstance.ui.languageComboBox.currentIndex())
|
||||||
if not languages[lang_ind] == 'other':
|
if not languages[lang_ind] == 'other':
|
||||||
shared.config.set('bitmessagesettings', 'userlocale', languages[lang_ind])
|
shared.config.set('bitmessagesettings', 'userlocale', languages[lang_ind])
|
||||||
|
change_translation(languages[lang_ind])
|
||||||
|
|
||||||
if int(shared.config.get('bitmessagesettings', 'port')) != int(self.settingsDialogInstance.ui.lineEditTCPPort.text()):
|
if int(shared.config.get('bitmessagesettings', 'port')) != int(self.settingsDialogInstance.ui.lineEditTCPPort.text()):
|
||||||
if not shared.safeConfigGetBoolean('bitmessagesettings', 'dontconnect'):
|
if not shared.safeConfigGetBoolean('bitmessagesettings', 'dontconnect'):
|
||||||
|
@ -3837,16 +3851,7 @@ class UISignaler(QThread):
|
||||||
|
|
||||||
def run():
|
def run():
|
||||||
app = QtGui.QApplication(sys.argv)
|
app = QtGui.QApplication(sys.argv)
|
||||||
translator = QtCore.QTranslator()
|
change_translation(l10n.getTranslationLanguage())
|
||||||
|
|
||||||
translationpath = os.path.join(
|
|
||||||
getattr(sys, '_MEIPASS', sys.path[0]),
|
|
||||||
'translations',
|
|
||||||
'bitmessage_' + l10n.getTranslationLanguage()
|
|
||||||
)
|
|
||||||
translator.load(translationpath)
|
|
||||||
|
|
||||||
QtGui.QApplication.installTranslator(translator)
|
|
||||||
app.setStyleSheet("QStatusBar::item { border: 0px solid black }")
|
app.setStyleSheet("QStatusBar::item { border: 0px solid black }")
|
||||||
myapp = MyForm()
|
myapp = MyForm()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user