NVDA 2021.1 change: Fix misleading log message for aria-current="true"

See nvaccess/nvda#11782
AAClause · Feb 7, 2021 · 95ff2c2 · 95ff2c2
1 parent 818064f
commit 95ff2c2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/addon/globalPlugins/brailleExtender/common.py b/addon/globalPlugins/brailleExtender/common.py
@@ -5,9 +5,17 @@
 import os
 
 import addonHandler
+import controlTypes
 import globalVars
 import languageHandler
 
+def get_is_current_no():
+	if hasattr(controlTypes, "IsCurrent"):
+		return controlTypes.IsCurrent.NO
+	return False
+
+IS_CURRENT_NO = get_is_current_no()
+
 configDir = "%s/brailleExtender" % globalVars.appArgs.configPath
 baseDir = os.path.dirname(__file__)
 addonDir = os.path.join(baseDir, "..", "..")

diff --git a/addon/globalPlugins/brailleExtender/objectpresentation.py b/addon/globalPlugins/brailleExtender/objectpresentation.py
@@ -10,7 +10,7 @@
 from logHandler import log
 
 from . import addoncfg
-from .common import N_, CHOICE_liblouis, CHOICE_none, ADDON_ORDER_PROPERTIES
+from .common import N_, CHOICE_liblouis, CHOICE_none, ADDON_ORDER_PROPERTIES, IS_CURRENT_NO
 from .documentformatting import CHOICES_LABELS, get_report
 from .utils import get_output_reason
 
@@ -149,6 +149,18 @@ def update_NVDAObjectRegion(self):
 	super(braille.NVDAObjectRegion, self).update()
 
 
+def is_current_display_string(current):
+	if hasattr(current, "displayString"):
+		return current.displayString
+	if hasattr(controlTypes, "isCurrentLabels"):
+		try:
+			return controlTypes.isCurrentLabels[current]
+		except KeyError:
+			pass
+	log.debugWarning("Aria-current value not handled: %s" % current)
+	return ''
+
+
 def getPropertiesBraille(**propertyValues) -> str:
 	properties = {}
 	positiveStateLabels = braille.positiveStateLabels
@@ -278,14 +290,9 @@ def getPropertiesBraille(**propertyValues) -> str:
 			cellCoordsText = rowCoordinate
 		elif columnCoordinate:
 			cellCoordsText = columnHeaderText
-	current = propertyValues.get("current", False)
-	if current:
-		try:
-			currentStr = controlTypes.isCurrentLabels[current]
-		except KeyError:
-			log.debugWarning("Aria-current value not handled: %s" % current)
-			currentStr = controlTypes.isCurrentLabels[True]
-		properties["current"] = currentStr
+	isCurrent = propertyValues.get("current", IS_CURRENT_NO)
+	if isCurrent != IS_CURRENT_NO:
+		properties["current"] = is_current_display_string(isCurrent)
 	placeholder = propertyValues.get("placeholder", None)
 	if placeholder:
 		properties["placeholder"] = placeholder

diff --git a/addon/globalPlugins/brailleExtender/patches.py b/addon/globalPlugins/brailleExtender/patches.py
@@ -324,7 +324,7 @@ def getControlFieldBraille(info, field, ancestors, reportStart, formatConfig):
 	states = field.get("states", set())
 	value = field.get('value', None)
 	childControlCount = int(field.get('_childcontrolcount',"0"))
-	current = field.get('current', None)
+	current = field.get("current", IS_CURRENT_NO)
 	placeholder = field.get('placeholder', None)
 	roleText = field.get('roleTextBraille', field.get('roleText'))
 	roleTextPost = None

diff --git a/addon/globalPlugins/brailleExtender/utils.py b/addon/globalPlugins/brailleExtender/utils.py
@@ -25,7 +25,7 @@
 addonHandler.initTranslation()
 import treeInterceptorHandler
 import unicodedata
-from .addoncfg import CHOICE_braille,CHOICE_speech , CHOICE_speechAndBraille
+from .addoncfg import CHOICE_braille, CHOICE_speech, CHOICE_speechAndBraille
 from .common import INSERT_AFTER, INSERT_BEFORE, REPLACE_TEXT, baseDir
 from . import huc
 from . import tabledictionaries