announce capitals in phonetic

src/fenrir/core/outputManager.py

@@ -28,7 +28,9 @@ class outputManager():
         if self.playSoundIcon(soundIcon, interrupt):
             self.env['runtime']['debug'].writeDebugOut("soundIcon found" ,debug.debugLevel.INFO)            
             return
-        toAnnounceCapital = announceCapital and len(text.strip(' \n\t')) == 1 and text.strip(' \n\t').isupper()
+        if text.strip(string.whitespace) == '':
+            return
+        toAnnounceCapital = announceCapital and text[0].isupper()
         if toAnnounceCapital:
             if self.playSoundIcon('capital', False):
                 toAnnounceCapital = False         

src/fenrir/utils/char_utils.py

@@ -85,6 +85,10 @@ def getPhonetic(currChar):
     "Y":"yankee", "Z":"zulu"
     }
     try:
-        return phoneticsDict[currChar.upper()]
+        phonChar = phoneticsDict[currChar.upper()]
+        if currChar.isupper():
+            phonChar = phonChar[0].upper() + phonChar[1:]
+        return phonChar
     except:
         return currChar
+