Merge 46f62df into 188368f

michaelDCurran · web-flow · commit ebb246b8c7d9 · 2023-08-01T11:33:21.000+10:00
diff --git a/source/globalCommands.py b/source/globalCommands.py
@@ -29,10 +29,7 @@
 import api
 import textInfos
 import speech
-from speech import (
-	sayAll,
-	shortcutKeys,
-)
+from speech import sayAll
 from NVDAObjects import NVDAObject, NVDAObjectTextInfo
 import globalVars
 from logHandler import log
@@ -2591,13 +2588,12 @@ def script_reportStatusLine(self, gesture):
 	def script_reportFocusObjectAccelerator(self, gesture: inputCore.InputGesture) -> None:
 		obj = api.getFocusObject()
 		if obj.keyboardShortcut:
-			shortcut = obj.keyboardShortcut
-			shortcutKeys.speakKeyboardShortcuts(shortcut)
-			braille.handler.message(shortcut)
+			res = obj.keyboardShortcut
 		else:
 			# Translators: reported when a user requests the accelerator key
 			# of the currently focused object, but there is none set.
-			ui.message(_("No shortcut key"))
+			res = _("No shortcut key")
+		ui.message(res)
 
 	@script(
 		# Translators: Input help mode message for toggle mouse tracking command.
diff --git a/source/speech/shortcutKeys.py b/source/speech/shortcutKeys.py
diff --git a/source/speech/speech.py b/source/speech/speech.py
@@ -35,7 +35,6 @@
 	EndUtteranceCommand,
 	CharacterModeCommand,
 )
-from .shortcutKeys import getKeyboardShortcutsSpeech
 
 from . import types
 from .types import (
@@ -1726,7 +1725,8 @@ def getPropertiesSpeech(  # noqa: C901
 		textList.append(description)
 	# sometimes keyboardShortcut key is present but value is None
 	keyboardShortcut: Optional[str] = propertyValues.get('keyboardShortcut')
-	textList.extend(getKeyboardShortcutsSpeech(keyboardShortcut))
+	if keyboardShortcut:
+		textList.append(keyboardShortcut)
 	if includeTableCellCoords and cellCoordsText:
 		textList.append(cellCoordsText)
 	if cellCoordsText or rowNumber or columnNumber:
diff --git a/tests/system/robot/startupShutdownNVDA.py b/tests/system/robot/startupShutdownNVDA.py
@@ -76,7 +76,7 @@ def quits_from_menu(showExitDialog=True):
 			actualSpeech,
 			"\n".join([
 				"Exit NVDA  dialog",
-				"What would you like to do?  combo box  Exit  collapsed  Alt plus  d"
+				"What would you like to do?  combo box  Exit  collapsed  Alt plus d"
 			])
 		)
 		_builtIn.sleep(1)  # the dialog is not always receiving the enter keypress, wait a little for it
@@ -105,7 +105,7 @@ def quits_from_keyboard():
 		actualSpeech,
 		"\n".join([
 			"Exit NVDA  dialog",
-			"What would you like to do?  combo box  Exit  collapsed  Alt plus  d"
+			"What would you like to do?  combo box  Exit  collapsed  Alt plus d"
 		])
 	)
 	_builtIn.sleep(1)  # the dialog is not always receiving the enter keypress, wait a little longer for it
@@ -143,7 +143,7 @@ def read_welcome_dialog():
 				"NVDA, get help and access other NVDA functions."
 			),
 			"Options  grouping",
-			"Keyboard layout:  combo box  desktop  collapsed  Alt plus  k"
+			"Keyboard layout:  combo box  desktop  collapsed  Alt plus k"
 		])
 	)
 	_builtIn.sleep(1)  # the dialog is not always receiving the enter keypress, wait a little longer for it
diff --git a/tests/unit/test_speechShortcutKeys.py b/tests/unit/test_speechShortcutKeys.py
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -141,13 +141,11 @@ eSpeak-NG, LibLouis braille translator, and Unicode CLDR have been updated.
 - When forcing UIA support with certain terminal and consoles, a bug is fixed which caused a freeze and the log file to be spammed. (#14689)
 - NVDA will no longer refuse to save the configuration after a configuration reset. (#13187)
 - When running a temporary version from the launcher, NVDA will not mislead users into thinking they can save the configuration. (#14914)
-- Reporting of object shortcut keys has been improved. (#10807)
 - NVDA now generally responds slightly faster to commands and focus changes. (#14928)
 - Displaying the OCR settings will not fail on some systems anymore. (#15017)
 - Fix bug related to saving and loading the NVDA configuration, including switching synthesizers. (#14760)
 - Fix bug causing text review "flick up" touch gesture to move pages rather than move to previous line. (#15127)
 - 
--
 
 
 == Changes for Developers ==
