Merge 0598f39 into 5601830

tseykovets · web-flow · commit b36f92f09d24 · 2024-01-02T00:15:19.000Z
diff --git a/source/NVDAObjects/IAccessible/winword.py b/source/NVDAObjects/IAccessible/winword.py
@@ -317,8 +317,11 @@ def script_caret_moveByCell(self, gesture: inputCore.InputGesture) -> None:
 		braille.handler.handleCaretMove(self)
 
 	@script(
-		# Translators: a description for a script
-		description=_("Reports the text of the comment where the system caret is located."),
+		description=_(
+			# Translators: a description for a script
+			"Reports the text of the comment where the system caret is located."
+			" If pressed twice, presents the information in browse mode"
+		),
 		gesture="kb:NVDA+alt+c",
 		category=SCRCAT_SYSTEMCARET,
 		speakOnDemand=True,
@@ -338,7 +341,14 @@ def script_reportCurrentComment(self,gesture):
 					except COMError:
 						break
 					if text:
-						ui.message(text)
+						if repeats == 0:
+							ui.message(text)
+						elif repeats == 1:
+							ui.browseableMessage(
+								text,
+								# Translators: title for Word comment dialog.
+								_("Comment")
+							)
 						return
 		# Translators: a message when there is no comment to report in Microsoft Word
 		ui.message(_("No comments"))
diff --git a/source/NVDAObjects/UIA/wordDocument.py b/source/NVDAObjects/UIA/wordDocument.py
@@ -598,16 +598,27 @@ def _caretMoveBySentenceHelper(self, gesture, direction):
 
 	@script(
 		gesture="kb:NVDA+alt+c",
-		# Translators: a description for a script that reports the comment at the caret.
-		description=_("Reports the text of the comment where the system caret is located."),
+		description=_(
+			# Translators: a description for a script that reports the comment at the caret.
+			"Reports the text of the comment where the system caret is located."
+			" If pressed twice, presents the information in browse mode"
+		),
 		category=SCRCAT_SYSTEMCARET,
 		speakOnDemand=True,
 	)
 	def script_reportCurrentComment(self,gesture):
 		caretInfo=self.makeTextInfo(textInfos.POSITION_CARET)
 		commentInfo = getCommentInfoFromPosition(caretInfo)
 		if commentInfo is not None:
-			ui.message(getPresentableCommentInfoFromPosition(commentInfo))
+			text = getPresentableCommentInfoFromPosition(commentInfo)
+			if repeats == 0:
+				ui.message(text)
+			elif repeats == 1:
+				ui.browseableMessage(
+					text,
+					# Translators: title for Word comment dialog.
+					_("Comment")
+				)
 		else:
 			# Translators: a message when there is no comment to report in Microsoft Word
 			ui.message(_("No comments"))
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -10,6 +10,10 @@ What's New in NVDA
 
 
 == Changes ==
+- Microsoft Office:
+  - When the command to report the text of the Word comment where the System caret is located is pressed twice  (``NVDA+alt+c``), the information is presented browse mode.
+  -
+-
 
 
 == Bug Fixes ==
diff --git a/user_docs/en/userGuide.t2t b/user_docs/en/userGuide.t2t
@@ -1212,7 +1212,8 @@ The Elements List can list headings, links, annotations (which includes comments
 
 +++ Reporting Comments +++[WordReportingComments]
 %kc:beginInclude
-To report any comments at the current caret position, press NVDA+alt+c.
+To report any comments at the current caret position, press ``NVDA+alt+c``.
+Pressing twice shows the information in a window.
 %kc:endInclude
 All comments for the document, along with other tracked changes, can also be listed in the NVDA Elements List  when selecting Annotations as the type.
 
