From 74a89933dcb2ba192c2b96185ada4c4645afe6f0 Mon Sep 17 00:00:00 2001
From: abaevbog <bogdan@zotero.org>
Date: Thu, 12 Sep 2024 03:28:44 -0700
Subject: [PATCH] VPAT: minor settings tweaks  (#4680)

* vpat: add more aria-labels to preferences btns

Per the VPAT review. "Add"/"Remove" instead of +/- as those
are not descriptive enough

* vpat: wrap radiogroup in a groupbox with label

That is so that the "Color scheme" label is not announced
as a description, which requires a specific setting
enabled in JAWS.

* vpat: link itemPaneHeader prefs labels to menus
---
 .../preferences/preferences_general.xhtml     | 23 ++++++++++---------
 chrome/locale/en-US/zotero/preferences.ftl    |  2 ++
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences_general.xhtml b/chrome/content/zotero/preferences/preferences_general.xhtml
index 191b8ceab6..58403d7d77 100644
--- a/chrome/content/zotero/preferences/preferences_general.xhtml
+++ b/chrome/content/zotero/preferences/preferences_general.xhtml
@@ -27,15 +27,16 @@
 		<groupbox aria-labelledby="preferences-appearance-title">
 			<label><html:h2 id="preferences-appearance-title" data-l10n-id="preferences-appearance-title"/></label>
 		
-			<hbox align="center">
-				<label id="color-scheme-label" data-l10n-id="preferences-color-scheme"/>
-				<!-- aria-describedby set on individual radio buttons because voiceover won't announce it if set on radiogroup-->
-				<radiogroup orient="horizontal" id="color-scheme" preference="browser.theme.toolbar-theme">
-					<radio data-l10n-id="preferences-color-scheme-auto" value="2" aria-describedby="color-scheme-label"/>
-					<radio data-l10n-id="preferences-color-scheme-light" value="1" aria-describedby="color-scheme-label"/>
-					<radio data-l10n-id="preferences-color-scheme-dark" value="0" aria-describedby="color-scheme-label"/>
-				</radiogroup>
-			</hbox>
+			<groupbox aria-labelledby="color-scheme-label">
+				<hbox align="center">
+					<label id="color-scheme-label" data-l10n-id="preferences-color-scheme"/>
+					<radiogroup orient="horizontal" id="color-scheme" preference="browser.theme.toolbar-theme">
+						<radio data-l10n-id="preferences-color-scheme-auto" value="2"/>
+						<radio data-l10n-id="preferences-color-scheme-light" value="1"/>
+						<radio data-l10n-id="preferences-color-scheme-dark" value="0"/>
+					</radiogroup>
+				</hbox>
+			</groupbox>
 		
 			<hbox align="center">
 				<label value="&zotero.bibliography.locale.label;" control="locale-menu"/>
@@ -60,7 +61,7 @@
 
 			<vbox id="item-pane-header-bib-entry-options" class="indented-pref">
 				<hbox align="center">
-					<label data-l10n-id="preferences-item-pane-header-style"/>
+					<label data-l10n-id="preferences-item-pane-header-style" control="item-pane-header-style-menu"/>
 					<menulist
 							id="item-pane-header-style-menu"
 							preference="extensions.zotero.itemPaneHeader.bibEntry.style"
@@ -70,7 +71,7 @@
 				</hbox>
 
 				<hbox align="center">
-					<label data-l10n-id="preferences-item-pane-header-locale"/>
+					<label data-l10n-id="preferences-item-pane-header-locale" control="item-pane-header-locale-menu"/>
 					<menulist
 							id="item-pane-header-locale-menu"
 							preference="extensions.zotero.itemPaneHeader.bibEntry.locale"
diff --git a/chrome/locale/en-US/zotero/preferences.ftl b/chrome/locale/en-US/zotero/preferences.ftl
index 749fd70c7c..f4b1f2f751 100644
--- a/chrome/locale/en-US/zotero/preferences.ftl
+++ b/chrome/locale/en-US/zotero/preferences.ftl
@@ -66,9 +66,11 @@ preferences-quickCopy-plus =
 
 preferences-styleManager-delete-button =
     .tooltiptext = Delete the selected style
+    .aria-label = { general-remove }
     .label = { $label }
 preferences-styleManager-add-button =
     .tooltiptext = Add a style from a file
+    .aria-label = { general-add }
     .label = { $label }
 
 preferences-advanced-enable-local-api =