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

nw/core/spellcheck.py

@@ -24,14 +24,11 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 
-from PyQt5.QtCore import QCoreApplication
 import nw
 import logging
 import os
 import difflib
 
-from nw.constants import nwConst, isoLanguage
-
 logger = logging.getLogger(__name__)
 
 # =============================================================================================== #
@@ -85,21 +82,6 @@ class NWSpellCheck():
         """
         return []
 
-    def describeDict(self):
-        """Dummy function.
-        """
-        return "", ""
-
-    @staticmethod
-    def expandLanguage(spTag):
-        """Translate a language tag to something more user friendly.
-        """
-        spBits = spTag.split("_")
-        spLang = QCoreApplication.translate("ISO", isoLanguage.ISO_639_1.get(spBits[0], spBits[0]))
-        if len(spBits) > 1:
-            spLang += " (%s)" % spBits[1]
-        return spLang
-
     ##
     #  Internal Functions
     ##
@@ -197,27 +179,11 @@ class NWSpellEnchant(NWSpellCheck):
         try:
             import enchant
             for spTag, spProvider in enchant.list_dicts():
-                spName = "%s [%s]" % (self.expandLanguage(spTag), spProvider.name)
-                retList.append((spTag, spName))
+                retList.append((spTag, spProvider.name))
         except Exception:
             logger.error("Failed to list languages for enchant spell checking")
         return retList
 
-    def describeDict(self):
-        """Return the tag and provider of the currently loaded
-        dictionary.
-        """
-        try:
-            spTag = self.theDict.tag
-            spName = self.theDict.provider.name
-        except Exception:
-            logger.error("Failed to extract information about the dictionary")
-            nw.logException()
-            spTag = ""
-            spName = ""
-
-        return spTag, spName
-
 # END Class NWSpellEnchant
 
 class NWSpellEnchantDummy:
@@ -333,17 +299,8 @@ class NWSpellSimple(NWSpellCheck):
             if fExt != ".dict":
                 continue
 
-            spName = "%s [%s]" % (
-                self.expandLanguage(fRoot),
-                QCoreApplication.translate("Constant", nwConst.SP_INTERNAL))
-            retList.append((fRoot, spName))
+            retList.append((fRoot, "difflib"))
 
         return retList
 
-    def describeDict(self):
-        """Return the tag and provider of the currently loaded
-        dictionary.
-        """
-        return self.theLang, QCoreApplication.translate("Constant", nwConst.SP_INTERNAL)
-
 # END Class NWSpellSimple