Call Qt's locale and setup gettext a bit later in the game.

Author: tmontes

mu/__init__.py

@@ -1,15 +1,24 @@
 import gettext
-import os
+from os import path
 
 from PyQt5.Qt import QLocale
 
-# Configure locale and language
-# Define where the translation assets are to be found.
-localedir = os.path.abspath(os.path.join(os.path.dirname(__file__), 'locale'))
-language_code = QLocale.system().name()
-# DEBUG/TRANSLATE: override the language code here (e.g. to Chinese).
-# language_code = 'zh'
-gettext.translation('mu', localedir=localedir,
-                    languages=[language_code], fallback=True).install()
+
+def setup_gettext():
+    """
+    Sets up gettext translations, installing the global _() function.
+    """
+    # Where the translation assets are to be found.
+    localedir = path.abspath(path.join(path.dirname(__file__), 'locale'))
+
+    # Ask Qt for system language: returns an 'll_CC' string, where 'll' is a
+    # 2-letter ISO 639 language, and CC is a 2/3-letter ISO 3166 country code.
+    # DEBUG/TRANSLATE: Override with the LANG environment variable.
+    language_code = QLocale.system().name()
+
+    # Install the _() translation function.
+    gettext.translation('mu', localedir=localedir,
+                        languages=[language_code], fallback=True).install()
+
 
 __version__ = '1.0.2'

mu/app.py

@@ -28,8 +28,9 @@
 
 from PyQt5.QtCore import QTimer, Qt
 from PyQt5.QtWidgets import QApplication, QSplashScreen
+from PyQt5.Qt import QLocale
 
-from mu import __version__, language_code
+from mu import __version__
 from mu.logic import Editor, LOG_FILE, LOG_DIR, DEBUGGER_PORT, ENCODING
 from mu.interface import Window
 from mu.resources import load_pixmap, load_icon
@@ -111,7 +112,7 @@ def run():
     logging.info('\n\n-----------------\n\nStarting Mu {}'.format(__version__))
     logging.info(platform.uname())
     logging.info('Python path: {}'.format(sys.path))
-    logging.info('Language code: {}'.format(language_code))
+    logging.info('Language code: {}'.format(QLocale.system().name()))
 
     # The app object is the application running on your computer.
     app = QApplication(sys.argv)

mu/logic.py

@@ -38,8 +38,9 @@
 from pycodestyle import StyleGuide, Checker
 from mu.resources import path
 from mu.debugger.utils import is_breakpoint_line
-from mu import __version__
+from mu import __version__, setup_gettext
 
+setup_gettext()
 
 # The user's home directory.
 HOME_DIRECTORY = os.path.expanduser('~')