Merge 7d44b03 into 021c13d

Emil-18 · web-flow · commit 75493e59ab70 · 2023-12-04T06:42:11.000+10:00
diff --git a/source/globalCommands.py b/source/globalCommands.py
@@ -20,6 +20,7 @@
 )
 
 import audioDucking
+import copy
 import touchHandler
 import keyboardHandler
 import mouseHandler
@@ -274,15 +275,19 @@ def script_reportCurrentSelection(self,gesture):
 		except (RuntimeError, NotImplementedError):
 			info=None
 		if not info or info.isCollapsed:
-			speech.speakMessage(_("No selection"))
+			ui.message(_("No selection"))
 		else:
 			scriptCount = scriptHandler.getLastScriptRepeatCount()
+			selectMessage = speech.speech._getSelectionMessageSpeech(_('%s selected'), info.text)[0]
 			if scriptCount == 0:
 				speech.speakTextSelected(info.text)
+				braille.handler.message(selectMessage)
+
 			elif len(info.text) < speech.speech.MAX_LENGTH_FOR_SELECTION_REPORTING:
 				speech.speakSpelling(info.text, useCharacterDescriptions=scriptCount > 1)
 			else:
 				speech.speakTextSelected(info.text)
+				braille.handler.message(selectMessage)
 
 	@script(
 		# Translators: Input help mode message for report date and time command.
@@ -1159,7 +1164,15 @@ def script_navigatorObject_current(self, gesture: inputCore.InputGesture):
 				else:
 					api.copyToClip(text, notify=True)
 		else:
-			speech.speakObject(curObject, reason=controlTypes.OutputReason.QUERY)
+			speechList = speech.getObjectSpeech(curObject, reason=controlTypes.OutputReason.QUERY)
+			speech.speech.speak(speechList)
+			for i in copy.copy(speechList):
+				if not isinstance(i, str):
+					speechList.remove(i)
+			text = ' '.join(speechList)
+
+			braille.handler.message(text)
+
 
 	@staticmethod
 	def _reportLocationText(objs: Tuple[Union[None, NVDAObject, textInfos.TextInfo], ...]) -> None:
@@ -2488,7 +2501,13 @@ def script_reportCurrentFocus(self, gesture: inputCore.InputGesture):
 
 		repeatCount = scriptHandler.getLastScriptRepeatCount()
 		if repeatCount == 0:
-			speech.speakObject(focusObject, reason=controlTypes.OutputReason.QUERY)
+			speechList = speech.getObjectSpeech(focusObject, reason=controlTypes.OutputReason.QUERY)
+			speech.speech.speak(speechList)
+			for i in copy.copy(speechList):
+				if not isinstance(i, str):
+					speechList.remove(i)
+			text = ' '.join(speechList)
+			braille.handler.message(text)
 		else:
 			speech.speakSpelling(focusObject.name, useCharacterDescriptions=repeatCount > 1)
 
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -80,6 +80,7 @@ Users of Poedit 1 are encouraged to update to Poedit 3 if they want to rely on e
   - More objects which contain useful text are detected, and text content is displayed in braille. (#15605)
   - Contracted braille input works properly again. (#15773, @aaclause)
   - Braille is now updated when moving the navigator object between table cells in more situations (#15755, @Emil-18)
+  - The result of report current focus, current navigator object, and current selection commands is now shown in brraille. (#15844, @Emil-18)
   -
 - LibreOffice:
   - Words deleted using the ``control+backspace`` keyboard shortcut are now also properly announced when the deleted word is followed by whitespace (like spaces and tabs). (#15436, @michaelweghorn)

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ Users of Poedit 1 are encouraged to update to Poedit 3 if they want to rely on e`
`80`	`80`	`- More objects which contain useful text are detected, and text content is displayed in braille. (#15605)`
`81`	`81`	`- Contracted braille input works properly again. (#15773, @aaclause)`
`82`	`82`	`- Braille is now updated when moving the navigator object between table cells in more situations (#15755, @Emil-18)`
	`83`	`+ - The result of report current focus, current navigator object, and current selection commands is now shown in brraille. (#15844, @Emil-18)`
`83`	`84`	`-`
`84`	`85`	`- LibreOffice:`
`85`	`86`	- Words deleted using the ``control+backspace`` keyboard shortcut are now also properly announced when the deleted word is followed by whitespace (like spaces and tabs). (#15436, @michaelweghorn)