Merge b9455f8 into 69c8c5b

CyrilleB79 · web-flow · commit c5f0c4cb97e0 · 2023-09-24T08:05:17.000+10:00
diff --git a/source/globalCommands.py b/source/globalCommands.py
@@ -255,7 +255,7 @@ def script_toggleRightMouseButton(self,gesture):
 		description=_(
 			# Translators: Input help mode message for report current selection command.
 			"Announces the current selection in edit controls and documents. "
-			"If there is no selection it says so."
+			"Pressing twice spells this information."
 		),
 		category=SCRCAT_SYSTEMCARET,
 		gestures=("kb(desktop):NVDA+shift+upArrow", "kb(laptop):NVDA+shift+s")
@@ -272,7 +272,13 @@ def script_reportCurrentSelection(self,gesture):
 		if not info or info.isCollapsed:
 			speech.speakMessage(_("No selection"))
 		else:
-			speech.speakTextSelected(info.text)
+			scriptCount = scriptHandler.getLastScriptRepeatCount()
+			if scriptCount == 0:
+				speech.speakTextSelected(info.text)
+			elif len(info.text) < speech.speech.MAX_LENGTH_FOR_SELECTION_REPORTING:
+				speech.speakSpelling(info.text)
+			else:
+				speech.speakTextSelected(info.text)
 
 	@script(
 		# Translators: Input help mode message for report date and time command.
@@ -3374,8 +3380,11 @@ def script_braille_cycleShowSelection(self, gesture: inputCore.InputGesture) ->
 		ui.message(msg)
 
 	@script(
-		# Translators: Input help mode message for report clipboard text command.
-		description=_("Reports the text on the Windows clipboard"),
+		description=_(
+			# Translators: Input help mode message for report clipboard text command.
+			"Reports the text on the Windows clipboard. "
+			"Pressing twice spells this information."
+		),
 		category=SCRCAT_SYSTEM,
 		gesture="kb:NVDA+c"
 	)
@@ -3389,7 +3398,11 @@ def script_reportClipboardText(self,gesture):
 			ui.message(_("There is no text on the clipboard"))
 			return
 		if len(text) < 1024: 
-			ui.message(text)
+			repeatCount = scriptHandler.getLastScriptRepeatCount()
+			if repeatCount == 0:
+				ui.message(text)
+			elif repeatCount == 1:
+				speech.speakSpelling(text)
 		else:
 			# Translators: If the number of characters on the clipboard is greater than about 1000, it reports this message and gives number of characters on the clipboard.
 			# Example output: The clipboard contains a large portion of text. It is 2300 characters long.
diff --git a/source/speech/speech.py b/source/speech/speech.py
@@ -1016,17 +1016,21 @@ def speakSelectionMessage(
 		speak(seq, symbolLevel=None, priority=priority)
 
 
+MAX_LENGTH_FOR_SELECTION_REPORTING = 512
+
+
 def _getSelectionMessageSpeech(
 		message: str,
 		text: str,
 ) -> SpeechSequence:
-	if len(text) < 512:
+	if len(text) < MAX_LENGTH_FOR_SELECTION_REPORTING:
 		return _getSpeakMessageSpeech(message % text)
 	# Translators: This is spoken when the user has selected a large portion of text.
 	# Example output "1000 characters"
 	numCharactersText = _("%d characters") % len(text)
 	return _getSpeakMessageSpeech(message % numCharactersText)
 
+
 # C901 'speakSelectionChange' is too complex
 # Note: when working on speakSelectionChange, look for opportunities to simplify
 # and move logic out into smaller helper functions.
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -12,7 +12,7 @@ What's New in NVDA
 
 
 == Changes ==
-
+- A second press on the commands to report the clipboard or the selection will now spell the reported information. (#15449)
 
 == Bug Fixes ==
 - Reporting of object shortcut keys has been improved. (#10807)
diff --git a/user_docs/en/userGuide.t2t b/user_docs/en/userGuide.t2t
@@ -213,8 +213,8 @@ The actual commands will not execute while in input help mode.
 || Name | Desktop key | Laptop key | Description |
 | Say all | ``NVDA+downArrow`` | ``NVDA+a`` | Starts reading from the current position, moving it along as it goes |
 | Read current line | ``NVDA+upArrow`` | ``NVDA+l`` | Reads the line. Pressing twice spells the line. Pressing three times spells the line using character descriptions (Alpha, Bravo, Charlie, etc) |
-| Read selection | ``NVDA+shift+upArrow`` | ``NVDA+shift+s`` | Reads any selected text |
-| Read clipboard text | ``NVDA+c`` | ``NVDA+c`` | Reads any text on the clipboard |
+| Read selection | ``NVDA+shift+upArrow`` | ``NVDA+shift+s`` | Reads any selected text. Pressing twice will spell the information |
+| Read clipboard text | ``NVDA+c`` | ``NVDA+c`` | Reads any text on the clipboard. Pressing twice will spell the information |
 
 +++ Reporting location and other information +++[ReportingLocation]
 || Name | Desktop key | Laptop key | Description |
