AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #4724 from un1t/master

Browse Source 
use system language by default
This commit is contained in:
ThomasV
2018-11-28 13:05:42 +01:00
committed by GitHub
parent d062548e41 4c8103af3b
commit 04571d3b20
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/qt/__init__.py
View File

@@ -87,7 +87,7 @@ class ElectrumGui(PrintError):
@profiler @profiler
def __init__(self, config, daemon, plugins): def __init__(self, config, daemon, plugins):
set_language(config.get('language')) set_language(config.get('language', get_default_language()))
# Uncomment this call to verify objects are being properly # Uncomment this call to verify objects are being properly
# GC-ed when windows are closed # GC-ed when windows are closed
#network.add_jobs([DebugMem([Abstract_Wallet, SPV, Synchronizer, #network.add_jobs([DebugMem([Abstract_Wallet, SPV, Synchronizer,

7
electrum/gui/qt/util.py
View File

@@ -10,7 +10,7 @@ from PyQt5.QtGui import *
from PyQt5.QtCore import * from PyQt5.QtCore import *
from PyQt5.QtWidgets import * from PyQt5.QtWidgets import *
from electrum.i18n import _ from electrum.i18n import _, languages
from electrum.util import FileImportFailed, FileExportFailed from electrum.util import FileImportFailed, FileExportFailed
from electrum.paymentrequest import PR_UNPAID, PR_PAID, PR_EXPIRED from electrum.paymentrequest import PR_UNPAID, PR_PAID, PR_EXPIRED
@@ -817,6 +817,11 @@ class IconCache:
return self.__cache[file_name] return self.__cache[file_name]
def get_default_language():
name = QLocale.system().name()
return name if name in languages else 'en_UK'
if __name__ == "__main__": if __name__ == "__main__":
app = QApplication([]) app = QApplication([])
t = WaitingDialog(None, 'testing ...', lambda: [time.sleep(1)], lambda x: QMessageBox.information(None, 'done', "done")) t = WaitingDialog(None, 'testing ...', lambda: [time.sleep(1)], lambda x: QMessageBox.information(None, 'done', "done"))