[orca] Begin passing requested voice to speech generator

[Joanmarie Diggs <joanied src gnome org>]

commit eecc00b289fbcb704873d47ff979314ce3838c86
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri Jan 7 17:19:14 2022 +0100

    Begin passing requested voice to speech generator
    
    Yet another change that should have no end-user impact at this time.

 src/orca/scripts/apps/soffice/speech_generator.py | 1 +
 src/orca/scripts/default.py                       | 3 ++-
 src/orca/speech_generator.py                      | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/src/orca/scripts/apps/soffice/speech_generator.py 
b/src/orca/scripts/apps/soffice/speech_generator.py
index 73919a6e3..2f21f3d45 100644
--- a/src/orca/scripts/apps/soffice/speech_generator.py
+++ b/src/orca/scripts/apps/soffice/speech_generator.py
@@ -257,6 +257,7 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
         for start, end, string, language, dialect in split:
             if not string:
                 continue
+            args["language"], args["dialect"] = language, dialect
             voice = self.voice(string=string, obj=obj, **args)
             string = self._script.utilities.adjustForLinks(obj, string, start)
             rv = [self._script.utilities.adjustForRepeats(string)]
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index d17b6cc82..4478e84e7 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -3437,7 +3437,8 @@ class Script(script.Script):
                 if not string:
                     continue
 
-                voice = self.speechGenerator.voice(obj=obj, string=string)
+                voice = self.speechGenerator.voice(
+                    obj=obj, string=string, language=language, dialect=dialect)
                 string = self.utilities.adjustForLinks(obj, string, start)
                 string = self.utilities.adjustForRepeats(string)
                 if self.utilities.shouldVerbalizeAllPunctuation(obj):
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index 45f9479e7..803855cd2 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -2863,6 +2863,12 @@ class SpeechGenerator(generator.Generator):
         voices = _settingsManager.getSetting('voices')
         voice = acss.ACSS(voices.get(voiceType.get(DEFAULT)))
 
+        language = args.get('language')
+        dialect = args.get('dialect')
+        msg = "SPEECH GENERATOR: %s voice requested with language='%s', dialect='%s'" % \
+            (key, language, dialect)
+        debug.println(debug.LEVEL_INFO, msg, True)
+
         if key in [None, DEFAULT]:
             string = args.get('string', '')
             obj = args.get('obj')