AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: default to system locale on android

Browse Source
This commit is contained in:
Sander van Grieken
2023-04-11 15:19:29 +02:00
parent 9bbc354e0e
commit 4d5be450d9
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
electrum/gui/qml/__init__.py
View File

@@ -19,7 +19,7 @@ from PyQt5.QtCore import (Qt, QCoreApplication, QObject, QLocale, QTranslator, Q
QT_VERSION_STR, PYQT_VERSION_STR) QT_VERSION_STR, PYQT_VERSION_STR)
from PyQt5.QtGui import QGuiApplication from PyQt5.QtGui import QGuiApplication
from electrum.i18n import set_language, languages, language from electrum.i18n import _, set_language, languages
from electrum.plugin import run_hook from electrum.plugin import run_hook
from electrum.util import profiler from electrum.util import profiler
from electrum.logging import Logger from electrum.logging import Logger
@@ -33,15 +33,16 @@ if TYPE_CHECKING:
from .qeapp import ElectrumQmlApplication, Exception_Hook from .qeapp import ElectrumQmlApplication, Exception_Hook
if 'ANDROID_DATA' in os.environ:
from jnius import autoclass, cast
jLocale = autoclass("java.util.Locale")
class ElectrumTranslator(QTranslator): class ElectrumTranslator(QTranslator):
def __init__(self, parent=None): def __init__(self, parent=None):
super().__init__(parent) super().__init__(parent)
def translate(self, context, source_text, disambiguation, n): def translate(self, context, source_text, disambiguation, n):
if source_text == "": return _(source_text)
return ""
return language.gettext(source_text)
class ElectrumGui(BaseElectrumGui, Logger): class ElectrumGui(BaseElectrumGui, Logger):
@@ -49,7 +50,12 @@ class ElectrumGui(BaseElectrumGui, Logger):
def __init__(self, config: 'SimpleConfig', daemon: 'Daemon', plugins: 'Plugins'): def __init__(self, config: 'SimpleConfig', daemon: 'Daemon', plugins: 'Plugins'):
BaseElectrumGui.__init__(self, config=config, daemon=daemon, plugins=plugins) BaseElectrumGui.__init__(self, config=config, daemon=daemon, plugins=plugins)
Logger.__init__(self) Logger.__init__(self)
set_language(config.get('language', self.get_default_language()))
lang = config.get('language','')
if not lang:
lang = self.get_default_language()
self.logger.info(f'setting language {lang}')
set_language(lang)
# uncomment to debug plugin and import tracing # uncomment to debug plugin and import tracing
# os.environ['QML_IMPORT_TRACE'] = '1' # os.environ['QML_IMPORT_TRACE'] = '1'
@@ -117,8 +123,10 @@ class ElectrumGui(BaseElectrumGui, Logger):
self.app.quit() self.app.quit()
def get_default_language(self): def get_default_language(self):
# On Android this does not return the system locale # On Android QLocale does not return the system locale
# TODO: retrieve through Android API try:
name = QLocale.system().name() name = str(jLocale.getDefault().toString())
self.logger.debug(f'System default locale: {name}') except Exception:
name = QLocale.system().name()
self.logger.info(f'System default locale: {name}')
return name if name in languages else 'en_GB' return name if name in languages else 'en_GB'