From d8408048186c025520cd63d6ffe705f8d0316f44 Mon Sep 17 00:00:00 2001 From: Ilya Shalyapin Date: Wed, 19 Sep 2018 13:07:19 +0500 Subject: [PATCH] use system language by default --- electrum/gui/qt/__init__.py | 4 ++-- electrum/i18n.py | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/electrum/gui/qt/__init__.py b/electrum/gui/qt/__init__.py index 80adeaa99..4fdb1b52e 100644 --- a/electrum/gui/qt/__init__.py +++ b/electrum/gui/qt/__init__.py @@ -38,7 +38,7 @@ from PyQt5.QtWidgets import * from PyQt5.QtCore import * import PyQt5.QtCore as QtCore -from electrum.i18n import _, set_language +from electrum.i18n import _, set_language, get_default_language from electrum.plugin import run_hook from electrum.storage import WalletStorage from electrum.base_wizard import GoBack @@ -89,7 +89,7 @@ class QNetworkUpdatedSignalObject(QObject): class ElectrumGui(PrintError): 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 # GC-ed when windows are closed #network.add_jobs([DebugMem([Abstract_Wallet, SPV, Synchronizer, diff --git a/electrum/i18n.py b/electrum/i18n.py index 9c6fad995..bb4a2da59 100644 --- a/electrum/i18n.py +++ b/electrum/i18n.py @@ -26,6 +26,8 @@ import os import gettext +from PyQt5.QtCore import QLocale + LOCALE_DIR = os.path.join(os.path.dirname(__file__), 'locale') language = gettext.translation('electrum', LOCALE_DIR, fallback=True) @@ -41,6 +43,11 @@ def set_language(x): language = gettext.translation('electrum', LOCALE_DIR, fallback=True, languages=[x]) +def get_default_language(): + system_locale = QLocale.system().name() + return languages.get(system_locale, 'en_UK') + + languages = { '': _('Default'), 'ar_SA': _('Arabic'),