More improvements, mostly string formatting

nw/core/tohtml.py

@@ -41,6 +41,7 @@ class ToHtml(Tokenizer):
 
     def __init__(self, theProject, theParent):
         Tokenizer.__init__(self, theProject, theParent)
+
         self.genMode = self.M_EXPORT
         self.cssStyles = True
 

nw/core/tools.py

@@ -136,7 +136,6 @@ def numberToWord(numVal, theLanguage):
 def _numberToWordEN(numVal):
     """Convert numbers to English words.
     """
-    numWord = ""
     oneWord = ""
     tenWord = ""
     hunWord = ""
@@ -145,8 +144,8 @@ def _numberToWordEN(numVal):
         return "Zero"
 
     oneVal = numVal % 10
-    tenVal = (numVal-oneVal) % 100
-    hunVal = (numVal-tenVal-oneVal) % 1000
+    tenVal = (numVal - oneVal) % 100
+    hunVal = (numVal - tenVal - oneVal) % 1000
 
     theHundreds = {
         100: "One Hundred",   200: "Two Hundred",   300: "Three Hundred",
@@ -167,18 +166,18 @@ def _numberToWordEN(numVal):
     }
 
     hunWord = theHundreds.get(hunVal, "")
-    tenWord = theTens.get(tenVal, "")
     if tenVal == 10:
         oneWord = theTeens.get(oneVal, "")
-        numWord = ("%s %s" % (hunWord, oneWord)).strip()
+        return f"{hunWord} {oneWord}".strip()
     else:
         oneWord = theOnes.get(oneVal, "")
         if tenVal == 0:
-            numWord = ("%s %s" % (hunWord, oneWord)).strip()
+            return f"{hunWord} {oneWord}".strip()
         else:
+            tenWord = theTens.get(tenVal, "")
             if oneVal == 0:
-                numWord = ("%s %s" % (hunWord, tenWord)).strip()
+                return f"{hunWord} {tenWord}".strip()
             else:
-                numWord = ("%s %s-%s" % (hunWord, tenWord, oneWord)).strip()
+                return f"{hunWord} {tenWord}-{oneWord}".strip()
 
-    return numWord
+    return ""

nw/gui/statusbar.py

@@ -207,7 +207,9 @@ class GuiMainStatus(QStatusBar):
             self.timeText.setText("00:00:00")
         else:
             tS = int(time() - self.refTime)
-            self.timeText.setText(f"{tS//3600:02d}:{(tS//60)%60:02d}:{tS%60:02d}")
+            self.timeText.setText(
+                f"{tS//3600:02d}:{tS%3600//60:02d}:{tS%60:02d}"
+            )
         return
 
 # END Class GuiMainStatus

tests/test_tools.py

@@ -61,6 +61,7 @@ def testNumberWords():
     assert numberToWord(21, "en") == "Twenty-One"
     assert numberToWord(29, "en") == "Twenty-Nine"
     assert numberToWord(42, "en") == "Forty-Two"
+    assert numberToWord(114, "en") == "One Hundred Fourteen"
     assert numberToWord(142, "en") == "One Hundred Forty-Two"
     assert numberToWord(999, "en") == "Nine Hundred Ninety-Nine"