Merge 34ded1f into 1af8775

Nardol · web-flow · commit d66cc3b6b992 · 2019-08-01T18:04:42.000Z
diff --git a/cldrDict_sconscript b/cldrDict_sconscript
@@ -30,7 +30,8 @@ def createCLDRAnnotationsDict(sources, dest):
 	with codecs.open(dest, "w", "utf_8_sig", errors="replace") as dictFile:
 		dictFile.write(u"symbols:\r\n")
 		for pattern, description in cldrDict.items():
-			dictFile.write(u"{pattern}\t{description}\tsome\r\n".format(
+			# Punctuations are set to none for CLDR characters to be pronounced even if user set punctuation level to None
+			dictFile.write(u"{pattern}\t{description}\tnone\r\n".format(
 				pattern=pattern,
 				description=description
 			))
diff --git a/source/globalCommands.py b/source/globalCommands.py
@@ -2278,6 +2278,24 @@ def script_recognizeWithUwpOcr(self, gesture):
 	# Translators: Describes a command.
 	script_recognizeWithUwpOcr.__doc__ = _("Recognizes the content of the current navigator object with Windows 10 OCR")
 
+	@script(
+		# Translators: Input help mode message for toggle report CLDR command.
+		description=_("Toggles on and off the reporting of CLDR characters, such as emojis"),
+		# gesture="kb:NVDA+shift+p",
+		category=SCRCAT_SPEECH,
+	)
+	def script_toggleReportCLDR(self, gesture):
+		if config.conf["speech"]["includeCLDR"]:
+			# Translators: presented when the report CLDR is toggled.
+			state = _("report CLDR characters off")
+			config.conf["speech"]["includeCLDR"] = False
+		else:
+			# Translators: presented when the report CLDR is toggled.
+			state = _("report CLDR characters on")
+			config.conf["speech"]["includeCLDR"] = True
+		characterProcessing.clearSpeechSymbols()
+		ui.message(state)
+
 	__gestures = {
 		# Basic
 		"kb:NVDA+n": "showGui",
diff --git a/user_docs/en/userGuide.t2t b/user_docs/en/userGuide.t2t
@@ -1113,7 +1113,10 @@ This option applies to all synthesizers, not just the currently active synthesiz
 On by default, this option tells NVDA if the current voice's language can be trusted when processing symbols and characters.
 If you find that NVDA is reading punctuation in the wrong language for a particular synthesizer or voice, you may wish to turn this off to force NVDA to use its global language setting instead.
 
+%kc:setting
 ==== Include Unicode Consortium data (including emoji) when processing characters and symbols ====[SpeechSettingsCLDR]
+Key: shift+NVDA+p
+
 When this checkbox is enabled, NVDA will include additional symbol pronunciation dictionaries when pronouncing characters and symbols.
 These dictionaries contain descriptions for symbols (particularly emoji) that are provided by the [Unicode Consortium http://www.unicode.org/consortium/] as part of their [Common Locale Data Repository http://cldr.unicode.org/].
 If you want NVDA to speak descriptions of emoji characters based on this data, you should enable this option.
