From: Michael Curran <mick@kulgan.net>
Date: Mon, 17 Sep 2012 14:22:23 +0000 (+1000)
Subject: Only automatically report all candidates in a candidate list if the candidate list... 
X-Git-Tag: jpdev130418~571
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d0c1a1c16171a1b057997fa4834ca05ebfa5d116;p=nvdajp%2Fnvdajp.git

Only automatically report all candidates in a candidate list if the candidate list has more than one item. If only 1, it should not be repeated twice. Also place a final comma (,) after the last candidate when automatically reporting to separate it from the further announcement of the actual focused candidate.
---

diff --git a/source/NVDAObjects/behaviors.py b/source/NVDAObjects/behaviors.py
index c7593b12e..f4f48162d 100755
--- a/source/NVDAObjects/behaviors.py
+++ b/source/NVDAObjects/behaviors.py
@@ -381,7 +381,8 @@ class CandidateItem(NVDAObject):
 		while obj and isinstance(obj,CandidateItem) and controlTypes.STATE_INVISIBLE not in obj.states:
 			textList.append(obj.name)
 			obj=obj.next
-		self.visibleCandidateItemsText=", ".join(textList)
+		if len(textList)<=1: return None
+		self.visibleCandidateItemsText=(u", ".join(textList))+u", "
 		return self.visibleCandidateItemsText
 
 class RowWithFakeNavigation(NVDAObject):