[orca] Ensure punctuation is verbalized for ARIA code role during whereAmI

[Joanmarie Diggs <joanied src gnome org>]

commit c7ab58e6e35abe7db16fc6883cdc6b38eeedbc75
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Apr 20 15:25:31 2020 -0400

    Ensure punctuation is verbalized for ARIA code role during whereAmI

 src/orca/scripts/default.py  | 3 +++
 src/orca/speech_generator.py | 3 +++
 2 files changed, 6 insertions(+)
---
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index e6264222f..705fc7305 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -2110,6 +2110,9 @@ class Script(script.Script):
 
     def _whereAmISelectedText(self, inputEvent, obj):
         text, startOffset, endOffset = self.utilities.allSelectedText(obj)
+        if self.utilities.shouldVerbalizeAllPunctuation(obj):
+            text = self.utilities.verbalizeAllPunctuation(text)
+
         if not text:
             msg = messages.NO_SELECTED_TEXT
         else:
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index 36eeaacbb..6218fc7e5 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -1303,6 +1303,9 @@ class SpeechGenerator(generator.Generator):
                 if char[0] == "\n" and startOffset == caretOffset:
                     textContents = char[0]
 
+        if self._script.utilities.shouldVerbalizeAllPunctuation(obj):
+            textContents = self._script.utilities.verbalizeAllPunctuation(textContents)
+
         self._script.generatorCache['textInformation'] = \
             [textContents, startOffset, endOffset, selected]