ti35244

nvdajp · Jul 4, 2015 · ba7b438 · ba7b438
1 parent 8e7047c
commit ba7b438
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/source/NVDAObjects/IAccessible/mscandui.py b/source/NVDAObjects/IAccessible/mscandui.py
@@ -24,11 +24,6 @@ def reportSelectedCandidate(candidateObject,allowDuplicate=False,newList=False):
 		if config.conf["inputComposition"]["autoReportAllCandidates"] and (newList or candidateObject.visibleCandidateItemsText!=oldCandidateItemsText):
 			queueHandler.queueFunction(queueHandler.eventQueue,ui.message,candidateObject.visibleCandidateItemsText)
 		eventHandler.queueEvent("gainFocus",candidateObject)
-		import tones
-		tones.beep(2000,50)
-		from logHandler import log
-		n = candidateObject.name
-		log.info(n)
 
 class BaseCandidateItem(CandidateItemBehavior,IAccessible):
 

diff --git a/source/NVDAObjects/behaviors.py b/source/NVDAObjects/behaviors.py
@@ -355,9 +355,10 @@ class CandidateItem(NVDAObject):
 
 	def getFormattedCandidateName(self,number,candidate):
 		#nvdajp begin
-		if config.conf["keyboard"]["nvdajpEnableKeyEvents"]:
-			import nvdajp_dic
-			c = nvdajp_dic.getJapaneseDiscriminantReading(candidate, forBraille=True)
+		import nvdajp_dic
+		if nvdajp_dic.isJapaneseLocale() and config.conf["keyboard"]["nvdajpEnableKeyEvents"]:
+			fb = (braille.handler.displaySize > 0)
+			c = nvdajp_dic.getJapaneseDiscriminantReading(candidate, forBraille=fb)
 			log.debug(u"{number} {candidate} {c}".format(number=number,candidate=candidate,c=c))
 			if config.conf["language"]["announceCandidateNumber"]:
 				return _(u"{number} {candidate}").format(number=number,candidate=c)