Once more, with feeling and the dang patch :)
On 27/07/07, Dan Scott <[EMAIL PROTECTED]> wrote:
> Hi:
>
> Taking this one step at a time, I'll move the remaining hard-coded
> strings from main/*.xul into lang.dtd.
>
> I've also followed the same ${locale} approach for the remote XUL
> files rather than having the en-US hard-coded into the XUL files
> themselves -- although at the moment we don't really have a good way
> of serving up a different locale anyways. Accordingly, I've included a
> modification to eg_vhost.conf.
>
> lang.dtd is getting very big. To try to make it a bit easier to work
> with, I've sorted the bulk of the UI entity definitions as seemed to
> be the general intent (a few had fallen out of order) so the diffs in
> this patch are a little more than absolutely necessary; sorry about
> that.
>
> If someone could eyeball & test this before committing, it would be
> greatly appreciated. I ran into some problems trying to run the staff
> client this evening against a clean SVN trunk, but at least got the
> same errors after applying my patch (basically, authentication is
> failing for me at the moment... sigh).
>
> Developer's Certificate of Origin 1.1 By making a contribution to this
> project, I certify that:
> (a) The contribution was created in whole or in part by me and I have
> the right to submit it under the open source license indicated in the
> file; or
> (b) The contribution is based upon previous work that, to the best of
> my knowledge, is covered under an appropriate open source license and
> I have the right under that license to submit that work with
> modifications, whether created in whole or in part by me, under the
> same open source license (unless I am permitted to submit under a
> different license), as indicated in the file; or
> (c) The contribution was provided directly to me by some other person
> who certified (a), (b) or (c) and I have not modified it; and
> (d) In the case of each of (a), (b), or (c), I understand and agree
> that this project and the contribution are public and that a record of
> the contribution (including all personal information I submit with it,
> including my sign-off) is maintained indefinitely and may be
> redistributed consistent with this project or the open source license
> indicated in the file.
>
> --
> Dan Scott
> Laurentian University
>
--
Dan Scott
Laurentian University
Index: Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul
===================================================================
--- Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul
(revision 7609)
+++ Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul
(working copy)
@@ -11,7 +11,7 @@
<!--
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-->
<!-- LOCALIZATION -->
<!DOCTYPE window PUBLIC "" ""[
- <!--#include virtual="/opac/locale/en-US/lang.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
]>
<!--
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-->
@@ -131,26 +131,26 @@
<vbox id="simple_auth_main" flex="1">
<groupbox id="desc" hidden="true">
- <caption label="Exception"/>
+ <caption label="&staff.main.simple_auth.exception.label;"/>
<description id="desc_brief" style="color: red"/>
<description id="desc_full"/>
</groupbox>
<groupbox>
- <caption label="Authorization"/>
+ <caption label="&staff.main.simple_auth.authorization.label;"/>
<grid>
<columns><column /><column /></columns>
<rows>
<row>
- <label value="Username:"
control="username" accesskey="U"/>
+ <label value="&common.username.label;"
control="username" accesskey="U"/>
<textbox id="username" />
</row>
<row>
- <label value="Password:"
control="password" accesskey="P"/>
+ <label
value="&staff.auth.password_prompt;" control="password" accesskey="P"/>
<textbox id="password" type="password"/>
</row>
<row>
- <button label="Cancel" accesskey="C"
oncommand="window.close()"/>
- <button label="Authorize" accesskey="A"
oncommand="authorize()"/>
+ <button label="&common.cancel;"
accesskey="C" oncommand="window.close()"/>
+ <button
label="&staff.main.simple_auth.authorize.label;" accesskey="A"
oncommand="authorize()"/>
</row>
</rows>
</grid>
Index: Open-ILS/xul/staff_client/chrome/content/main/test.xul
===================================================================
--- Open-ILS/xul/staff_client/chrome/content/main/test.xul (revision 7609)
+++ Open-ILS/xul/staff_client/chrome/content/main/test.xul (working copy)
@@ -8,6 +8,9 @@
<!--
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-->
<!-- LOCALIZATION -->
+<!DOCTYPE window PUBLIC "" ""[
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+]>
<!--
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
-->
<!-- OVERLAYS -->
@@ -15,7 +18,7 @@
<window id="example_template_win"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";>
- <label value="Hello World" />
+ <label value="&staff.main.test.example_template.label;" />
</window>
Index: Open-ILS/xul/staff_client/chrome/content/main/main.xul
===================================================================
--- Open-ILS/xul/staff_client/chrome/content/main/main.xul (revision 7609)
+++ Open-ILS/xul/staff_client/chrome/content/main/main.xul (working copy)
@@ -79,7 +79,7 @@
<!-- CONTENT -->
<deck id="main_deck" flex="1">
<groupbox id="main_groupbox" flex="1" style="overflow: auto;">
- <caption id="main_caption" label="Startup / Shutdown"/>
+ <caption id="main_caption" label="&staff.main.auth.caption;"/>
<hbox>
<label id="version_label"/>
<button id="about_btn"/>
@@ -91,23 +91,23 @@
<rows flex="1">
<row flex="1">
<groupbox flex="1">
- <caption label="Server"/>
+ <caption label="&staff.main.auth.server;"/>
<grid>
<columns><column /><column /></columns>
<rows>
<row>
- <label value="Hostname"
control="server_prompt" accesskey="H"/>
+ <label
value="&staff.main.auth.hostname;" control="server_prompt" accesskey="H"/>
<vbox>
<textbox
id="server_prompt"/>
- <button label="Re-Test
Server" id="retest" accesskey="R" command="cmd_test_server"/>
+ <button
label="&staff.main.auth.retest;" id="retest" accesskey="R"
command="cmd_test_server"/>
</vbox>
</row>
<row>
- <label value="Status"/>
+ <label
value="&staff.main.auth.status;"/>
<label id="status" />
</row>
<row>
- <label value="Version"/>
+ <label
value="&staff.main.auth.version;"/>
<label id="version" />
</row>
</rows>
@@ -115,7 +115,7 @@
</groupbox>
<groupbox flex="1">
- <caption label="Workstation"/>
+ <caption label="&staff.main.auth.workstation;"/>
<deck id="ws_deck" flex="1">
</deck>
</groupbox>
@@ -123,20 +123,20 @@
</row>
<row flex="1">
<groupbox flex="1">
- <caption label="Authentication"/>
+ <caption label="&staff.main.auth.caption;"/>
<grid>
<columns> <column /> <column /> </columns>
<rows>
- <row> <label value="Username"
control="name_prompt" accesskey="U"/> <textbox id="name_prompt" value=""/>
+ <row> <label value="&common.username;"
control="name_prompt" accesskey="U"/> <textbox id="name_prompt" value=""/>
</row>
<row>
- <label value="Password"
control="password_prompt" accesskey="P"/>
+ <label
value="&common.password;" control="password_prompt" accesskey="P"/>
<textbox id="password_prompt"
value="" type="password"/>
</row>
<row>
<spacer />
<hbox>
- <button
id="submit_button" label="Login" accesskey="L" command="cmd_login" />
+ <button
id="submit_button" label="&common.login;" accesskey="L" command="cmd_login" />
<button
label="&staff.auth.logoff_prompt;" accesskey="f" command="cmd_logoff" />
</hbox>
</row>
@@ -145,10 +145,10 @@
</groupbox>
<groupbox flex="1">
- <caption label="Offline Use"/>
- <hbox><button label="Standalone Interface"
accesskey="S" command="cmd_standalone"/></hbox>
- <hbox><button label="Export Transactions"
command="cmd_standalone_export"/></hbox>
- <hbox><button label="Import Transactions"
command="cmd_standalone_import"/></hbox>
+ <caption label="&staff.main.auth.offline.caption;"/>
+ <hbox><button
label="&staff.main.auth.offline.interface;" accesskey="S"
command="cmd_standalone"/></hbox>
+ <hbox><button label="&staff.main.auth.offline.export;"
command="cmd_standalone_export"/></hbox>
+ <hbox><button label="&staff.main.auth.offline.import;"
command="cmd_standalone_import"/></hbox>
</groupbox>
</row>
</rows>
@@ -158,10 +158,10 @@
</vbox>
<button label="&staff.auth.quit_prompt;"
accesskey="&staff.auth.quit_prompt.key;" command="cmd_close_window"/>
<groupbox id="debug_gb" flex="1" hidden="true">
- <caption label="Debug Options"/>
+ <caption label="&staff.main.auth.debug.caption;"/>
<hbox>
- <button label="Javascript Console"
accesskey="J" command="cmd_js_console"/>
- <button label="Clear Cache" accesskey="C"
command="cmd_clear_cache"/>
+ <button
label="&staff.main.auth.debug.javascript;" accesskey="J"
command="cmd_js_console"/>
+ <button label="&staff.main.auth.debug.clear;"
accesskey="C" command="cmd_clear_cache"/>
</hbox>
</groupbox>
Index: Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
===================================================================
--- Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
(revision 7609)
+++ Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
(working copy)
@@ -96,77 +96,77 @@
<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"/>
<menuseparator />
<menuitem label="&staff.main.menu.file.close_tab.label;"
accesskey="C" oldaccesskey="&staff.main.menu.file.close_tab.key;"
key="close-tab-key" command="cmd_close_tab"/>
- <menuitem label="Close All Tabs" accesskey="A"
key="close-all-tabs-key" command="cmd_close_all_tabs"/>
+ <menuitem label="&staff.main.menu.tabs.close;" accesskey="A"
key="close-all-tabs-key" command="cmd_close_all_tabs"/>
<menuitem label="&staff.main.menu.file.close.label;"
accesskey="W" oldaccesskey="&staff.main.menu.file.close.key;"
key="close-window-key" command="cmd_close_window"/>
<menuseparator />
- <menuitem label="Quit Program" accesskey="Q"
command="cmd_shutdown"/>
+ <menuitem label="&staff.main.menu.quit;" accesskey="Q"
command="cmd_shutdown"/>
</menupopup>
</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;">
<menupopup id="main.menu.edit.popup">
- <menuitem label="Copy Buckets" command="cmd_edit_copy_buckets"
accesskey="B"/>
- <menuitem label="Volume Buckets" command="cmd_broken"
accesskey="V"/>
- <menuitem label="Record Buckets"
command="cmd_edit_record_buckets" accesskey="R"/>
+ <menuitem label="&staff.main.menu.edit.buckets.copies;"
command="cmd_edit_copy_buckets" accesskey="B"/>
+ <menuitem label="&staff.main.menu.edit.buckets.volumes;"
command="cmd_broken" accesskey="V"/>
+ <menuitem label="&staff.main.menu.edit.buckets.records;"
command="cmd_edit_record_buckets" accesskey="R"/>
<menuseparator />
- <menuitem label="Replace Barcode"
command="cmd_replace_barcode"/>
+ <menuitem label="&staff.main.menu.replace_barcode.label;"
command="cmd_replace_barcode"/>
</menupopup>
</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;">
<menupopup id="main.menu.circ.popup">
- <menuitem label="Check Out Items"
accesskey="&staff.main.menu.circ.checkout.key;" key="circ-checkout-key"
command="cmd_circ_checkout"/>
- <menuitem label="Check In Items"
accesskey="&staff.main.menu.circ.checkin.key;" key="circ-checkin-key"
command="cmd_circ_checkin"/>
+ <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="Retrieve Last Patron" accesskey="L"
command="cmd_retrieve_last_patron" key="retrieve_last_patron_key"/>
+ <menuitem label="&staff.main.menu.circ.patron_retrieve.label;"
accesskey="L" command="cmd_retrieve_last_patron"
key="retrieve_last_patron_key"/>
<menuseparator />
- <menuitem label="Capture Holds"
accesskey="&staff.main.menu.circ.hold_capture.key;" key="circ-hold-capture-key"
command="cmd_circ_hold_capture"/>
- <menuitem label="Pull List for Hold Requests" accesskey="S"
command="cmd_circ_hold_pull_list"/>
- <menuitem label="Browse Holds Shelf"
command="cmd_browse_holds_shelf" accesskey="B"/>
- <menuitem label="Place Hold" accesskey="H"
key="search-opac-key" command="cmd_search_opac"/>
+ <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_pull.label;"
accesskey="S" command="cmd_circ_hold_pull_list"/>
+ <menuitem label="&staff.main.menu.circ.hold_browse.label;"
command="cmd_browse_holds_shelf" accesskey="B"/>
+ <menuitem label="&staff.main.menu.circ.place_hold.label;"
accesskey="H" key="search-opac-key" command="cmd_search_opac"/>
<menuseparator />
- <menuitem label="Show Item Status by Barcode" accesskey="B"
key="copy-status-key" command="cmd_copy_status"/>
- <menuitem label="Retrieve Patron by Barcode" accesskey="P"
key="circ-checkout-key" command="cmd_circ_checkout"/>
- <menuitem label="Replace Barcode"
command="cmd_replace_barcode"/>
- <menuitem label="Record In-House Use" accesskey="I"
key="circ-in-house-use-key" command="cmd_in_house_use"/>
+ <menuitem label="&staff.main.menu.circ.barcode.show_item;"
accesskey="B" key="copy-status-key" command="cmd_copy_status"/>
+ <menuitem
label="&staff.main.menu.circ.barcode.retrieve_patron;" accesskey="P"
key="circ-checkout-key" command="cmd_circ_checkout"/>
+ <menuitem label="&staff.main.menu.barcode.replace;"
command="cmd_replace_barcode"/>
+ <menuitem label="&staff.main.menu.circ.in_house.label;"
accesskey="I" key="circ-in-house-use-key" command="cmd_in_house_use"/>
<menuseparator />
- <menuitem label="Re-Print Last" accesskey="L"
command="cmd_reprint"/>
- <menuitem label="Enter Offline Interface"
command="cmd_standalone" accesskey="f"/>
+ <menuitem label="&staff.main.menu.circ.reprint.label;"
accesskey="L" command="cmd_reprint"/>
+ <menuitem label="&staff.main.menu.circ.offline.label;"
command="cmd_standalone" accesskey="f"/>
</menupopup>
</menu>
<!-- The Cataloging menu on the main menu -->
-<menu id="main.menu.cat" label="Cataloging" accesskey="g">
+<menu id="main.menu.cat" label="&staff.main.menu.cat.label;" accesskey="g">
<menupopup id="main.menu.cat.popup">
- <menuitem label="Search the Catalog"
accesskey="&staff.main.menu.cat.bib_search.key;" key="search-opac-key"
command="cmd_search_opac"/>
- <menuitem label="Retrieve record by TCN" accesskey="T"
key="search-tcn-key" command="cmd_search_tcn" />
- <menuitem label="Show Copy Status by Barcode" accesskey="B"
key="copy-status-key" command="cmd_copy_status"/>
+ <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.search_tcn.label;"
accesskey="T" key="search-tcn-key" command="cmd_search_tcn" />
+ <menuitem label="&staff.main.menu.cat.copy_status.label;"
accesskey="B" 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 label="Manage Copy Buckets"
command="cmd_edit_copy_buckets" accesskey="B"/>
- <menuitem label="Manage Volume Buckets" command="cmd_broken"
accesskey="V"/>
- <menuitem label="Manage Record Buckets"
command="cmd_edit_record_buckets" accesskey="R"/>
+ <menuitem label="&staff.main.menu.cat.edit_copy_buckets.label;"
command="cmd_edit_copy_buckets" accesskey="B"/>
+ <menuitem
label="&staff.main.menu.cat.edit_volume_buckets.label;" command="cmd_broken"
accesskey="V"/>
+ <menuitem
label="&staff.main.menu.cat.edit_record_buckets.label;"
command="cmd_edit_record_buckets" accesskey="R"/>
<menuseparator />
- <menuitem label="Create New Marc Record" accesskey="N"
command="cmd_create_marc"/>
- <menuitem label="Import Record from Z39.50" accesskey="Z"
command="cmd_z39_50_import"/>
+ <menuitem label="&staff.main.menu.cat.create_marc.label;"
accesskey="N" command="cmd_create_marc"/>
+ <menuitem label="&staff.main.menu.cat.z39_50_import.label;"
accesskey="Z" command="cmd_z39_50_import"/>
<menuseparator />
- <menuitem label="Replace Barcode"
command="cmd_replace_barcode"/>
- <menuitem label="Retrieve Last Record" accesskey="L"
command="cmd_retrieve_last_record" key="retrieve_last_record_key"/>
+ <menuitem label="&staff.main.menu.replace_barcode.label;"
command="cmd_replace_barcode"/>
+ <menuitem
label="&staff.main.menu.cat.retrieve_last_record.label;" accesskey="L"
command="cmd_retrieve_last_record" key="retrieve_last_record_key"/>
</menupopup>
</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;">
<menupopup id="main.menu.search.popup">
- <menuitem label="for Patrons" accesskey="P"
key="patron-search-key" command="cmd_patron_search" />
- <menuitem label="the Catalog" accesskey="C"
key="search-opac-key" command="cmd_search_opac" />
- <menuitem label="for record by TCN" accesskey="T"
key="search-tcn-key" command="cmd_search_tcn" />
- <menuitem label="for copies by Barcode" accesskey="B"
key="copy-status-key" command="cmd_copy_status"/>
- <menuitem label="for patron by Barcode" accesskey="n"
key="circ-checkout-key" command="cmd_circ_checkout"/>
+ <menuitem label="&staff.main.menu.search.patrons.label;"
accesskey="P" key="patron-search-key" command="cmd_patron_search" />
+ <menuitem label="&staff.main.menu.search.catalog.label;"
accesskey="C" key="search-opac-key" command="cmd_search_opac" />
+ <menuitem label="&staff.main.menu.search.record.label;"
accesskey="T" key="search-tcn-key" command="cmd_search_tcn" />
+ <menuitem label="&staff.main.menu.search.copies.label;"
accesskey="B" key="copy-status-key" command="cmd_copy_status"/>
+ <menuitem
label="&staff.main.menu.search.patrons_barcode.label;" accesskey="n"
key="circ-checkout-key" command="cmd_circ_checkout"/>
</menupopup>
</menu>
@@ -180,33 +180,33 @@
<!-- The Help menu on the main menu -->
<menu id="main.menu.admin" label="&staff.main.menu.admin.label;" accesskey="-"
old_accesskey="&staff.main.menu.admin.key;">
<menupopup id="main.menu.admin.popup">
- <menuitem id="oc_menuitem" label="Operator Change: New"
label_orig="Operator Change: New"
+ <menuitem id="oc_menuitem"
label="&staff.main.menu.admin.change_session.label;"
label_orig="&staff.main.menu.admin.change_session.label;"
accesskey="O" command="cmd_change_session"/>
- <menuitem label="Offline Transaction Management" accesskey="T"
command="cmd_manage_offline_xacts"/>
- <menuitem label="Download Offline Patron List" accesskey="D"
command="cmd_download_patrons"/>
+ <menuitem label="&staff.main.menu.admin.offline_xacts.label;"
accesskey="T" command="cmd_manage_offline_xacts"/>
+ <menuitem
label="&staff.main.menu.admin.download_patrons.label;" accesskey="D"
command="cmd_download_patrons"/>
<menuseparator />
- <menuitem label="Local System Administration" accesskey="L"
command="cmd_local_admin"/>
- <menuitem label="User Permission Editor" accesskey="U"
command="cmd_adv_user_edit"/>
- <menuitem label="Receipt Template Editor" accesskey="R"
command="cmd_print_list_template_edit"/>
- <menuitem label="Survey Wizard" accesskey="S"
command="cmd_survey_wizard"/>
+ <menuitem label="&staff.main.menu.admin.local_admin.label;"
accesskey="L" command="cmd_local_admin"/>
+ <menuitem label="&staff.main.menu.admin.user_edit.label;"
accesskey="U" command="cmd_adv_user_edit"/>
+ <menuitem label="&staff.main.menu.admin.template_edit.label;"
accesskey="R" command="cmd_print_list_template_edit"/>
+ <menuitem label="&staff.main.menu.admin.survey_wizard.label;"
accesskey="S" command="cmd_survey_wizard"/>
<menuseparator />
- <menu id="main.menu.admin.sub" accesskey="-" label="For
developers...">
+ <menu id="main.menu.admin.sub" accesskey="-"
label="&staff.main.menu.admin.developer.label;">
<menupopup id="main.menu.admin.sub.popup">
- <menuitem label="Statistical Category Editor"
accesskey="C" command="cmd_stat_cat_edit"/>
- <menuitem label="Non-Cataloged Type Editor"
accesskey="n" command="cmd_non_cat_type_edit"/>
- <menuitem label="Copy Location Editor"
accesskey="L" command="cmd_copy_location_edit"/>
- <menuitem label="Browse Unfulfilled Holds for
this Pickup Lib" command="cmd_browse_holds" accesskey="B"/>
+ <menuitem
label="&staff.main.menu.admin.stat_cat_edit.label;" accesskey="C"
command="cmd_stat_cat_edit"/>
+ <menuitem
label="&staff.main.menu.admin.non_cat_type_edit.label;" accesskey="n"
command="cmd_non_cat_type_edit"/>
+ <menuitem
label="&staff.main.menu.admin.copy_location_edit.label;" accesskey="L"
command="cmd_copy_location_edit"/>
+ <menuitem
label="&staff.main.menu.admin.browse_holds.label;" command="cmd_browse_holds"
accesskey="B"/>
<menuseparator />
- <menuitem label="Public OPAC"
command="cmd_public_opac" accesskey="p"/>
- <menuitem label="Test Module" old_accesskey="T"
command="cmd_test"/>
- <menuitem label="XUL Test" accesskey="X"
command="cmd_xuleditor"/>
- <menuitem label="Fieldmapper" accesskey="m"
command="cmd_fieldmapper"/>
- <menuitem label="Javscript Console"
accesskey="J" command="cmd_console"/>
- <menuitem label="Javscript Shell" accesskey="H"
command="cmd_shell"/>
+ <menuitem
label="&staff.main.menu.admin.public_opac.label;" command="cmd_public_opac"
accesskey="p"/>
+ <menuitem
label="&staff.main.menu.admin.cmd_test.label;" old_accesskey="T"
command="cmd_test"/>
+ <menuitem
label="&staff.main.menu.admin.xuleditor.label;" accesskey="X"
command="cmd_xuleditor"/>
+ <menuitem
label="&staff.main.menu.admin.fieldmapper.label;" accesskey="m"
command="cmd_fieldmapper"/>
+ <menuitem
label="&staff.main.menu.admin.cmd_console.label;" accesskey="J"
command="cmd_console"/>
+ <menuitem
label="&staff.main.menu.admin.cmd_shell.label;" accesskey="H"
command="cmd_shell"/>
<menuitem label="server/main/test.html"
accesskey="1" command="cmd_test_html"/>
<menuitem label="server/main/test.xul"
accesskey="2" command="cmd_test_xul"/>
- <menuitem label="Clear Cache" accesskey="3"
command="cmd_clear_cache"/>
- <menuitem label="Unhide Tabs"
command="cmd_restore_all_tabs"/>
+ <menuitem
label="&staff.main.menu.admin.clear_cache.label;" accesskey="3"
command="cmd_clear_cache"/>
+ <menuitem
label="&staff.main.menu.admin.restore_all_tabs.label;"
command="cmd_restore_all_tabs"/>
</menupopup>
</menu>
</menupopup>
Index: Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- Open-ILS/web/opac/locale/en-US/lang.dtd (revision 7609)
+++ Open-ILS/web/opac/locale/en-US/lang.dtd (working copy)
@@ -17,6 +17,7 @@
<!ENTITY common.cancel "Cancel">
<!ENTITY common.library "Library">
<!ENTITY common.username "Username">
+<!ENTITY common.username.label "Username:">
<!ENTITY common.password "Password">
<!ENTITY common.submit "Submit">
<!ENTITY common.user_not_found "User not found">
@@ -30,7 +31,6 @@
-
<!ENTITY staff.about.title "About">
<!ENTITY staff.acp_label_barcode "Barcode">
<!ENTITY staff.acp_label_call_number "Call Number">
@@ -408,10 +408,45 @@
<!ENTITY staff.items_out_interface_label "ITEMS OUT">
<!ENTITY staff.javascript_console_label "CONSOLE">
<!ENTITY staff.javascript_shell_label "JS SHELL">
+<!ENTITY staff.main.auth.caption "Authentication">
+<!ENTITY staff.main.auth.caption "Startup / Shutdown">
+<!ENTITY staff.main.auth.debug.caption "Debug Options">
+<!ENTITY staff.main.auth.debug.clear "Clear Cache">
+<!ENTITY staff.main.auth.debug.javascript "Javascript Console">
+<!ENTITY staff.main.auth.hostname "Hostname">
+<!ENTITY staff.main.auth.offline.caption "Offline Use">
+<!ENTITY staff.main.auth.offline.export "Export Transactions">
+<!ENTITY staff.main.auth.offline.import "Import Transactions">
+<!ENTITY staff.main.auth.offline.interface "Standalone Interface">
+<!ENTITY staff.main.auth.retest "Re-Test Server">
+<!ENTITY staff.main.auth.server "Server">
+<!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.label "Acquisitions">
+<!ENTITY staff.main.menu.admin.browse_holds.label "Browse Unfulfilled Holds
for this Pickup Lib">
+<!ENTITY staff.main.menu.admin.change_session.label "Operator Change: New">
+<!ENTITY staff.main.menu.admin.clear_cache.label "Clear Cache">
+<!ENTITY staff.main.menu.admin.cmd_console.label "Javascript Console">
+<!ENTITY staff.main.menu.admin.cmd_shell.label "Javascript Shell">
+<!ENTITY staff.main.menu.admin.cmd_test.label "Test Module">
+<!ENTITY staff.main.menu.admin.copy_location_edit.label "Copy Location Editor">
+<!ENTITY staff.main.menu.admin.developer.label "For developers...">
+<!ENTITY staff.main.menu.admin.download_patrons.label "Download Offline Patron
List">
+<!ENTITY staff.main.menu.admin.fieldmapper.label "Fieldmapper">
<!ENTITY staff.main.menu.admin.key "i">
<!ENTITY staff.main.menu.admin.label "Admin">
+<!ENTITY staff.main.menu.admin.local_admin.label "Local System Administration">
+<!ENTITY staff.main.menu.admin.non_cat_type_edit.label "Non-Cataloged Type
Editor">
+<!ENTITY staff.main.menu.admin.offline_xacts.label "Offline Transaction
Management">
+<!ENTITY staff.main.menu.admin.public_opac.label "Public OPAC">
+<!ENTITY staff.main.menu.admin.restore_all_tabs.label "Unhide Tabs">
+<!ENTITY staff.main.menu.admin.stat_cat_edit.label "Statistical Category
Editor">
+<!ENTITY staff.main.menu.admin.survey_wizard.label "Survey Wizard">
+<!ENTITY staff.main.menu.admin.template_edit.label "Receipt Template Editor">
+<!ENTITY staff.main.menu.admin.user_edit.label "User Permission Editor">
+<!ENTITY staff.main.menu.admin.xuleditor.label "XUL Test">
<!ENTITY staff.main.menu.cat.add_bib.key "B">
<!ENTITY staff.main.menu.cat.add_bib.label "Add Bib Record">
<!ENTITY staff.main.menu.cat.add_copy.key "I">
@@ -419,29 +454,41 @@
<!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.label "Search Catalog">
+<!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">
<!ENTITY staff.main.menu.cat.copy_status.key "I">
<!ENTITY staff.main.menu.cat.copy_status.label "Display Item">
+<!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.label "Merge/Transfer Interface">
+<!ENTITY staff.main.menu.cat.edit_copy_buckets.label "Manage Copy Buckets">
+<!ENTITY staff.main.menu.cat.edit_record_buckets.label "Manage Record Buckets">
+<!ENTITY staff.main.menu.cat.edit_volume_buckets.label "Manage Volume Buckets">
<!ENTITY staff.main.menu.cat.key "a">
<!ENTITY staff.main.menu.cat.label "Cataloging">
+<!ENTITY staff.main.menu.cat.retrieve_last_record.label "Retrieve Last Record">
+<!ENTITY staff.main.menu.cat.search_tcn.label "Retrieve record by TCN">
<!ENTITY staff.main.menu.cat.volume_status.key "V">
<!ENTITY staff.main.menu.cat.volume_status.label "Display Volume">
+<!ENTITY staff.main.menu.cat.z39_50_import.label "Import Record from Z39.50">
+<!ENTITY staff.main.menu.circ.barcode.retrieve_patron "Retrieve Patron by
Barcode">
+<!ENTITY staff.main.menu.circ.barcode.show_item "Show Item Status by Barcode">
<!ENTITY staff.main.menu.circ.checkin.key "C">
-<!ENTITY staff.main.menu.circ.checkin.label "Check In">
+<!ENTITY staff.main.menu.circ.checkin.label "Check In Items">
<!ENTITY staff.main.menu.circ.checkout.key "O">
-<!ENTITY staff.main.menu.circ.checkout.label "Check Out">
+<!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"'>
<!ENTITY staff.main.menu.circ.copy_status.key "I">
<!ENTITY staff.main.menu.circ.copy_status.label "Display Item">
<!ENTITY staff.main.menu.circ.found.key "F">
<!ENTITY staff.main.menu.circ.found.label "Mark Found">
+<!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.label "Capture Holds">
+<!ENTITY staff.main.menu.circ.hold_pull.label "Pull List for Hold Requests">
+<!ENTITY staff.main.menu.circ.in_house.label "Record In-House Use">
<!ENTITY staff.main.menu.circ.key "C">
<!ENTITY staff.main.menu.circ.label "Circulation">
<!ENTITY staff.main.menu.circ.lost.key "L">
@@ -450,8 +497,10 @@
<!ENTITY staff.main.menu.circ.mark_used.label "Mark Used">
<!ENTITY staff.main.menu.circ.missing.key "M">
<!ENTITY staff.main.menu.circ.missing.label "Mark Missing">
+<!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.label "Register Patron">
+<!ENTITY staff.main.menu.circ.patron_retrieve.label "Retrieve Last Patron">
<!ENTITY staff.main.menu.circ.patron_status.key "P">
<!ENTITY staff.main.menu.circ.patron_status.label "Display Patron">
<!ENTITY staff.main.menu.circ.place_hold.key "H">
@@ -460,10 +509,14 @@
<!ENTITY staff.main.menu.circ.quick_add.label "Quick Add">
<!ENTITY staff.main.menu.circ.renew.key "n">
<!ENTITY staff.main.menu.circ.renew.label "Renew">
+<!ENTITY staff.main.menu.circ.reprint.label "Re-Print Last">
<!ENTITY staff.main.menu.circ.special.key "S">
<!ENTITY staff.main.menu.circ.special.label "Special Circulation">
+<!ENTITY staff.main.menu.edit.buckets.copies "Copy Buckets">
<!ENTITY staff.main.menu.edit.buckets.key "B">
<!ENTITY staff.main.menu.edit.buckets.label "Manage Buckets">
+<!ENTITY staff.main.menu.edit.buckets.records "Record Buckets">
+<!ENTITY staff.main.menu.edit.buckets.volumes "Volume Buckets">
<!ENTITY staff.main.menu.edit.copy.key "C">
<!ENTITY staff.main.menu.edit.copy.label "Copy">
<!ENTITY staff.main.menu.edit.cut.key "t">
@@ -509,13 +562,25 @@
<!ENTITY staff.main.menu.file.save.label "Save Session">
<!ENTITY staff.main.menu.help.key "H">
<!ENTITY staff.main.menu.help.label "Help">
+<!ENTITY staff.main.menu.quit "Quit Program">
+<!ENTITY staff.main.menu.replace_barcode.label "Replace Barcode">
<!ENTITY staff.main.menu.reports.key "">
<!ENTITY staff.main.menu.reports.label "Reports">
+<!ENTITY staff.main.menu.search.catalog.label "the Catalog">
+<!ENTITY staff.main.menu.search.copies.label "for copies by Barcode">
<!ENTITY staff.main.menu.search.key "r">
<!ENTITY staff.main.menu.search.label "Search">
+<!ENTITY staff.main.menu.search.patrons.label "for Patrons">
+<!ENTITY staff.main.menu.search.patrons_barcode.label "for patron by Barcode">
+<!ENTITY staff.main.menu.search.record.label "for record by TCN">
<!ENTITY staff.main.menu.serials.key "l">
<!ENTITY staff.main.menu.serials.label "Serials">
+<!ENTITY staff.main.menu.tabs.close "Close All Tabs">
<!ENTITY staff.main.menu.title "Evergreen Staff Client">
+<!ENTITY staff.main.simple_auth.authorization.label "Authorization">
+<!ENTITY staff.main.simple_auth.authorize.label "Authorization">
+<!ENTITY staff.main.simple_auth.exception.label "Exception">
+<!ENTITY staff.main.test.example_template.label "Hello world!">
<!ENTITY staff.marc.008.BKS.MAP.indx.desc "Index">
<!ENTITY staff.marc.008.BKS.MAP.indx.field "008">
<!ENTITY staff.marc.008.BKS.MAP.indx.field_end_pos "31">
@@ -940,25 +1005,24 @@
<!ENTITY staff.volume.wizard.page4 "Entering Copy-Level Attribute Defaults">
<!ENTITY staff.volume.wizard.title "Batch Add Volumes/Copies Wizard">
<!ENTITY staff.xuleditor_label "XUL TEST">
-<!ENTITY staff.z39_50_import_interface_label "Z39.50 IMPORT">
<!ENTITY staff.z39_50.search_class.author "Author">
<!ENTITY staff.z39_50.search_class.isbn "ISBN">
<!ENTITY staff.z39_50.search_class.issn "ISSN">
-<!ENTITY staff.z39_50.search_class.pubdate "PubDate">
-<!ENTITY staff.z39_50.search_class.publisher "Publisher">
-<!ENTITY staff.z39_50.search_class.tcn "Accession #">
-<!ENTITY staff.z39_50.search_class.title "Title">
-<!ENTITY staff.z39_50.search_class.lccn "LCCN">
<!ENTITY staff.z39_50.search_class.item_type "Item Type">
<!ENTITY staff.z39_50.search_class.item_type.all "All Formats">
+<!ENTITY staff.z39_50.search_class.item_type.art "Papers/Articles">
<!ENTITY staff.z39_50.search_class.item_type.bks "Books">
-<!ENTITY staff.z39_50.search_class.item_type.ser "Serials">
-<!ENTITY staff.z39_50.search_class.item_type.vis "Visual materials">
+<!ENTITY staff.z39_50.search_class.item_type.com "Computer files">
+<!ENTITY staff.z39_50.search_class.item_type.map "Maps">
+<!ENTITY staff.z39_50.search_class.item_type.mix "Mixed material">
<!ENTITY staff.z39_50.search_class.item_type.rec "Sound recordings">
<!ENTITY staff.z39_50.search_class.item_type.sco "Musical scores">
-<!ENTITY staff.z39_50.search_class.item_type.map "Maps">
-<!ENTITY staff.z39_50.search_class.item_type.com "Computer files">
-<!ENTITY staff.z39_50.search_class.item_type.mix "Mixed material">
+<!ENTITY staff.z39_50.search_class.item_type.ser "Serials">
<!ENTITY staff.z39_50.search_class.item_type.url "Internet Resources">
-<!ENTITY staff.z39_50.search_class.item_type.art "Papers/Articles">
-
+<!ENTITY staff.z39_50.search_class.item_type.vis "Visual materials">
+<!ENTITY staff.z39_50.search_class.lccn "LCCN">
+<!ENTITY staff.z39_50.search_class.pubdate "PubDate">
+<!ENTITY staff.z39_50.search_class.publisher "Publisher">
+<!ENTITY staff.z39_50.search_class.tcn "Accession #">
+<!ENTITY staff.z39_50.search_class.title "Title">
+<!ENTITY staff.z39_50_import_interface_label "Z39.50 IMPORT">
Index: Open-ILS/examples/apache/eg_vhost.conf
===================================================================
--- Open-ILS/examples/apache/eg_vhost.conf (revision 7609)
+++ Open-ILS/examples/apache/eg_vhost.conf (working copy)
@@ -105,6 +105,9 @@
XMLEntContentType "application/vnd.mozilla.xul+xml"
AddOutputFilter INCLUDES;XMLENT .xul
allow from all
+
+ # We only support one locale (en-US) for the time being
+ SetEnv locale=en-US
</LocationMatch>
#
----------------------------------------------------------------------------------
