From 0077c3f07a2f0fa1fb0e2568f25aa8b598b9074a Mon Sep 17 00:00:00 2001
From: Bogdan Abaev <bogdan@zotero.org>
Date: Tue, 23 Apr 2024 08:47:42 -0400
Subject: [PATCH] post vpat 57: revert layout changes to locator

Locator type dropdown just has aria-label "Locator type".
The locator input is labelled by a hidden label with "Locator input"
string, as well as the locator type. That way both are announced
when it is focused.

Fixes: #4039
---
 .../zotero/integration/addCitationDialog.xhtml        | 11 ++++-------
 chrome/locale/en-US/zotero/zotero.ftl                 |  5 +++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/chrome/content/zotero/integration/addCitationDialog.xhtml b/chrome/content/zotero/integration/addCitationDialog.xhtml
index 2cdc39c8d9..e0487e4d87 100644
--- a/chrome/content/zotero/integration/addCitationDialog.xhtml
+++ b/chrome/content/zotero/integration/addCitationDialog.xhtml
@@ -111,15 +111,12 @@
 			</vbox>
 			<separator flex="4"/>
 			<vbox flex="1">
-				<hbox align="center">
-					<label data-l10n-id="quickformat-locator-type" control="label"></label>
-					<menulist onchange="Zotero_Citation_Dialog.confirmRegenerate(true)" id="label" tabindex="0" native="true">
+				<hbox align="stretch">
+					<menulist onchange="Zotero_Citation_Dialog.confirmRegenerate(true)" id="label" tabindex="0" native="true" data-l10n-id="quickformat-locator-type">
 						<menupopup id="locator-type-popup"/>
 					</menulist>
-				</hbox>
-				<hbox align="center">
-					<label data-l10n-id="quickformat-locator-value" control="locator"></label>
-					<html:input oninput="Zotero_Citation_Dialog.confirmRegenerate(false)" onchange="Zotero_Citation_Dialog.confirmRegenerate(true)" id="locator" tabindex="0"/>
+					<label id="locator_input_label" data-l10n-id="quickformat-locator-value" hidden="true"></label>
+					<html:input aria-labelledby="label locator_input_label" oninput="Zotero_Citation_Dialog.confirmRegenerate(false)"  onchange="Zotero_Citation_Dialog.confirmRegenerate(true)" id="locator" tabindex="0"/>
 				</hbox>
 				<separator style="height: 2px" flex="1"/>
 				<checkbox oncommand="Zotero_Citation_Dialog.confirmRegenerate(true)" id="suppress-author" label="&zotero.citation.suppressAuthor.label;" tabindex="0" native="true"/>
diff --git a/chrome/locale/en-US/zotero/zotero.ftl b/chrome/locale/en-US/zotero/zotero.ftl
index 0839777ea6..e9d41c7442 100644
--- a/chrome/locale/en-US/zotero/zotero.ftl
+++ b/chrome/locale/en-US/zotero/zotero.ftl
@@ -482,8 +482,9 @@ quickformat-aria-input = Type to search for an item to include in this citation.
 quickformat-aria-item = Press { return-or-enter } to add this item to the citation. Press Tab to go back to the search field.
 quickformat-accept = 
     .tooltiptext = Save edits to this citation
-quickformat-locator-type = Locator type:
-quickformat-locator-value = Locator value:
+quickformat-locator-type =
+    .aria-label = Locator type
+quickformat-locator-value =  Locator input
 
 insert-note-aria-input = Type to search for a note. Press Tab to navigate the list of results. Press Escape to close the dialog.
 insert-note-aria-item = Press { return-or-enter } to select this note. Press Tab to go back to the search field. Press Escape to close the dialog.