[orca] Add optional argument to not reset punctuation and capitalization styles for messages

[Joanmarie Diggs <joanied src gnome org>]

commit c428b96d5e1f0846f05d7abd3b12597fd9038356
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri Nov 27 11:00:48 2015 -0500

    Add optional argument to not reset punctuation and capitalization styles for messages

 src/orca/scripts/default.py    |   10 +++++-----
 src/orca/scripts/web/script.py |    6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index 0c1baa7..4aa8fd1 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -4022,7 +4022,7 @@ class Script(script.Script):
         speech.speakKeyEvent(event)
         return True
 
-    def presentMessage(self, fullMessage, briefMessage=None, voice=None):
+    def presentMessage(self, fullMessage, briefMessage=None, voice=None, resetStyles=True):
         """Convenience method to speak a message and 'flash' it in braille.
 
         Arguments:
@@ -4050,7 +4050,7 @@ class Script(script.Script):
             else:
                 message = fullMessage
             if message:
-                self.speakMessage(message, voice)
+                self.speakMessage(message, voice, resetStyles)
 
         if (_settingsManager.getSetting('enableBraille') \
              or _settingsManager.getSetting('enableBrailleMonitor')) \
@@ -4431,7 +4431,7 @@ class Script(script.Script):
         spokenCharacter = chnames.getCharacterName(character)
         speech.speakCharacter(spokenCharacter, voice)
 
-    def speakMessage(self, string, voice=None, interrupt=True):
+    def speakMessage(self, string, voice=None, interrupt=True, resetStyles=True):
         """Method to speak a single string. Scripts should use this
         method rather than calling speech.speak directly.
 
@@ -4448,7 +4448,7 @@ class Script(script.Script):
 
         systemVoice = self.voices.get(settings.SYSTEM_VOICE)
         voice = voice or systemVoice
-        if voice == systemVoice:
+        if voice == systemVoice and resetStyles:
             capStyle = _settingsManager.getSetting('capitalizationStyle')
             _settingsManager.setSetting('capitalizationStyle', settings.CAPITALIZATION_STYLE_NONE)
             speech.updateCapitalizationStyle()
@@ -4459,7 +4459,7 @@ class Script(script.Script):
 
         speech.speak(string, voice, interrupt)
 
-        if voice == systemVoice:
+        if voice == systemVoice and resetStyles:
             _settingsManager.setSetting('capitalizationStyle', capStyle)
             speech.updateCapitalizationStyle()
 
diff --git a/src/orca/scripts/web/script.py b/src/orca/scripts/web/script.py
index 30af7f1..e95cda4 100644
--- a/src/orca/scripts/web/script.py
+++ b/src/orca/scripts/web/script.py
@@ -1073,12 +1073,12 @@ class Script(default.Script):
 
         if not _settingsManager.getSetting('onlySpeakDisplayedText'):
             if event.detail1:
-                msg = messages.PAGE_LOADING_START
+                self.presentMessage(messages.PAGE_LOADING_START)
             elif event.source.name:
                 msg = messages.PAGE_LOADING_END_NAMED % event.source.name
+                self.presentMessage(msg, resetStyles=False)
             else:
-                msg = messages.PAGE_LOADING_END
-            self.presentMessage(msg)
+                self.presentMessage(messages.PAGE_LOADING_END)
 
         if event.detail1:
             return True