Revert some changes to how languages are loaded and remove iso.py

nw/gui/doceditor.py

@@ -599,14 +599,7 @@ class GuiDocEditor(QTextEdit):
             theLang = self.theProject.projLang
 
         self.theDict.setLanguage(theLang, self.theProject.projDict)
-
-        aLang, aName = self.theDict.describeDict()
-        self.theParent.statusBar.setLanguage(
-            aLang,
-            self.tr("{0} [{1}]").format(
-                self.mainConf.spellTool.title(),
-                aName.title())
-        )
+        self.theParent.statusBar.setLanguage(theLang)
 
         if not self.bigDoc:
             self.spellCheckDocument()

nw/gui/preferences.py

@@ -28,7 +28,7 @@ import nw
 import logging
 import os
 
-from PyQt5.QtCore import QCoreApplication, Qt
+from PyQt5.QtCore import Qt, QLocale
 from PyQt5.QtGui import QFont
 from PyQt5.QtWidgets import (
     QDialog, QWidget, QComboBox, QSpinBox, QPushButton, QDialogButtonBox,
@@ -627,19 +627,20 @@ class GuiPreferencesEditor(QWidget):
         self.mainForm.setHelpTextStyle(self.theTheme.helpText)
         self.setLayout(self.mainForm)
 
+        mW = self.mainConf.pxInt(250)
+
         # Spell Checking
         # ==============
         self.mainForm.addGroupLabel(self.tr("Spell Checking"))
 
         ## Spell Check Provider and Language
         self.spellLangList = QComboBox(self)
+        self.spellLangList.setMaximumWidth(mW)
+
         self.spellToolList = QComboBox(self)
-        self.spellToolList.addItem(
-            self.tr("{0} ({1})").format(self.tr("Internal"), "difflib"),
-            QCoreApplication.translate("Constant", nwConst.SP_INTERNAL))
-        self.spellToolList.addItem(
-            self.tr("{0} ({1})").format(self.tr("Spell Enchant"), "pyenchant"),
-            QCoreApplication.translate("Constant", nwConst.SP_ENCHANT))
+        self.spellToolList.setMaximumWidth(mW)
+        self.spellToolList.addItem("%s (difflib)" % self.tr("Internal"), nwConst.SP_INTERNAL)
+        self.spellToolList.addItem("Spell Enchant (pyenchant)", nwConst.SP_ENCHANT)
 
         theModel  = self.spellToolList.model()
         idEnchant = self.spellToolList.findData(nwConst.SP_ENCHANT)
@@ -799,8 +800,11 @@ class GuiPreferencesEditor(QWidget):
             theDict = NWSpellSimple()
 
         self.spellLangList.clear()
-        for spTag, spName in theDict.listDictionaries():
-            self.spellLangList.addItem(spName, spTag)
+        for spTag, spProv in theDict.listDictionaries():
+            qLocal = QLocale(spTag)
+            spLang = qLocal.nativeLanguageName().title()
+            spName = qLocal.bcp47Name()
+            self.spellLangList.addItem("%s (%s) [%s]" % (spLang, spName, spProv), spTag)
 
         spellIdx = self.spellLangList.findData(self.mainConf.spellLanguage)
         if spellIdx != -1:

nw/gui/statusbar.py

@@ -29,10 +29,10 @@ import logging
 
 from time import time
 
+from PyQt5.QtCore import QLocale
 from PyQt5.QtGui import QColor, QPainter
 from PyQt5.QtWidgets import qApp, QStatusBar, QLabel, QAbstractButton
 
-from nw.core import NWSpellCheck
 from nw.common import formatTime
 
 logger = logging.getLogger(__name__)
@@ -147,19 +147,17 @@ class GuiMainStatus(QStatusBar):
         qApp.processEvents()
         return
 
-    def setLanguage(self, theLanguage, theProvider=""):
+    def setLanguage(self, theLang):
         """Set the language code for the spell checker.
         """
-        if theLanguage is None:
+        if theLang is None:
             self.langText.setText(self.tr("None"))
-            self.langText.setToolTip("")
         else:
-            self.langText.setText(NWSpellCheck.expandLanguage(theLanguage))
-            self.langText.setToolTip(
-                self.tr("{0}: {1}").format(
-                    self.tr("Provider"),
-                    theProvider if theProvider else self.tr("unknown"))
-            )
+            qLocal = QLocale(theLang)
+            spLang = qLocal.nativeLanguageName().title()
+            spName = qLocal.bcp47Name()
+            self.langText.setText("%s (%s)" % (spLang, spName))
+
         return
 
     def setProjectStatus(self, isChanged):