From 0e8ce83eeca5d9627c5320dad50adb8f3037365c Mon Sep 17 00:00:00 2001
From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 10 Dec 2008 03:35:21 +0000
Subject: [PATCH] Need to use accesskey / label pairs for best translate
 toolkit i18n support

git-svn-id: svn://svn.open-ils.org/ILS/trunk@11485 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/opac/locale/en-US/lang.dtd            | 30 +++++++++++-----------
 .../xul/staff_client/chrome/content/main/main.xul  |  2 +-
 .../chrome/content/main/menu_frame_menus.xul       | 26 +++++++++----------
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 4cfc350348..6617b1a6d7 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -175,7 +175,7 @@
 <!ENTITY staff.auth.password_prompt.accesskey "P">
 <!ENTITY staff.auth.password_prompt.key "P">
 <!ENTITY staff.auth.quit_prompt "Exit Evergreen">
-<!ENTITY staff.auth.quit_prompt.key "x">
+<!ENTITY staff.auth.quit_prompt.accesskey "x">
 <!ENTITY staff.auth.submit_prompt "Submit">
 <!ENTITY staff.auth.submit_prompt.key "S">
 <!ENTITY staff.auth.title "Evergreen Staff Client">
@@ -571,7 +571,7 @@
 <!ENTITY staff.main.auth.status "Status">
 <!ENTITY staff.main.auth.version "Version">
 <!ENTITY staff.main.auth.workstation "Workstation">
-<!ENTITY staff.main.menu.acquisitions.key "q">
+<!ENTITY staff.main.menu.acquisitions.accesskey "q">
 <!ENTITY staff.main.menu.acquisitions.label "Acquisitions">
 <!ENTITY staff.main.menu.admin.accesskey "-">
 <!ENTITY staff.main.menu.admin.browse_holds.accesskey "B">
@@ -624,7 +624,7 @@
 <!ENTITY staff.main.menu.cat.add_copy.label "Add Item">
 <!ENTITY staff.main.menu.cat.add_volume.key "V">
 <!ENTITY staff.main.menu.cat.add_volume.label "Add Volume">
-<!ENTITY staff.main.menu.cat.bib_search.key "S">
+<!ENTITY staff.main.menu.cat.bib_search.accesskey "S">
 <!ENTITY staff.main.menu.cat.bib_search.label "Search the Catalog">
 <!ENTITY staff.main.menu.cat.bib_status.key "B">
 <!ENTITY staff.main.menu.cat.bib_status.label "Display Bib Record">
@@ -633,7 +633,7 @@
 <!ENTITY staff.main.menu.cat.copy_status.label "Display Item">
 <!ENTITY staff.main.menu.cat.create_marc.accesskey "N">
 <!ENTITY staff.main.menu.cat.create_marc.label "Create New Marc Record">
-<!ENTITY staff.main.menu.cat.dedup.key "M">
+<!ENTITY staff.main.menu.cat.dedup.accesskey "M">
 <!ENTITY staff.main.menu.cat.dedup.label "Merge and Transfer Interface">
 <!ENTITY staff.main.menu.cat.edit_copy_buckets.accesskey "B">
 <!ENTITY staff.main.menu.cat.edit_copy_buckets.label "Manage Copy Buckets">
@@ -660,9 +660,9 @@
 <!ENTITY staff.main.menu.circ.barcode.retrieve_patron.accesskey "P">
 <!ENTITY staff.main.menu.circ.barcode.show_item "Show Item Status by Barcode">
 <!ENTITY staff.main.menu.circ.barcode.show_item.accesskey "B">
-<!ENTITY staff.main.menu.circ.checkin.key "C">
+<!ENTITY staff.main.menu.circ.checkin.accesskey "C">
 <!ENTITY staff.main.menu.circ.checkin.label "Check In Items">
-<!ENTITY staff.main.menu.circ.checkout.key "O">
+<!ENTITY staff.main.menu.circ.checkout.accesskey "O">
 <!ENTITY staff.main.menu.circ.checkout.label "Check Out Items">
 <!ENTITY staff.main.menu.circ.claimed_returned.key "C">
 <!ENTITY staff.main.menu.circ.claimed_returned.label 'Mark as "Claimed Returned"'>
@@ -672,13 +672,13 @@
 <!ENTITY staff.main.menu.circ.found.label "Mark Found">
 <!ENTITY staff.main.menu.circ.hold_browse.accesskey "B">
 <!ENTITY staff.main.menu.circ.hold_browse.label "Browse Holds Shelf">
-<!ENTITY staff.main.menu.circ.hold_capture.key "H">
+<!ENTITY staff.main.menu.circ.hold_capture.accesskey "H">
 <!ENTITY staff.main.menu.circ.hold_capture.label "Capture Holds">
 <!ENTITY staff.main.menu.circ.hold_pull.accesskey "S">
 <!ENTITY staff.main.menu.circ.hold_pull.label "Pull List for Hold Requests">
 <!ENTITY staff.main.menu.circ.in_house.accesskey "I">
 <!ENTITY staff.main.menu.circ.in_house.label "Record In-House Use">
-<!ENTITY staff.main.menu.circ.key "C">
+<!ENTITY staff.main.menu.circ.accesskey "C">
 <!ENTITY staff.main.menu.circ.label "Circulation">
 <!ENTITY staff.main.menu.circ.lost.key "L">
 <!ENTITY staff.main.menu.circ.lost.label "Mark Lost">
@@ -688,7 +688,7 @@
 <!ENTITY staff.main.menu.circ.missing.label "Mark Missing">
 <!ENTITY staff.main.menu.circ.offline.accesskey "f">
 <!ENTITY staff.main.menu.circ.offline.label "Enter Offline Interface">
-<!ENTITY staff.main.menu.circ.patron_registration.key "R">
+<!ENTITY staff.main.menu.circ.patron_registration.accesskey "R">
 <!ENTITY staff.main.menu.circ.patron_registration.label "Register Patron">
 <!ENTITY staff.main.menu.circ.patron_retrieve.accesskey "L">
 <!ENTITY staff.main.menu.circ.patron_retrieve.label "Retrieve Last Patron">
@@ -727,7 +727,7 @@
 <!ENTITY staff.main.menu.edit.find.label "Find">
 <!ENTITY staff.main.menu.edit.find_again.key "g">
 <!ENTITY staff.main.menu.edit.find_again.label "Find Again">
-<!ENTITY staff.main.menu.edit.key "E">
+<!ENTITY staff.main.menu.edit.accesskey "E">
 <!ENTITY staff.main.menu.edit.label "Edit">
 <!ENTITY staff.main.menu.edit.paste.key "P">
 <!ENTITY staff.main.menu.edit.paste.label "Paste">
@@ -752,17 +752,17 @@
 <!ENTITY staff.main.menu.file.close_tab.accesskey "C">
 <!ENTITY staff.main.menu.file.close_tab.key "">
 <!ENTITY staff.main.menu.file.close_tab.label "Close Tab">
-<!ENTITY staff.main.menu.file.key "F">
+<!ENTITY staff.main.menu.file.accesskey "F">
 <!ENTITY staff.main.menu.file.label "File">
-<!ENTITY staff.main.menu.file.new.key "N">
+<!ENTITY staff.main.menu.file.new.accesskey "N">
 <!ENTITY staff.main.menu.file.new.label "New Window">
-<!ENTITY staff.main.menu.file.new_tab.key "T">
+<!ENTITY staff.main.menu.file.new_tab.accesskey "T">
 <!ENTITY staff.main.menu.file.new_tab.label "New Tab">
 <!ENTITY staff.main.menu.file.open.key "O">
 <!ENTITY staff.main.menu.file.open.label "Open Session">
 <!ENTITY staff.main.menu.file.save.key "S">
 <!ENTITY staff.main.menu.file.save.label "Save Session">
-<!ENTITY staff.main.menu.help.key "H">
+<!ENTITY staff.main.menu.help.accesskey "H">
 <!ENTITY staff.main.menu.help.label "Help">
 <!ENTITY staff.main.menu.quit "Quit Program">
 <!ENTITY staff.main.menu.quit.accesskey "Q">
@@ -773,7 +773,7 @@
 <!ENTITY staff.main.menu.search.catalog.label "Search the Catalog">
 <!ENTITY staff.main.menu.search.copies.accesskey "B">
 <!ENTITY staff.main.menu.search.copies.label "Search for copies by Barcode">
-<!ENTITY staff.main.menu.search.key "r">
+<!ENTITY staff.main.menu.search.accesskey "r">
 <!ENTITY staff.main.menu.search.label "Search">
 <!ENTITY staff.main.menu.search.patrons.accesskey "P">
 <!ENTITY staff.main.menu.search.patrons.label "Search for Patrons">
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.xul b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
index 9fa643eb18..6b307fc9b7 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
@@ -170,7 +170,7 @@
 		<vbox id="progress_space">
 			<progressmeter id="progress_bar" mode="normal" value="0" hidden="true"/>
 		</vbox>
-		<button label="&staff.auth.quit_prompt;" accesskey="&staff.auth.quit_prompt.key;" command="cmd_close_window"/>
+		<button label="&staff.auth.quit_prompt;" accesskey="&staff.auth.quit_prompt.accesskey;" command="cmd_close_window"/>
 		<groupbox id="debug_gb" flex="1" hidden="true">
 			<caption label="&staff.main.auth.debug.caption;"/>
 			<hbox>
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
index 51be3ae46d..427b39fb9b 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
@@ -101,10 +101,10 @@
 
 
 <!-- The File menu on the main menu -->
-<menu id="main.menu.file" label="&staff.main.menu.file.label;" accesskey="&staff.main.menu.file.key;" >
+<menu id="main.menu.file" label="&staff.main.menu.file.label;" accesskey="&staff.main.menu.file.accesskey;" >
 	<menupopup id="main.menu.file.popup">
-		<menuitem label="&staff.main.menu.file.new.label;" accesskey="&staff.main.menu.file.new.key;" key="new-window-key" command="cmd_new_window"/>
-		<menuitem label="&staff.main.menu.file.new_tab.label;" accesskey="&staff.main.menu.file.new_tab.key;" key="new-tab-key" command="cmd_new_tab"/>
+		<menuitem label="&staff.main.menu.file.new.label;" accesskey="&staff.main.menu.file.new.accesskey;" key="new-window-key" command="cmd_new_window"/>
+		<menuitem label="&staff.main.menu.file.new_tab.label;" accesskey="&staff.main.menu.file.new_tab.accesskey;" key="new-tab-key" command="cmd_new_tab"/>
 		<menuseparator />
 		<menuitem label="&staff.main.menu.file.close_tab.label;" accesskey="&staff.main.menu.file.close_tab.accesskey;" oldaccesskey="&staff.main.menu.file.close_tab.key;" key="close-tab-key" command="cmd_close_tab"/>
 		<menuitem label="&staff.main.menu.tabs.close;" accesskey="&staff.main.menu.tabs.close.accesskey;" key="close-all-tabs-key" command="cmd_close_all_tabs"/>
@@ -115,7 +115,7 @@
 </menu>
 
 <!-- The Edit menu on the main menu -->
-<menu id="main.menu.edit" label="&staff.main.menu.edit.label;" accesskey="&staff.main.menu.edit.key;">
+<menu id="main.menu.edit" label="&staff.main.menu.edit.label;" accesskey="&staff.main.menu.edit.accesskey;">
 	<menupopup id="main.menu.edit.popup">
 		<menuitem label="&staff.main.menu.edit.buckets.copies;" command="cmd_edit_copy_buckets" accesskey="&staff.main.menu.edit.buckets.copies.accesskey;"/>
 		<menuitem label="&staff.main.menu.edit.buckets.volumes;" command="cmd_edit_volume_buckets" accesskey="&staff.main.menu.edit.buckets.volumes.accesskey;"/>
@@ -127,14 +127,14 @@
 </menu>
 
 <!-- The Circulation menu on the main menu -->
-<menu id="main.menu.circ" label="&staff.main.menu.circ.label;" accesskey="&staff.main.menu.circ.key;">
+<menu id="main.menu.circ" label="&staff.main.menu.circ.label;" accesskey="&staff.main.menu.circ.accesskey;">
 	<menupopup id="main.menu.circ.popup">
-		<menuitem label="&staff.main.menu.circ.checkout.label;" accesskey="&staff.main.menu.circ.checkout.key;" key="circ-checkout-key" command="cmd_circ_checkout"/>
-		<menuitem label="&staff.main.menu.circ.checkin.label;" accesskey="&staff.main.menu.circ.checkin.key;" key="circ-checkin-key" command="cmd_circ_checkin"/>
-		<menuitem label="&staff.main.menu.circ.patron_registration.label;" accesskey="&staff.main.menu.circ.patron_registration.key;" key="patron-register-key" command="cmd_patron_register"/>
+		<menuitem label="&staff.main.menu.circ.checkout.label;" accesskey="&staff.main.menu.circ.checkout.accesskey;" key="circ-checkout-key" command="cmd_circ_checkout"/>
+		<menuitem label="&staff.main.menu.circ.checkin.label;" accesskey="&staff.main.menu.circ.checkin.accesskey;" key="circ-checkin-key" command="cmd_circ_checkin"/>
+		<menuitem label="&staff.main.menu.circ.patron_registration.label;" accesskey="&staff.main.menu.circ.patron_registration.accesskey;" key="patron-register-key" command="cmd_patron_register"/>
 		<menuitem label="&staff.main.menu.circ.patron_retrieve.label;" accesskey="&staff.main.menu.circ.patron_retrieve.accesskey;" command="cmd_retrieve_last_patron" key="retrieve_last_patron_key"/>
 		<menuseparator />
-		<menuitem label="&staff.main.menu.circ.hold_capture.label;" accesskey="&staff.main.menu.circ.hold_capture.key;" key="circ-hold-capture-key" command="cmd_circ_hold_capture"/>
+		<menuitem label="&staff.main.menu.circ.hold_capture.label;" accesskey="&staff.main.menu.circ.hold_capture.accesskey;" key="circ-hold-capture-key" command="cmd_circ_hold_capture"/>
 		<menuitem label="&staff.main.menu.circ.hold_pull.label;" accesskey="&staff.main.menu.circ.hold_pull.accesskey;" command="cmd_circ_hold_pull_list"/>
 		<menuitem label="&staff.main.menu.circ.hold_browse.label;" command="cmd_browse_holds_shelf" accesskey="&staff.main.menu.circ.hold_browse.accesskey;"/>
 		<menuitem label="&staff.main.menu.circ.place_hold.label;" accesskey="&staff.main.menu.circ.place_hold.accesskey;" key="search-opac-key" command="cmd_search_opac"/>
@@ -153,13 +153,13 @@
 <!-- The Cataloging menu on the main menu -->
 <menu id="main.menu.cat" label="&staff.main.menu.cat.label;" accesskey="&staff.main.menu.cat.accesskey;">
 	<menupopup id="main.menu.cat.popup">
-		<menuitem label="&staff.main.menu.cat.bib_search.label;" accesskey="&staff.main.menu.cat.bib_search.key;" key="search-opac-key" command="cmd_search_opac"/>
+		<menuitem label="&staff.main.menu.cat.bib_search.label;" accesskey="&staff.main.menu.cat.bib_search.accesskey;" key="search-opac-key" command="cmd_search_opac"/>
 		<menuitem label="&staff.main.menu.cat.search_tcn.label;" accesskey="&staff.main.menu.cat.search_tcn.accesskey;" key="search-tcn-key" command="cmd_search_tcn" />
 		<menuitem label="&staff.main.menu.cat.search_bib_id.label;" accesskey="&staff.main.menu.cat.search_bib_id.accesskey;" key="search-bib-id-key" command="cmd_search_bib_id" />
 		<menuitem label="&staff.main.menu.cat.copy_status.label;" accesskey="&staff.main.menu.cat.copy_status.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
 		<menuseparator />
 		<!--
-		<menuitem disabled="true" label="&staff.main.menu.cat.dedup.label;" accesskey="&staff.main.menu.cat.dedup.key;" command="cmd_broken"/>
+		<menuitem disabled="true" label="&staff.main.menu.cat.dedup.label;" accesskey="&staff.main.menu.cat.dedup.accesskey;" command="cmd_broken"/>
 		-->
 		<menuitem label="&staff.main.menu.cat.edit_copy_buckets.label;" command="cmd_edit_copy_buckets" accesskey="&staff.main.menu.cat.edit_copy_buckets.accesskey;"/>
 		<menuitem label="&staff.main.menu.cat.edit_volume_buckets.label;" command="cmd_edit_volume_buckets" accesskey="&staff.main.menu.cat.edit_volume_buckets.accesskey;"/>
@@ -175,7 +175,7 @@
 </menu>
 
 <!-- The Search menu on the main menu -->
-<menu id="main.menu.search" label="&staff.main.menu.search.label;" accesskey="&staff.main.menu.search.key;">
+<menu id="main.menu.search" label="&staff.main.menu.search.label;" accesskey="&staff.main.menu.search.accesskey;">
 	<menupopup id="main.menu.search.popup">
 		<menuitem label="&staff.main.menu.search.patrons.label;" accesskey="&staff.main.menu.search.patrons.accesskey;" key="patron-search-key" command="cmd_patron_search" />
 		<menuitem label="&staff.main.menu.search.catalog.label;" accesskey="&staff.main.menu.search.catalog.accesskey;" key="search-opac-key" command="cmd_search_opac" />
@@ -187,7 +187,7 @@
 </menu>
 
 <!-- The Help menu on the main menu -->
-<menu id="main.menu.help" label="&staff.main.menu.help.label;" accesskey="&staff.main.menu.help.key;">
+<menu id="main.menu.help" label="&staff.main.menu.help.label;" accesskey="&staff.main.menu.help.accesskey;">
 	<menupopup id="main.menu.help.popup">
 		<menuitem label="stub" />
 	</menupopup>
-- 
2.11.0