Merge 667c0ca into 709c3d9

CyrilleB79 · web-flow · commit 1b8aea4afc11 · 2023-11-26T01:09:07.000+02:00
diff --git a/source/gui/installerGui.py b/source/gui/installerGui.py
@@ -359,7 +359,7 @@ def __init__(self, parent):
 
 		# Translators: The label of a grouping containing controls to select the destination directory
 		# in the Create Portable NVDA dialog.
-		directoryGroupText = _("Portable &directory:")
+		directoryGroupText = _("Portable directory:")
 		groupSizer = wx.StaticBoxSizer(wx.VERTICAL, self, label=directoryGroupText)
 		groupHelper = sHelper.addItem(guiHelper.BoxSizerHelper(self, sizer=groupSizer))
 		groupBox = groupSizer.GetStaticBox()
diff --git a/source/speech/speech.py b/source/speech/speech.py
@@ -701,7 +701,7 @@ def getObjectSpeech(
 		or not obj._hasNavigableText
 	)
 
-	allowProperties = _objectSpeech_calculateAllowedProps(reason, shouldReportTextContent)
+	allowProperties = _objectSpeech_calculateAllowedProps(reason, shouldReportTextContent, obj.role)
 
 	if reason == OutputReason.FOCUSENTERED:
 		# Aside from excluding some properties, focus entered should be spoken like focus.
@@ -747,7 +747,7 @@ def getObjectSpeech(
 	return sequence
 
 
-def _objectSpeech_calculateAllowedProps(reason, shouldReportTextContent):
+def _objectSpeech_calculateAllowedProps(reason, shouldReportTextContent, objRole):
 	allowProperties = {
 		'name': True,
 		'role': True,
@@ -776,7 +776,8 @@ def _objectSpeech_calculateAllowedProps(reason, shouldReportTextContent):
 	}
 	if reason in (OutputReason.FOCUSENTERED, OutputReason.MOUSE):
 		allowProperties["value"] = False
-		allowProperties["keyboardShortcut"] = False
+		if not objRole == controlTypes.Role.LIST:
+			allowProperties["keyboardShortcut"] = False
 		allowProperties["positionInfo_level"] = False
 	if reason == OutputReason.MOUSE:
 		# Name is often part of the text content when mouse tracking.
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -36,7 +36,7 @@ Users of Poedit 1 are encouraged to update to Poedit 3 if they want to rely on e
 -
 
 == Bug Fixes ==
-- Reporting of object shortcut keys has been improved. (#10807, @CyrilleB79)
+- Reporting of object shortcut keys has been improved. (#10807, #15816, @CyrilleB79)
 - The SAPI4 synthesizer now properly supports volume, rate and pitch changes embedded in speech. (#15271, @LeonarddeR)
 - Multi line state is now correctly reported in applications using Java Access Bridge. (#14609)
 - In 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
`@@ -36,7 +36,7 @@ Users of Poedit 1 are encouraged to update to Poedit 3 if they want to rely on e`
`36`	`36`	`-`
`37`	`37`
`38`	`38`	`== Bug Fixes ==`
`39`		`-- Reporting of object shortcut keys has been improved. (#10807, @CyrilleB79)`
	`39`	`+- Reporting of object shortcut keys has been improved. (#10807, #15816, @CyrilleB79)`
`40`	`40`	`- The SAPI4 synthesizer now properly supports volume, rate and pitch changes embedded in speech. (#15271, @LeonarddeR)`
`41`	`41`	`- Multi line state is now correctly reported in applications using Java Access Bridge. (#14609)`
`42`	`42`	- In 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)