Start using locale SSI env to pull in DTD for XUL/XHTML

Add include and XML entity parsing to XHTML files in /xul/
Localize a few more admin files

git-svn-id: svn://svn.open-ils.org/ILS/trunk@8436 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf
index d5460b1..6128cfa 100644 (file)
--- a/Open-ILS/examples/apache/eg_vhost.conf
+++ b/Open-ILS/examples/apache/eg_vhost.conf
@@ -99,12 +99,12 @@ OSRFGatewayConfig /openils/conf/opensrf_core.xml
 </LocationMatch>
        
 # ----------------------------------------------------------------------------------
-# Run server-side XUL through xmlent to load the correct XML entities
+# Run server-side XUL and XHTML through xmlent to load the correct XML entities
 # ----------------------------------------------------------------------------------
-<LocationMatch /xul/.*\.xul$>
+<LocationMatch /xul/.*(\.xul|\.xhtml)$>
     Options +Includes
     XMLEntContentType "application/vnd.mozilla.xul+xml"
-    AddOutputFilter INCLUDES;XMLENT .xul
+    AddOutputFilter INCLUDES;XMLENT .xhtml .xul
     allow from all
 
     # We only support one locale (en-US) for the time being

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index ca7edea..4ab4dc5 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -1256,3 +1256,44 @@
 <!ENTITY staff.server.admin.font.18pt "18pt">
 <!ENTITY staff.server.admin.font.restore "Restore Default">
 <!ENTITY staff.server.admin.font.restore "Restore Default">
+<!ENTITY staff.server.admin.transit.filter.caption "Transit Filter">
+<!ENTITY staff.server.admin.transit.library.label "Transit Library">
+<!ENTITY staff.server.admin.transit.to.label "Transit to">
+<!ENTITY staff.server.admin.transit.from.label "Transit from">
+<!ENTITY staff.server.admin.transit.date.label "Transit Date falls between">
+<!ENTITY staff.server.admin.transit.date.today "Today">
+<!ENTITY staff.server.admin.transit.date.week "Today - 7 days">
+<!ENTITY staff.server.admin.transit.date.2weeks "Today - 14 days">
+<!ENTITY staff.server.admin.transit.date.3weeks "Today - 21 days">
+<!ENTITY staff.server.admin.transit.date.30days "Today - 30 days">
+<!ENTITY staff.server.admin.transit.date.start "The Beginning">
+<!ENTITY staff.server.admin.transit.retrieve.label "Retrieve Transits">
+<!ENTITY staff.server.admin.transit.retrieve.accesskey "T">
+<!ENTITY staff.server.admin.transit.list.label "Transits">
+<!ENTITY staff.server.admin.transit.list.print "Print Transits">
+<!ENTITY staff.server.admin.transit.list.actions "Actions for Selected Transits">
+<!ENTITY staff.server.admin.transit.list.actions.accesskey "S">
+<!ENTITY staff.server.admin.transit.list.copy.label "Copy to Clipboard">
+<!ENTITY staff.server.admin.transit.list.copy.accesskey "C">
+<!ENTITY staff.server.admin.transit.list.add.label "Add to Item Bucket">
+<!ENTITY staff.server.admin.transit.list.add.accesskey "A">
+<!ENTITY staff.server.admin.transit.list.show.label "Show in Catalog">
+<!ENTITY staff.server.admin.transit.list.show.accesskey "S">
+<!ENTITY staff.server.admin.transit.list.details.label "Show Item Details">
+<!ENTITY staff.server.admin.transit.list.details.accesskey "I">
+<!ENTITY staff.server.admin.transit.list.circs.label "Show Last Few Circulations">
+<!ENTITY staff.server.admin.transit.list.circs.accesskey "L">
+<!ENTITY staff.server.admin.transit.list.edit.label "Edit Item Attributes">
+<!ENTITY staff.server.admin.transit.list.edit.accesskey "E">
+<!ENTITY staff.server.admin.transit.list.abort.label "Abort Transits">
+<!ENTITY staff.server.admin.transit.list.save.label "Save Columns">
+<!ENTITY staff.server.admin.cash.title "Evergreen: Cash Reports">
+<!ENTITY staff.server.admin.cash.welcome "Welcome ">
+<!ENTITY staff.server.admin.cash.start_date "Start Date:">
+<!ENTITY staff.server.admin.cash.date.select "Date selector">
+<!ENTITY staff.server.admin.cash.end_date "End Date:">
+<!ENTITY staff.server.admin.cash.date_format "(YYYY-MM-DD)">
+<!ENTITY staff.server.admin.cash.view "View reports for : ">
+<!ENTITY staff.server.admin.cash.submit "Go!">
+<!ENTITY staff.server.admin.cash.desk "Desk Payments">
+<!ENTITY staff.server.admin.cash.user "User Payments">

diff --git a/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml b/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
index 8fbb556..95345ba 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/cash_reports.xhtml
@@ -1,8 +1,15 @@
-<?xml version='1.0'?>
+<?xml version='1.0' encoding="UTF-8"?>
+
+<!DOCTYPE html PUBLIC 
+       "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+       <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+]>
+
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
        <head>
-               <title>Evergreen: Cash Reports</title>
+               <title>&staff.server.admin.cash.title;</title>
                <script language='javascript' src='/opac/common/js/utils.js'> </script>
                <script language='javascript' src='/opac/common/js//config.js'> </script>
                <script language='javascript' src='/opac/common/js/CGI.js'> </script>
@@ -39,46 +46,46 @@
        <body onload='crInit();'>
 
                <div class='welcome_box'>
-                       <span>Welcome </span><b><span id='user'/></b>
+                       <span>&staff.server.admin.cash.welcome;</span><b><span id='user'/></b>
                </div>
 
                <center>
 
-                       <span style='padding-left: 15px;'>Start Date:</span>
+                       <span style='padding-left: 15px;'>&staff.server.admin.cash.start_date;</span>
                        <input type='text' id='cr_start' size='10' maxlength='10'> </input>
                        <button style='padding: 0px;' id='cr_start_trigger'>
                                <img src="/opac/common/js/jscalendar/img.gif" 
                                        style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
-                                       title="Date selector"
+                                       title="&staff.server.admin.cash.date.select;"
                                        onmouseover="this.style.background='red';" 
                                        onmouseout="this.style.background=''" />
                        </button>
 
-                       <span style='padding-left: 15px;'>End Date:</span>
+                       <span style='padding-left: 15px;'>&staff.server.admin.cash.end_date;</span>
                        <input type='text' id='cr_end' size='10' maxlength='10'> </input>
                        <button style='padding: 0px;' id='cr_end_trigger'>
                                <img src="/opac/common/js/jscalendar/img.gif" 
                                        style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
-                                       title="Date selector"
+                                       title="&staff.server.admin.cash.date.select;"
                                        onmouseover="this.style.background='red';" 
                                        onmouseout="this.style.background=''" />
                        </button>
 
-                       <div class='pad' style='padding-left: 10px; font-size: 8pt;'>(YYYY-MM-DD)</div>
+                       <div class='pad' style='padding-left: 10px; font-size: 8pt;'>&staff.server.admin.cash.date_format;</div>
 
-                       <div>View reports for :  <select id='cr_orgs' style='width:auto;'/></div>
-                       <div><button onclick='crDrawRange();'>Go!</button></div>
+                       <div>&staff.server.admin.cash.view; <select id='cr_orgs' style='width:auto;'/></div>
+                       <div><button onclick='crDrawRange();'>&staff.server.admin.cash.submit;</button></div>
 
 
                        <div id='cr_desk_payments_div'>
-                               <h2>Desk Payments</h2>
+                               <h2>&staff.server.admin.cash.desk;</h2>
                                <div id='cr_desk_payments'/>
                        </div>
                        
                        <br/><hr/><br/>
 
                        <div id='cr_user_payments_div'>
-                               <h2>User Payments</h2>
+                               <h2>&staff.server.admin.cash.user;</h2>
                                <div id='cr_user_payments'/>
                        </div>
 

diff --git a/Open-ILS/xul/staff_client/server/admin/font_settings.xul b/Open-ILS/xul/staff_client/server/admin/font_settings.xul
index b3acac9..19e23ed 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/font_settings.xul
+++ b/Open-ILS/xul/staff_client/server/admin/font_settings.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-       <!--#include virtual="/opac/locale/en-US/lang.dtd"-->
+       <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->

diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xul b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xul
index 900408e..5c7a470 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xul
+++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-       <!--#include virtual="/opac/locale/en-US/lang.dtd"-->
+       <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -35,7 +35,7 @@
                function my_init() {
                        try {
                                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-                               if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+                               if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
                                JSAN.errorLevel = "die"; // none, warn, or die
                                JSAN.addRepository('/xul/server/');
                                JSAN.use('util.error'); g.error = new util.error();
@@ -56,8 +56,7 @@
                                default_focus();
 
                        } catch(E) {
-                               var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
-                                       "system administrator or software developer the following:\npatron/holds.xul\n" + E + '\n';
+                               var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['patron/holds.xul', E]);
                                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
                                alert(err_msg);
                        }
@@ -68,6 +67,8 @@
        ]]>
        </script>
 
+       <messagecatalog id="commonStrings" src="/xul/server/locale/<!--#echo var='locale'-->/common.properties"/>
+
        <commandset id="holds_cmds">
                <command id="sel_mark_items_damaged" disabled="true"/>
                <command id="sel_mark_items_missing" disabled="true"/>

diff --git a/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul b/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
index 6e76ad3..759cdb7 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
+++ b/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
@@ -12,7 +12,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-       <!--#include virtual="/opac/locale/en-US/lang.dtd"-->
+       <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->

diff --git a/Open-ILS/xul/staff_client/server/admin/transit_list.xul b/Open-ILS/xul/staff_client/server/admin/transit_list.xul
index 253c76e..116fd96 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/transit_list.xul
+++ b/Open-ILS/xul/staff_client/server/admin/transit_list.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-       <!--#include virtual="/opac/locale/en-US/lang.dtd"-->
+       <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -35,7 +35,7 @@
                function my_init() {
                        try {
                                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-                               if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
+                               if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
                                JSAN.errorLevel = "die"; // none, warn, or die
                                JSAN.addRepository('/xul/server/');
                                JSAN.use('util.error'); g.error = new util.error();
@@ -53,66 +53,68 @@
        ]]>
        </script>
 
+       <messagecatalog id="commonStrings" src="/xul/server/locale/<!--#echo var='locale'-->/common.properties"/>
+
        <vbox flex="1" class="my_overflow">
                <hbox>
                        <groupbox id="lib_hbox" orient="horizontal">
-                               <caption label="Transit Filter" class="shrinkable_groupbox"/> 
+                               <caption label="&staff.server.admin.transit.filter.caption;" class="shrinkable_groupbox"/> 
                                <vbox>
-                                       <label value="Transit Library" class="header"/>
+                                       <label value="&staff.server.admin.transit.library.label;" class="header"/>
                                        <hbox>
                                                <menulist id="transit_direction">
                                                        <menupopup>
-                                                               <menuitem label="Transit to" value="transit_to" selected="true"/>
-                                                               <menuitem label="Transit from" value="transit_from" />
+                                                               <menuitem label="&staff.server.admin.transit.to.label;" value="transit_to" selected="true"/>
+                                                               <menuitem label="&staff.server.admin.transit.from.label;" value="transit_from" />
                                                        </menupopup>
                                                </menulist>
                                                <hbox id="libmenu_placeholder"/>
                                        </hbox>
-                                       <label value="Transit Date falls between" class="header"/> 
+                                       <label value="&staff.server.admin.transit.date.label;" class="header"/> 
                                        <hbox>
                                                <menulist id="sdate" editable="true">
                                                        <menupopup>
-                                                               <menuitem label="Today" selected="true"/>
-                                                               <menuitem label="Today - 7 days" />
-                                                               <menuitem label="Today - 14 days" />
-                                                               <menuitem label="Today - 21 days" />
-                                                               <menuitem label="Today - 30 days" />
-                                                               <menuitem label="The Beginning" />
+                                                               <menuitem label="&staff.server.admin.transit.date.today;" selected="true"/>
+                                                               <menuitem label="&staff.server.admin.transit.date.week;" />
+                                                               <menuitem label="&staff.server.admin.transit.date.2weeks;" />
+                                                               <menuitem label="&staff.server.admin.transit.date.3weeks;" />
+                                                               <menuitem label="&staff.server.admin.transit.date.30days;" />
+                                                               <menuitem label="&staff.server.admin.transit.date.start;" />
                                                        </menupopup>
                                                </menulist>
                                                <menulist id="edate" editable="true">
                                                        <menupopup>
-                                                               <menuitem label="Today" selected="true"/>
-                                                               <menuitem label="Today - 7 days" />
-                                                               <menuitem label="Today - 14 days" />
-                                                               <menuitem label="Today - 21 days" />
-                                                               <menuitem label="Today - 30 days" />
+                                                               <menuitem label="&staff.server.admin.transit.date.today;" selected="true"/>
+                                                               <menuitem label="&staff.server.admin.transit.date.week;" />
+                                                               <menuitem label="&staff.server.admin.transit.date.2weeks;" />
+                                                               <menuitem label="&staff.server.admin.transit.date.3weeks;" />
+                                                               <menuitem label="&staff.server.admin.transit.date.30days;" />
                                                        </menupopup>
                                                </menulist>
                                        </hbox>
                                </vbox>
-                               <button label="Retrieve Transits" accesskey="T" command="cmd_kick_off"/>
+                               <button label="&staff.server.admin.transit.retrieve.label;" accesskey="&staff.server.admin.transit.retrieve.accesskey;" command="cmd_kick_off"/>
                        </groupbox>
                </hbox>
 
                <groupbox flex="1">
-                       <caption label="Transits" />
+                       <caption label="&staff.server.admin.transit.list.label;" />
                        <hbox>
-                               <button label="Print Transits" command="cmd_print_list" />
+                               <button label="&staff.server.admin.transit.list.print;" command="cmd_print_list" />
                                <spacer flex="1"/>
                                <menubar>
-                                       <menu label="Actions for Selected Transits" accesskey="S">
+                                       <menu label="&staff.server.admin.transit.list.actions;" accesskey="&staff.server.admin.transit.list.actions.accesskey;">
                                                <menupopup>
-                                                       <menuitem command="sel_clip" label="Copy to Clipboard" accesskey="C" />
-                                                       <menuitem command="sel_bucket" label="Add to Item Bucket" accesskey="A"/>
-                                                       <menuitem command="sel_opac" label="Show in Catalog" accesskey="S" />
-                                                       <menuitem command="sel_copy_details" label="Show Item Details" accesskey="I" />
-                                                       <menuitem command="sel_patron" label="Show Last Few Circulations" accesskey="L"/>
+                                                       <menuitem command="sel_clip" label="&staff.server.admin.transit.list.copy.label;" accesskey="&staff.server.admin.transit.list.copy.accesskey;" />
+                                                       <menuitem command="sel_bucket" label="&staff.server.admin.transit.list.add.label;" accesskey="&staff.server.admin.transit.list.add.accesskey;"/>
+                                                       <menuitem command="sel_opac" label="&staff.server.admin.transit.list.show.label;" accesskey="&staff.server.admin.transit.list.show.accesskey;" />
+                                                       <menuitem command="sel_copy_details" label="&staff.server.admin.transit.list.details.label;" accesskey="&staff.server.admin.transit.list.details.accesskey;" />
+                                                       <menuitem command="sel_patron" label="&staff.server.admin.transit.list.circs.label;" accesskey="&staff.server.admin.transit.list.circs.accesskey;"/>
                                                        <menuseparator />
-                                                       <menuitem command="sel_edit" label="Edit Item Attributes" accesskey="E" />
-                                                       <menuitem command="sel_transit_abort" label="Abort Transits" />
+                                                       <menuitem command="sel_edit" label="&staff.server.admin.transit.list.edit.label;" accesskey="&staff.server.admin.transit.list.edit.accesskey;" />
+                                                       <menuitem command="sel_transit_abort" label="&staff.server.admin.transit.list.abort.label;" />
                                                        <menuseparator />
-                                                       <menuitem command="save_columns" label="Save Columns"/>
+                                                       <menuitem command="save_columns" label="&staff.server.admin.transit.list.save.label;"/>
                                                </menupopup>
                                        </menu>
                                </menubar>
@@ -123,16 +125,16 @@
 
        <popupset id="transit_list_popupset">
                <popup id="transit_list_actions" position="at_pointer"> 
-                       <menuitem command="sel_clip" label="Copy to Clipboard" accesskey="C" />
-                       <menuitem command="sel_bucket" label="Add to Item Bucket" accesskey="A"/>
-                       <menuitem command="sel_opac" label="Show in Catalog" accesskey="S" />
-                       <menuitem command="sel_copy_details" label="Show Item Details" accesskey="I" />
-                       <menuitem command="sel_patron" label="Show Last Few Circulations" accesskey="L"/>
-                       <menuseparator/>
-                       <menuitem command="sel_edit" label="Edit Item Attributes" accesskey="E" />
-                       <menuitem command="sel_transit_abort" label="Abort Transits" />
-                       <menuseparator/>
-                       <menuitem command="save_columns" label="Save Columns"/>
+                       <menuitem command="sel_clip" label="&staff.server.admin.transit.list.copy.label;" accesskey="&staff.server.admin.transit.list.copy.accesskey;" />
+                       <menuitem command="sel_bucket" label="&staff.server.admin.transit.list.add.label;" accesskey="&staff.server.admin.transit.list.add.accesskey;"/>
+                       <menuitem command="sel_opac" label="&staff.server.admin.transit.list.show.label;" accesskey="&staff.server.admin.transit.list.show.accesskey;" />
+                       <menuitem command="sel_copy_details" label="&staff.server.admin.transit.list.details.label;" accesskey="&staff.server.admin.transit.list.details.accesskey;" />
+                       <menuitem command="sel_patron" label="&staff.server.admin.transit.list.circs.label;" accesskey="&staff.server.admin.transit.list.circs.accesskey;"/>
+                       <menuseparator />
+                       <menuitem command="sel_edit" label="&staff.server.admin.transit.list.edit.label;" accesskey="&staff.server.admin.transit.list.edit.accesskey;" />
+                       <menuitem command="sel_transit_abort" label="&staff.server.admin.transit.list.abort.label;" />
+                       <menuseparator />
+                       <menuitem command="save_columns" label="&staff.server.admin.transit.list.save.label;"/>
                </popup>
        </popupset>