Much simpler locale detection, now relying on Qt's QLocale.

mu/__init__.py

@@ -1,12 +1,12 @@
 import gettext
 import os
 
-from . import localedetect
+from PyQt5.QtCore 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 = localedetect.language_code()
+language_code = QLocale.system().name()
 # DEBUG/TRANSLATE: override the language code here (e.g. to Chinese).
 # language_code = 'zh'
 gettext.translation('mu', localedir=localedir,

mu/logic.py

@@ -33,9 +33,9 @@
 import appdirs
 import site
 from PyQt5.QtWidgets import QMessageBox
+from PyQt5.QtCore import QLocale
 from pyflakes.api import check
 from pycodestyle import StyleGuide, Checker
-from . import localedetect
 from mu.resources import path
 from mu.debugger.utils import is_breakpoint_line
 from mu import __version__
@@ -1032,7 +1032,7 @@ def show_help(self):
         """
         Display browser based help about Mu.
         """
-        language_code = localedetect.language_code()[:2]
+        language_code = QLocale.system().name()[:2]
         major_version = '.'.join(__version__.split('.')[:2])
         url = 'https://codewith.mu/{}/help/{}'.format(language_code,
                                                       major_version)

tests/test_logic.py

@@ -1682,26 +1682,10 @@ def test_show_help():
     """
     view = mock.MagicMock()
     ed = mu.logic.Editor(view)
+    qlocalesys = mock.MagicMock()
+    qlocalesys.name.return_value = 'en_GB'
     with mock.patch('mu.logic.webbrowser.open_new', return_value=None) as wb, \
-            mock.patch('mu.logic.locale.getdefaultlocale',
-                       return_value=('en_GB', 'UTF-8')):
-        ed.show_help()
-        version = '.'.join(__version__.split('.')[:2])
-        url = 'https://codewith.mu/en/help/{}'.format(version)
-        wb.assert_called_once_with(url)
-
-
-def test_show_help_exploding_getdefaultlocale():
-    """
-    Sometimes, on OSX the getdefaultlocale method causes a TypeError or
-    ValueError. Ensure when this happens, Mu defaults to 'en' as the language
-    code.
-    """
-    view = mock.MagicMock()
-    ed = mu.logic.Editor(view)
-    with mock.patch('mu.logic.webbrowser.open_new', return_value=None) as wb, \
-            mock.patch('mu.logic.locale.getdefaultlocale',
-                       side_effect=TypeError('Boom!')):
+            mock.patch('PyQt5.QtCore.QLocale.system', return_value=qlocalesys):
         ed.show_help()
         version = '.'.join(__version__.split('.')[:2])
         url = 'https://codewith.mu/en/help/{}'.format(version)