Merged revisions 10027-10033,10040,10048,10051-10052,10059,10067,10069,10071,10074...
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 23 Jul 2008 02:45:47 +0000 (02:45 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 23 Jul 2008 02:45:47 +0000 (02:45 +0000)
svn://svn.open-ils.org/ILS/trunk

........
  r10027 | erickson | 2008-07-14 15:08:00 -0400 (Mon, 14 Jul 2008) | 1 line

  changing default router log level from INFO to WARN
........
  r10028 | dbs | 2008-07-14 15:56:15 -0400 (Mon, 14 Jul 2008) | 2 lines

  Another monster i18n patch from Craig Ricciuto
........
  r10029 | dbs | 2008-07-14 16:07:12 -0400 (Mon, 14 Jul 2008) | 2 lines

  Nail a forgotten text string
........
  r10030 | dbs | 2008-07-14 16:55:28 -0400 (Mon, 14 Jul 2008) | 2 lines

  Bugfix that prevented us from properly checking for duplicate entities
........
  r10031 | miker | 2008-07-14 17:06:48 -0400 (Mon, 14 Jul 2008) | 1 line

  correcting tranlation widget
........
  r10032 | miker | 2008-07-14 17:07:27 -0400 (Mon, 14 Jul 2008) | 1 line

  fixing translation framework for perms and statuses; adding marc codes to admin page
........
  r10033 | dbs | 2008-07-14 17:34:05 -0400 (Mon, 14 Jul 2008) | 3 lines

  Clean up some long-standing i18n problems (duplicate keys)
  Also avoid terminating comments prematurely with bogus -- within a comment
........
  r10040 | dbs | 2008-07-14 21:34:26 -0400 (Mon, 14 Jul 2008) | 2 lines

  Add a basic default portal page to the staff client
........
  r10048 | miker | 2008-07-14 23:56:01 -0400 (Mon, 14 Jul 2008) | 1 line

  adding upgrade script for the (hopefully) final version in the 1.2.2 stream
........
  r10051 | dbs | 2008-07-15 00:34:00 -0400 (Tue, 15 Jul 2008) | 2 lines

  Initial stab at a PostgreSQL 8.3 full text search schema
........
  r10052 | dbs | 2008-07-15 00:46:15 -0400 (Tue, 15 Jul 2008) | 7 lines

  More preparation for PostgreSQL 8.3 support:
    * quick_metarecord_map.sql - 8.3 no longer seems to support altering
      the table within a single transaction, so we break this into two
      transactions
    * 006.schema.permissions.sql and 020.schema.functions.sql - add explicit
      type casting where necessary
........
  r10059 | miker | 2008-07-17 00:41:39 -0400 (Thu, 17 Jul 2008) | 1 line

  adding labels for new ops
........
  r10067 | erickson | 2008-07-17 23:06:12 -0400 (Thu, 17 Jul 2008) | 1 line

  added support for configurable search page sizes and max pages
........
  r10069 | erickson | 2008-07-18 09:28:59 -0400 (Fri, 18 Jul 2008) | 1 line

  modified form clearing to work regardless of propogated search terms
........
  r10071 | erickson | 2008-07-18 10:43:22 -0400 (Fri, 18 Jul 2008) | 1 line

  added core limit search setting, summary info in return object, and changed defaults to 500/20
........
  r10074 | miker | 2008-07-18 11:00:41 -0400 (Fri, 18 Jul 2008) | 1 line

  protect against "no bump for type"
........
  r10076 | erickson | 2008-07-18 13:20:48 -0400 (Fri, 18 Jul 2008) | 1 line

  focus first search box on clear
........
  r10077 | dbs | 2008-07-18 20:36:24 -0400 (Fri, 18 Jul 2008) | 2 lines

  Use more consistent strings and enable label/accesskey concordance
........
  r10078 | miker | 2008-07-18 20:58:02 -0400 (Fri, 18 Jul 2008) | 1 line

  allow circ.reshelving_complete.interval ou setting to override the default reshelving delay
........
  r10079 | miker | 2008-07-19 20:39:44 -0400 (Sat, 19 Jul 2008) | 1 line

  adding in-database supported locale, um, support
........
  r10081 | erickson | 2008-07-20 23:11:38 -0400 (Sun, 20 Jul 2008) | 1 line

  typo on element name
........
  r10083 | erickson | 2008-07-20 23:22:23 -0400 (Sun, 20 Jul 2008) | 1 line

  displaying report columns vertically to prevent unnecessary scrolling
........
  r10085 | erickson | 2008-07-21 08:49:49 -0400 (Mon, 21 Jul 2008) | 1 line

  need to clear out the colums so they don't accumulate
........
  r10087 | miker | 2008-07-22 16:41:29 -0400 (Tue, 22 Jul 2008) | 1 line

  translator head port
........
  r10088 | miker | 2008-07-22 16:42:00 -0400 (Tue, 22 Jul 2008) | 1 line

  configuration interfaces
........
  r10091 | miker | 2008-07-22 21:44:00 -0400 (Tue, 22 Jul 2008) | 1 line

  marc code editor works (sans vr format map)
........
  r10092 | miker | 2008-07-22 21:44:39 -0400 (Tue, 22 Jul 2008) | 1 line

  be careful with identity values
........

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@10093 dcc99617-32d9-48b4-a31d-7c20da2025e4

45 files changed:
Evergreen/src/extras/import/quick_metarecord_map.sql
Evergreen/xul/staff_client/server/patron/ue.js
Evergreen/xul/staff_client/server/patron/ue.xhtml
Open-ILS/examples/apache/eg.conf
Open-ILS/examples/opensrf.xml.example
Open-ILS/examples/opensrf_core.xml.example
Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
Open-ILS/src/sql/Pg/000.english.pg83.fts-config.sql [new file with mode: 0644]
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/sql/Pg/006.schema.permissions.sql
Open-ILS/src/sql/Pg/020.schema.functions.sql
Open-ILS/src/sql/Pg/1.2.2.2-1.2.2.3-upgrade-db.sql [new file with mode: 0644]
Open-ILS/src/sql/Pg/300.schema.staged_search.sql
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/web/conify/global/config/marc_code_maps.html
Open-ILS/web/conify/global/config/marc_code_maps.js
Open-ILS/web/js/dojo/openils/I18N.js
Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js
Open-ILS/web/opac/locale/en-US/lang.dtd
Open-ILS/web/opac/locale/en-US/opac.dtd
Open-ILS/web/opac/skin/default/js/adv_global.js
Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
Open-ILS/web/reports/oils_rpt_editor.xhtml
Open-ILS/web/reports/oils_rpt_filters.js
Open-ILS/web/reports/oils_rpt_report_editor.js
Open-ILS/xul/staff_client/chrome/content/main/main.xul
Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml
Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
Open-ILS/xul/staff_client/server/cat/spine_labels.xul
Open-ILS/xul/staff_client/server/cat/z3950.xul
Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
Open-ILS/xul/staff_client/server/circ/checkout_overlay.xul
Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
Open-ILS/xul/staff_client/server/circ/in_house_use.xul
Open-ILS/xul/staff_client/server/index.xhtml [new file with mode: 0644]
Open-ILS/xul/staff_client/server/locale/en-US/patron.properties
Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
Open-ILS/xul/staff_client/server/patron/bills.js
Open-ILS/xul/staff_client/server/patron/bills_overlay.xul
Open-ILS/xul/staff_client/server/patron/hold_notices.xul
Open-ILS/xul/staff_client/server/patron/items_overlay.xul
Open-ILS/xul/staff_client/server/patron/ue.xhtml
Open-ILS/xul/staff_client/server/patron/user_edit.xhtml
build/i18n/tests/check_entities.py

index 01075b5..f058a4d 100644 (file)
@@ -18,6 +18,10 @@ INSERT INTO metabib.metarecord_source_map (metarecord,source)
          FROM  biblio.record_entry b
                JOIN metabib.metarecord m ON (m.fingerprint = b.fingerprint);
 
+COMMIT;
+
+BEGIN;
+
 ALTER TABLE metabib.metarecord_source_map ADD CONSTRAINT metabib_metarecord_source_map_metarecord_fkey FOREIGN KEY (metarecord) REFERENCES metabib.metarecord (id) DEFERRABLE INITIALLY DEFERRED;
 
 COMMIT;
index df2d11d..cb5a3d4 100644 (file)
@@ -10,7 +10,9 @@ var surveyAnswersCache                = {};
 var userCache                                  = {};
 var groupsCache                                = {};
 var netLevelsCache                     = {};
-//var guardianNote                             = null; 
+//var guardianNote                             = null;
+
+function $(id) { return document.getElementById(id); }
 
 /* fetch the necessary data to start off */
 function uEditInit() {
@@ -24,7 +26,7 @@ function uEditInit() {
        clone           = cgi.param('clone'); 
        if (xulG) if (xulG.clone) clone = xulG.clone;
        if (xulG) if (xulG.params) if (xulG.params.clone) clone = xulG.params.clone;
-       if(!session) throw "User session is not defined";
+       if(!session) throw $("patronStrings").getString('web.staff.patron.ue.session_no_defined');
 
        fetchUser(session);
        $('uedit_user').appendChild(text(USER.usrname()));
@@ -710,7 +712,7 @@ function uEditShowSearch(link,type) {
        if(!type) type = link.getAttribute('type');
        if(window.xulG)
                window.xulG.spawn_search(uEditDupHashes[type]); 
-       else alert('Search would be:\n' + js2JSON(uEditDupHashes[type]));
+       else alert($("patronStrings").getString('web.staff.patron.ue.uedit_show_search.search_would_be', js2JSON(uEditDupHashes[type])));
 }
 
 function uEditMarkCardLost() {
index a82da88..727d4ad 100644 (file)
@@ -1,16 +1,16 @@
-<?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"-->
        <!ENTITY nbsp " "> <!-- calendar needs this entity -->
 ]>
 
-
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
        <head>
-               <title>Evergreen: User Editor</title>
+               <title>&ev.staff.patron.ue_xhtml.ev_user_editor.label;</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>
 
                </style>
        </head>
+       
+       <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
        <body onload='uEditInit();'>
 
        <center>
 
-               <h2>Evergreen User Editor</h2>
+               <h2>&ev.staff.patron.ue_xhtml.ev_user_editor.label;</h2>
 
                <div style='position:absolute; top: 5px; right: 5px;'>
-                       <span>Welcome </span><b><span id='uedit_user'/></b>
+                       <span>&ev.staff.patron.ue_xhtml.welcome.label;</span><b><span id='uedit_user'/></b>
                </div>
 
                <hr/><br/>
                                <tr>
                                        <td align='left' width='80%'>
                                                <b>
-                                                       <span>Note: required or invalid fields are </span>
-                                                       <span style='border-bottom: 2px solid red;'>marked with color</span>
+                                                       <span>&staff.patron.ue.interface_note.label;</span>
                                                </b>
                                        </td>
                                        <td align='right' width='20%'>
                                                <a class='hide_me' id='ue_errors' href='javascript:void(0);' 
                                                        style='color: red; font-size: 12pt; font-weight: bold' onclick='uEditAlertErrors();'>
-                                                       View Errors
+                                                       &ev.staff.patron.ue_xhtml.view_errors.label;
                                                </a>
                                        </td>
                                </tr>
                                                        <tbody>
                                                                <tr>
                                                                        <td id='uedit_userid_label' class='main_nav_link'>
-                                                                               <a href='javascript:uEditShowPage("uedit_userid");'>1. User Identification</a>
+                                                                               <a href='javascript:uEditShowPage("uedit_userid");'>&ev.staff.patron.ue_xhtml.user_id.label;</a>
                                                                        </td>
                                                                </tr>
                                                                <tr>
                                                                        <td id='uedit_contact_info_label' class='main_nav_link'>        
-                                                                               <a href='javascript:uEditShowPage("uedit_contact_info");'>2. Contact Info</a>
+                                                                               <a href='javascript:uEditShowPage("uedit_contact_info");'>&ev.staff.patron.ue_xhtml.contact_info.label;</a>
                                                                        </td>
                                                                </tr>
                                                                <tr>
                                                                        <td id='uedit_addresses_label' class='main_nav_link'>           
-                                                                               <a href='javascript:uEditShowPage("uedit_addresses");'>3. Addresses</a>
+                                                                               <a href='javascript:uEditShowPage("uedit_addresses");'>&ev.staff.patron.ue_xhtml.addresses.label;</a>
                                                                        </td>
                                                                </tr>
                                                                <tr>
                                                                        <td id='uedit_groups_label' class='main_nav_link'>                      
-                                                                               <a href='javascript:uEditShowPage("uedit_groups");'>4. Groups and Permissions</a>
+                                                                               <a href='javascript:uEditShowPage("uedit_groups");'>&ev.staff.patron.ue_xhtml.groups_permissions.label;</a>
                                                                        </td>
                                                                </tr>
                                                                <tr>
                                                                        <td id='uedit_stat_cats_label' class='main_nav_link'>           
-                                                                               <a href='javascript:uEditShowPage("uedit_stat_cats");'>5. Statistical Categories</a>
+                                                                               <a href='javascript:uEditShowPage("uedit_stat_cats");'>&ev.staff.patron.ue_xhtml.statistical_categories.label;</a>
                                                                        </td>
                                                                </tr>
                                                                <tr>
                                                                        <td id='uedit_surveys_label' class='main_nav_link'>                     
-                                                                               <a href='javascript:uEditShowPage("uedit_surveys");'>6. Surveys</a>
+                                                                               <a href='javascript:uEditShowPage("uedit_surveys");'>&ev.staff.patron.ue_xhtml.surveys.label;</a>
                                                                        </td>
                                                                </tr>
                                                                <tr>
                                                                        <td id='uedit_finalize_label' class='main_nav_link'>                    
-                                                                               <a href='javascript:uEditShowPage("uedit_finalize");'>7. Finish</a>
+                                                                               <a href='javascript:uEditShowPage("uedit_finalize");'>&ev.staff.patron.ue_xhtml.finish.label;</a>
                                                                        </td>
                                                                </tr>
                                                        </tbody>
                                        <td width='85%' id='uedit_loading'>
                                                <div class='main_div has_color' 
                                                        style='padding: 50px; vertical-align: middle;'>
-                                                       <b>Loading data...</b>
+                                                       <b>&ev.staff.patron.ue_xhtml.loading_data.label;</b>
                                                </div>
                                        </td>
 
                                                        <div id='dup_div' name='dup_div'>
                                                                <a name='link' class='dup_link hide_me'
                                                                        href='javascript:void(0);' onclick='uEditShowSearch(this);'>
-                                                                       Found <b name='count'/> possible duplicate patron(s):
+                                                                       &ev.staff.patron.ue_xhtml.found_duplicate_patron.label; <b name='count'/>
                                                                        <b name='data'/>
                                                                </a>
                                                        </div>
                                                        <table class='uedit_table'>
                                                                <tbody>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Barcode</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.barcode.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input type='text' id='ue_barcode' />
                                                                                                                }'
                                                                                                                /> -->
                                                                                                                <button style='padding-left: 5px;' class='hide_me' id='ue_mark_card_lost'
-                                                                                                       onclick='uEditMarkCardLost();'>Mark Lost</button>
+                                                                                                       onclick='uEditMarkCardLost();'>&ev.staff.patron.ue_xhtml.mark_lost.label;</button>
                                                                                        </div>
                                                                                </td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Username</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.username.label;</div></td>
                                                                                <td><div class='wide left'><input type='text' id='ue_username'/></div></td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Password</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.password.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input type='password' id='ue_password1'/>
-                                                                                               <button class='hide_me' onclick='uEditResetPw();' id='ue_reset_pw'>Reset</button>
+                                                                                               <button class='hide_me' onclick='uEditResetPw();' id='ue_reset_pw'>&ev.staff.patron.ue_xhtml.reset.label;</button>
                                                                                                <span style='padding-left: 10px;' class='hide_me' id='ue_password_gen'>
-                                                                                                       Password: 
+                                                                                                       &ev.staff.patron.ue_xhtml.re_password.label;
                                                                                                        <span style='text-decoration:underline;' id='ue_password_plain'/>
                                                                                                </span>
                                                                                        </div>
                                                                                </td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Verify Password</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.verify_password.label;</div></td>
                                                                                <td><div class='wide left'><input type='password' id='ue_password2'/></div></td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>First Name</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.first_name.label;</div></td>
                                                                                <td><div class='wide left'><input type='text' id='ue_firstname'/></div></td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Middle Name</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.middle_name.label;</div></td>
                                                                                <td><div class='wide left'><input type='text' id='ue_middlename'/></div></td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Last Name</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.last_name.label;</div></td>
                                                                                <td><div class='wide left'><input type='text' id='ue_lastname'/></div></td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Suffix</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.suffix.label;</div></td>
                                                                                <td><div class='wide left'>
                                                                                        <input type='text' id='ue_suffix'/>
                                                                                        <select id='ue_suffix_selector' style='width: 6em;'
                                                                                                onclick='$("ue_suffix").value = this.options[this.selectedIndex].value;$("ue_suffix").onchange();'
                                                                                                onchange='$("ue_suffix").value = this.options[this.selectedIndex].value;$("ue_suffix").onchange();'>
-                                                                                               <option value=''>- Pick -</option>
+                                                                                               <option value=''>&ev.staff.patron.ue_xhtml.pick_suffix.label;</option>
                                                                                                <option value='Jr'>Jr</option>
                                                                                                <option value='Sr'>Sr</option>
                                                                                                <option value='II'>II</option>
                                                                                </div></td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Date of Birth</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.dob.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
        
                                                                                </td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Primary Identification Type</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.primary_id_type.label;</div></td>
                                                                                <td><div class='wide left'>
                                                                                                <select id='ue_primary_ident_type'>
-                                                                                                       <option value=''> -- Required -- </option>
+                                                                                                       <option value=''>&ev.staff.patron.ue_xhtml.required.label;</option>
                                                                                                </select>
                                                                                        </div>
                                                                                </td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Primary Identification</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.primary_id.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input type='text' id='ue_primary_ident'/>
                                                                        </tr>
                                                                        -->
                                                                        <tr class='hide_me'>
-                                                                               <td><div class='wide right'>Parent / Guardian</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.parent_guardian.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input type='text' id='ue_secondary_ident'/>
                                                        <table class='uedit_table'>
                                                                <tbody>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Email Address</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.email_address.label;</div></td>
                                                                                <td><div class='wide left'><input type='text' id='ue_email' size='32'/></div></td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Daytime Phone</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.daytime_phone.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input class='pad' type='text' id='ue_day_phone' size='18'/>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Evening Phone</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.evening_phone.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input class='pad' type='text' id='ue_night_phone' size='18'/>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Other/Cell Phone</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.other_phone.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input class='pad' type='text' id='ue_other_phone' size='18'/>
                                                                                </td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Home Library</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.home_library.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <select style='width: 20em;' id='ue_org_selector'/>
                                                        <table class='uedit_table' style='width: 98%; padding: 1px;'>
                                                                <thead>
                                                                        <tr>
-                                                                               <td>Address</td>
-                                                                               <td>Within City Limits</td>
-                                                                               <td>Valid</td>
-                                                                               <td>Mailing Address</td>
-                                                                               <td>Physical Address</td>
+                                                                               <td>&ev.staff.patron.ue_xhtml.address.label;</td>
+                                                                               <td>&ev.staff.patron.ue_xhtml.in_city_limits.label;</td>
+                                                                               <td>&ev.staff.patron.ue_xhtml.valid.label;</td>
+                                                                               <td>&ev.staff.patron.ue_xhtml.mailing_address.label;</td>
+                                                                               <td>&ev.staff.patron.ue_xhtml.physical_address.label;</td>
                                                                        </tr>
                                                                </thead>
                                                                <tbody id='ue_address_tbody'>
                                                                                                                <td colspan='6'>
                                                                                                                        <div style='padding: 8px;'>
                                                                                                                                <span style='color:red;'>*</span>
-                                                                                                                               Address is owned by
+                                                                                                                               &ev.staff.patron.ue_xhtml.address_owned_by.label;
                                                                                                                                <span name='addr_owner_name'/>
                                                                                                                                <span name='owner_link_div'>
                                                                                                                                        (<a name='addr_owner' href='javascript:void(0);'>Edit</a>)
                                                                                                                </td>
                                                                                                        </tr>
                                                                                                        <tr>
-                                                                                                               <td><div class='wide right'>Label</div></td>
+                                                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.label.label;</div></td>
                                                                                                                <td colspan='3'>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_label' id='ue_addr_label'/>
                                                                                                                        </div>
                                                                                                                </td>
-                                                                                                               <td><div class='wide right'>Zip</div></td>
+                                                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.zip.label;</div></td>
                                                                                                                <td>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_zip' size='10' maxlength='10'/>
                                                                                                                </td>
                                                                                                        </tr>
                                                                                                        <tr>
-                                                                                                               <td><div class='wide right'>Street 1</div></td>
+                                                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.street1.label;</div></td>
                                                                                                                <td colspan='5'>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_street1' size='42'/>
                                                                                                                </td>
                                                                                                        </tr>
                                                                                                        <tr>
-                                                                                                               <td><div class='wide right'>Street 2</div></td>
+                                                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.street2.label;</div></td>
                                                                                                                <td colspan='5'>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_street2' size='42'/>
                                                                                                                </td>
                                                                                                        </tr>
                                                                                                        <tr>
-                                                                                                               <td><div class='wide right'>City</div></td>
+                                                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.city.label;</div></td>
                                                                                                                <td colspan='3'>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_city' size='17'/>
                                                                                                                        </div>
                                                                                                                </td>
-                                                                                                               <td><div class='wide right'>County</div></td>
+                                                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.conuty.label;</div></td>
                                                                                                                <td>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_county' size='17'/>
                                                                                                                </td>
                                                                                                        </tr>
                                                                                                        <tr>
-                                                                                                               <td><div class='wide right'>State</div></td>
+                                                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.state.label;</div></td>
                                                                                                                <td colspan='3'>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_state' size='2' maxlength='2'/>
                                                                                                                        </div>
                                                                                                                </td>
                                                                                                                -->
-                                                                                                               <td><div class='wide right'>Country</div></td>
+                                                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.country.label;</div></td>
                                                                                                                <td>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_country' size='6'/>
                                                                <!--
                                                                <input type='submit' value='Create a New Address' id='ue_address_new'/>
                                                                -->
-                                                               <input type='submit' value='Create a New Address' onclick='uEditCreateNewAddr();'/>
+                                                               <input type='submit' value='&staff.patron.ue.create_address.label;' onclick='uEditCreateNewAddr();'/>
                                                        </div>
                                                </div>
        
                                                        <table class='uedit_table'>
                                                                <tbody>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Profile Group</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.profile_group.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <select id='ue_profile' class='select_big'>
-                                                                                                       <option value=''> -- Required -- </option>
+                                                                                                       <option value=''>&ev.staff.patron.ue_xhtml.required.label;</option>
                                                                                                </select>
                                                                                        </div>
                                                                                </td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Account Expiration Date</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.account_expiration_date.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input type='text' id='ue_expire' size='10' maxlength='10'/>
                                                                                                <button style='padding: 0px;' id='ue_expire_trigger'>
                                                                                                        <img src="/opac/common/js/jscalendar/img.gif" 
                                                                                                                style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
-                                                                                                               title="Date selector"
+                                                                                                               title="&ev.staff.patron.ue_xhtml.date_selector.label;"
                                                                                                                onmouseover="this.style.background='red';" 
                                                                                                                onmouseout="this.style.background=''" />
                                                                                                </button>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Internet Access Level</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.net_access_level.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <select id='ue_net_level'>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Active</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.active.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input id='ue_active' type='checkbox' checked='checked'/>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Barred</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.barred.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input id='ue_barred' type='checkbox'/>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Set as Family/Group Lead Account</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.set_family_group_lead_account.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input id='ue_group_lead' type='checkbox'/>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Claims Returned Count</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.claims_returned_count.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input id='ue_claims_returned' type='text' disabled='disabled' size='6'/>
                                                                                                        $('ue_claims_returned').value = 0;
                                                                                                        $('ue_claims_returned').disabled = true;
                                                                                                </script>
-                                                                                               <input class='pad' id='ue_claims_returned_reset' type='submit' value='Reset
+                                                                                               <input class='pad' id='ue_claims_returned_reset' type='submit' value='&ev.staff.patron.ue_xhtml.reset.label;
                                                                                                        onclick="
                                                                                                                if( confirmId('ue_claims_return_confirm') ) {
                                                                                                                        $('ue_claims_returned').value = 0;
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Alert Message</div></td>
+                                                                               <td><div class='wide right'>&ev.staff.patron.ue_xhtml.alert_message.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <textarea wrap='soft' cols='30' rows='4' id='ue_alert_message'/>
                                                                                                <input class='pad' id='ue_alert_message_reset' 
-                                                                                                       type='submit' value='Clear
+                                                                                                       type='submit' value='&ev.staff.patron.ue_xhtml.alert_message_reset.value;
                                                                                                                onclick='
                                                                                                                var node = $("ue_alert_message");
                                                                                                                node.value = "";
                                                        <table class='uedit_table' style='width: 98%'>
                                                                <thead>
                                                                        <tr style='font-weight: bold;'>
-                                                                               <td>Stat Cat Name</td>
-                                                                               <td>Owner</td>
-                                                                               <td>Value</td>
+                                                                               <td>&ev.staff.patron.ue_xhtml.stat_cat_name.label;</td>
+                                                                               <td>&ev.staff.patron.ue_xhtml.owner.label;</td>
+                                                                               <td>&ev.staff.patron.ue_xhtml.value.label;</td>
                                                                        </tr>
                                                                </thead>
                                                                <tbody id='ue_stat_cat_tbody'>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <select name='ue_stat_cat_selector'>
-                                                                                                       <option value=''> -- None Selected -- </option>
+                                                                                                       <option value=''>&ev.staff.patron.ue_xhtml.none_selected.label;</option>
                                                                                                </select>
                                                                                                <span class='pad'> or </span>
                                                                                                <input class='pad' type='text' name='ue_stat_cat_newval'/>
                                                <!-- ************************************************************** -->
                                                <div id='uedit_surveys' class='main_div hide_me'>
                                                        <div id='uedit_no_surveys' class='hide_me'>
-                                                               <b>No surveys have been created for this location.</b>
+                                                               <b>&ev.staff.patron.ue_xhtml.no_surveys_for_location.label;</b>
                                                        </div>
                                                        <table id='ue_survey_table' 
                                                                class='uedit_table data_grid' style='width: 95%; margin-top: 17px;'>
                                                                                        style='width: 60%; text-align: left; padding-left: 40px;'/>
                                                                                <td>
                                                                                        <select name='ue_survey_answer'>
-                                                                                               <option value=''> -- None Selected -- </option>
+                                                                                               <option value=''>&ev.staff.patron.ue_xhtml.none_selected.label;</option>
                                                                                        </select>
                                                                                </td>
                                                                        </tr>
                                                <div id='uedit_finalize' class='main_div hide_me'>
                                                        <div class='has_color' style='width: 95%; margin-top: 40px; text-align: center'>
                                                                <div style='padding: 5px;'>
-                                                                       You are now ready to save the user to the database.  <br/>
-                                                                       To view or print a summary of the changes, click on the "View Summary" link.  <br/>
-                                                                       To save the user, click on the 'Save User' button.
+                                                                       &ev.staff.patron.ue_xhtml.finishing_message.label;
                                                                </div>
                                                                <br/>
                                                                <div style='margin-bottom: 15px;'>
                                                                                href='javascript:uEditShowSummary();'>View Summary</a>
                                                                </div>
                                                                <input style='margin-left: 5px; margin-right: 5px;' id='ue_save'
-                                                                       type='submit' value='Save User' onclick='uEditSaveUser();'/>
+                                                                       type='submit' value='&ev.staff.patron.ue_xhtml.save_user.value;' onclick='uEditSaveUser();'/>
                                                                <input style='margin-left: 5px; margin-right: 5px;' id='ue_save_clone'
-                                                                       type='submit' value='Save and Clone User' onclick='uEditSaveUser(true);'/>
+                                                                       type='submit' value='&ev.staff.patron.ue_xhtml.save_clone_user.value;' onclick='uEditSaveUser(true);'/>
                                                                <button style='margin-left: 5px; margin-right: 5px;' 
-                                                                       onclick='if(confirm($("ue_cancel_confirm").innerHTML)) uEditCancel();'>Cancel</button>
+                                                                       onclick='if(confirm($("ue_cancel_confirm").innerHTML)) uEditCancel();'>&ev.staff.patron.ue_xhtml.cancel.value;</button>
                                                        </div>
                                                </div>
                                        </td>
                                <tr>
                                        <td colspan='2'>
                                                <!-- ************************************************************** -->
-                                               <!-- Bottome Navigation Links -->
+                                               <!-- Bottom Navigation Links -->
                                                <!-- ************************************************************** -->
                                                <table width='100%' class='no_border'>
                                                        <tbody>
                                                                        <td width='10%'/>
                                                                        <td width='40%'>
                                                                                <a id='ue_back' class='nav_link hide_me' 
-                                                                                       href='javascript:uEditPrev()'>&lt;&lt;Back</a>
+                                                                                       href='javascript:uEditPrev()'>&lt;&lt;&ev.staff.patron.ue_xhtml.back.label;</a>
                                                                        </td>
                                                                        <td width='40%'>
                                                                                <a id='ue_fwd' class='nav_link' 
-                                                                                       href='javascript:uEditNext()'>Forward&gt;&gt;</a>
+                                                                                       href='javascript:uEditNext()'>&ev.staff.patron.ue_xhtml.forward.label;&gt;&gt;</a>
                                                                        </td>
                                                                        <td width='10%'/>
                                                                </tr>
                        <thead>
                                <tr>
                                        <td colspan='2'>
-                                               <span>User Summary Information (Deleted items are marked in</span>
-                                               <span class='deleted'>color</span><span>)</span>
+                                               <span>&staff.patron.ue.user_summary.label;</span>
                                        </td>
                                </tr>
                        </thead>
                                <tr>
 
                                        <td colspan='2' align='center'>
-                                               <input style='margin-right: 15px;' type='submit' value='Print Page' onclick='window.print();'/>
-                                               <input style='margin-left: 15px;' type='submit' value='Return to Editor
+                                               <input style='margin-right: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.print_page.label;' onclick='window.print();'/>
+                                               <input style='margin-left: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.return_to_editor.label;
                                                        onclick=' unHideMe($("main_div_container")); 
                                                                hideMe($("summary_div_container"));'/>
                                        </td>
                                </tr>
 
-                               <tr><td>Barcode</td><td id='ue_summary_barcode'/></tr>
-                               <tr><td>Username</td><td id='ue_summary_usrname'/></tr>
-                               <tr><td>First Name</td><td id='ue_summary_first_given_name'/></tr>
-                               <tr><td>Middle Name</td><td id='ue_summary_second_given_name'/></tr>
-                               <tr><td>Last Name</td><td id='ue_summary_family_name'/></tr>
-                               <tr><td>Suffix</td><td id='ue_summary_suffix'/></tr>
-                               <tr><td>Date of Birth</td><td id='ue_summary_dob'/></tr>
-                               <tr><td>Primary Identification Type</td><td id='ue_summary_ident_type'/></tr>
-                               <tr><td>Primary Identification</td><td id='ue_summary_ident_value'/></tr>
-                               <tr><td>Secondary Identification Type</td><td id='ue_summary_ident_type2'/></tr>
-                               <tr><td>Secondary Identification</td><td id='ue_summary_ident_value2'/></tr>
-                               <tr><td>Email Address</td><td id='ue_summary_email'/></tr>
-                               <tr><td>Day Phone</td><td id='ue_summary_day_phone'/></tr>
-                               <tr><td>Evening Phone</td><td id='ue_summary_evening_phone'/></tr>
-                               <tr><td>Other Phone</td><td id='ue_summary_other_phone'/></tr>
-                               <tr><td>Home Library</td><td id='ue_summary_home_ou'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.barcode.label;</td><td id='ue_summary_barcode'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.username.label;</td><td id='ue_summary_usrname'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.first_name.label;</td><td id='ue_summary_first_given_name'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.middle_name.label;</td><td id='ue_summary_second_given_name'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.last_name.label;</td><td id='ue_summary_family_name'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.suffix.label;</td><td id='ue_summary_suffix'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.dob.label;</td><td id='ue_summary_dob'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.primary_id_type.label;</td><td id='ue_summary_ident_type'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.primary_id.label;</td><td id='ue_summary_ident_value'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.secondary_id_type.label;</td><td id='ue_summary_ident_type2'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.secondary_id.label;</td><td id='ue_summary_ident_value2'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.email_address.label;</td><td id='ue_summary_email'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.day_phone.label;</td><td id='ue_summary_day_phone'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.evening_phone.label;</td><td id='ue_summary_evening_phone'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.other_phone.label;</td><td id='ue_summary_other_phone'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.home_library.label;</td><td id='ue_summary_home_ou'/></tr>
 
                                <tr>
                                        <td colspan='2'>
                                                <table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
-                                                       <thead><tr><td>Addresses</td></tr></thead>
+                                                       <thead><tr><td>&ev.staff.patron.ue_xhtml.addresses.label;</td></tr></thead>
                                                        <tbody name='ue_summary_addr_tbody'>
                                                                <tr name='ue_summary_addr_row'>
                                                                        <td>
                                                                                        <thead><tr><td colspan='4'/><span> </span></tr></thead>
                                                                                        <tbody>
                                                                                                <tr>
-                                                                                                       <td><b>Address Label</b></td><td name='label'/>
-                                                                                                       <td><b>Zip Code</b></td><td name='zip'/>
+                                                                                                       <td><b>&ev.staff.patron.ue_xhtml.address_label.label;</b></td><td name='label'/>
+                                                                                                       <td><b>&ev.staff.patron.ue_xhtml.zip.label;</b></td><td name='zip'/>
                                                                                                </tr>
                                                                                                <tr>
-                                                                                                       <td><b>Street1</b></td><td name='street1'/>
-                                                                                                       <td><b>Country</b></td><td name='country'/>
+                                                                                                       <td><b>&ev.staff.patron.ue_xhtml.street1.label;</b></td><td name='street1'/>
+                                                                                                       <td><b>&ev.staff.patron.ue_xhtml.country.label;</b></td><td name='country'/>
                                                                                                </tr>
                                                                                                <tr>
-                                                                                                       <td><b>Street2</b></td><td name='street2'/>
-                                                                                                       <td><b>Mailing</b></td><td name='mailing'/>
+                                                                                                       <td><b>&ev.staff.patron.ue_xhtml.street2.label;</b></td><td name='street2'/>
+                                                                                                       <td><b>&ev.staff.patron.ue_xhtml.mailing.label;</b></td><td name='mailing'/>
                                                                                                </tr>
                                                                                                <tr>
-                                                                                                       <td><b>City</b></td><td name='city'/>
-                                                                                                       <td><b>Billing</b></td><td name='billing'/>
+                                                                                                       <td><b>&ev.staff.patron.ue_xhtml.city.label;</b></td><td name='city'/>
+                                                                                                       <td><b>&ev.staff.patron.ue_xhtml.billing.label;</b></td><td name='billing'/>
                                                                                                </tr>
                                                                                                <tr>
-                                                                                                       <td><b>County</b></td><td name='county'/>
-                                                                                                       <td><b>Valid</b></td><td name='valid'/>
+                                                                                                       <td><b>&ev.staff.patron.ue_xhtml.county.label;</b></td><td name='county'/>
+                                                                                                       <td><b>&ev.staff.patron.ue_xhtml.valid.label;</b></td><td name='valid'/>
                                                                                                </tr>
                                                                                                <tr>
-                                                                                                       <td><b>State</b></td><td name='state'/>
-                                                                                                       <td><b>Within City Limits</b></td><td name='incorporated'/>
+                                                                                                       <td><b>&ev.staff.patron.ue_xhtml.state.label;</b></td><td name='state'/>
+                                                                                                       <td><b>&ev.staff.patron.ue_xhtml.in_city_limits.label;</b></td><td name='incorporated'/>
                                                                                                </tr>
                                                                                        </tbody>
                                                                                </table>
                                                </table>
                                        </td>
                                </tr>
-                               <tr><td>Profile</td><td id='ue_summary_profile'/></tr>
-                               <tr><td>Active</td><td id='ue_summary_active'/></tr>
-                               <tr><td>Barred</td><td id='ue_summary_barred'/></tr>
-                               <tr><td>Expire Date</td><td id='ue_summary_expire_date'/></tr>
-                               <tr><td>Family Lead Account</td><td id='ue_summary_master_account'/></tr>
-                               <tr><td>Claims Returned Count</td><td id='ue_summary_claims_returned_count'/></tr>
-                               <tr><td>Alert Message</td><td id='ue_summary_alert_message'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.profile.label;</td><td id='ue_summary_profile'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.active.label;</td><td id='ue_summary_active'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.barred.label;</td><td id='ue_summary_barred'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.expire_date.label;</td><td id='ue_summary_expire_date'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.family_lead_account.label;</td><td id='ue_summary_master_account'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.claims_returned_count.label;</td><td id='ue_summary_claims_returned_count'/></tr>
+                               <tr><td>&ev.staff.patron.ue_xhtml.alert_message.label;</td><td id='ue_summary_alert_message'/></tr>
                                <tr name='ue_summary_stat_cat_td'>
                                        <td colspan='2' >
                                                <table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
-                                                       <thead><tr><td colspan='2'>Statistical Categories</td></tr></thead>
+                                                       <thead><tr><td colspan='2'>&ev.staff.patron.ue_xhtml.stat_categories.label;</td></tr></thead>
                                                        <tbody name='ue_summary_stats_tbody'>
                                                                <tr name='ue_summary_stats_row'>
                                                                        <td name='ue_summary_stat_name'/><td name='ue_summary_stat_value'/>
                                <tr name='ue_summary_survey_td'>
                                        <td colspan='2'>
                                                <table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
-                                                       <thead><tr><td>Survey</td><td>Question</td><td>Answer</td></tr></thead>
+                                                       <thead>
+                                                               <tr>
+                                                                       <td>&ev.staff.patron.ue_xhtml.survey.label;</td>
+                                                                       <td>&ev.staff.patron.ue_xhtml.question.label;</td>
+                                                                       <td>&ev.staff.patron.ue_xhtml.answer.label;</td>
+                                                               </tr>
+                                                       </thead>
                                                        <tbody name='ue_summary_survey_tbody'>
                                                                <tr name='ue_summary_survey_row'>
                                                                        <td name='ue_summary_survey_name'/>
                                </tr>
                                <tr>
                                        <td colspan='2' align='center'>
-                                               <input style='margin-right: 15px;' type='submit' value='Print Page' onclick='window.print();'/>
-                                               <input style='margin-left: 15px;' type='submit' value='Return to Editor
+                                               <input style='margin-right: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.print_page.label;' onclick='window.print();'/>
+                                               <input style='margin-left: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.return_to_editor.label;
                                                        onclick=' unHideMe($("main_div_container")); 
                                                                hideMe($("summary_div_container"));'/>
                                        </td>
        <!-- This holds all of the strings we may have to alert to the user -->
        <!-- ************************************************************** -->
        <div class='hide_me'>
-               <span id='ue_bad_dob'>The date of birth field is not formatted correctly.  We're expecting YYYY-MM-DD</span>
-               <span id='ue_bad_username'>Username is invalid</span>
-               <span id='ue_bad_password'>Passwords do not match or are invalid</span>
-               <span id='ue_bad_firstname'>First name is invalid</span>
-               <span id='ue_bad_middlename'>Middle name is invalid</span>
-               <span id='ue_bad_lastname'>Last name is invalid</span>
-               <span id='ue_bad_barcode'>Barcode is invalid</span>
-               <span id='ue_duplicate_barcode'>The selected barcode already exists in the database</span>
-               <span id='ue_new_barcode_warn'>
-                       This will de-activate the existing barcode for this user!  If you wish to continue, 
-                       enter the new barcode below.  Otherwise, click the Cancel button.
-               </span>
-               <span id='ue_no_ident'>You must select at least one type of identification</span>
-               <span id='ue_bad_ident_dl'>Invalid drivers license. Should be STATE-NUMBER</span>
-               <span id='ue_bad_ident_ssn'>Invalid social security number.  Format should be 111-22-3333</span>
-               <span id='ue_bad_email'>The email addresses is not valid</span>
-               <span id='ue_bad_phone'>An invalid phone number was entered</span>
-               <span id='ue_no_profile'>A profile group must be selected</span>
-               <span id='ue_bad_expire'>The user expiration date is invalid.  We're expecting YYYY-MM-DD</span>
-               <span id='ue_bad_claims_returned'>The claims returned count is invalid</span>
-               <span id='ue_no_profile'>A profile group must be selected</span>
-               <span id='ue_unknown_error'>An unknown formatting error occurred</span>
-               <span id='ue_bad_addr_label'>Address label is invalid</span>
-               <span id='ue_bad_addr_street'>Address street is invalid</span>
-               <span id='ue_bad_addr_city'>Address city is invalid</span>
-               <span id='ue_bad_addr_county'>Address county is invalid</span>
-               <span id='ue_bad_addr_state'>Address state is invalid</span>
-               <span id='ue_bad_addr_country'>Address country is invalid</span>
-               <span id='ue_bad_addr_zip'>Address zip is invalid</span>
-               <span id='ue_bad_survey'>Required survey is unanswered</span>
-               <span id='ue_delete_addr_warn'>
-                       This will remove this address from the user.  
-                       Are you sure you wish to continue?
-               </span>
-               <span id='yes'>Yes</span>
-               <span id='no'>No</span>
-               <span id='ue_summary_window'>Patron Summary</span>
-               <span id='ue_success'>User update succeeded</span>
-               <span id='ue_dup_ident1'>
-                       A user already exists with the primary identification provided.  
-                       Do you wish to view the duplicate record now?
-               </span>
-               <span id='ue_dup_username'>
-                       The selected username is in use by another user.  
-                       Please choose a different username.
-               </span>
-               <span id='ue_dup_barcode'>
-                       The selected barcode is in use by another user.  
-                       Please choose a different barcode.
-               </span>
-               <span class='hide_me' id='ue_cancel_confirm'>
-                       Are you sure you wish to cancel this editing session?
-                       Canceling will destroy any unsaved changes you have made thus far to the user.
-               </span>
-               <span class='hide_me' id='ue_juv_guardian'>
-                       This patron is under 18 years of age.  Please enter the name 
-                       of the parent or guardian for this patron.
-               </span>
-               <span class='hide_me' id='ue_bad_date'>
-                       The date provided is either in the future or invalid.  We're expecting YYYY-MM-DD
-               </span>
-               <span class='hide_me' id='ue_made_barred'>
-                       Please add a note to the patron's alert message explaining why the patron is barred.
-               </span>
-                
-               <span class='hide_me' id='ue_claims_return_confirm'>
-                       This will reset the claims returned count for this user.
-                       Are you sure you wish to perform this action?
-               </span>
-
-      <span class='hide_me' id='ue_unsaved_changes'>
-         You have unsaved changes. 
-      </span>
-
-        <span class='hide_me' id='ue_xact_collision'>
-            It appears that someone else was also editing this user.  Saving the user
-            now will destroy their changes.  Click "OK" to refresh the user and continue
-            editing.  Click "Cancel" to do nothing.
-    
-            Note that you will not be able to save the user until this page has been refreshed.
-        </span>
-
+               <span id='ue_bad_dob'>&staff.patron.ue.bad_dob.label;</span>
+               <span id='ue_bad_username'>&staff.patron.ue.bad_username.label;</span>
+               <span id='ue_bad_password'>&staff.patron.ue.bad_passwords.label;</span>
+               <span id='ue_bad_firstname'>&staff.patron.ue.bad_firstname.label;</span>
+               <span id='ue_bad_middlename'>&staff.patron.ue.bad_middlename.label;</span>
+               <span id='ue_bad_lastname'>&staff.patron.ue.bad_lastname.label;</span>
+               <span id='ue_bad_barcode'>&staff.patron.ue.bad_barcode.label;</span>
+               <span id='ue_duplicate_barcode'>&staff.patron.ue.duplicate_barcode.label;</span>
+               <span id='ue_new_barcode_warn'>&staff.patron.ue.new_barcode_warn.label;</span>
+               <span id='ue_no_ident'>&staff.patron.ue.no_ident.label;</span>
+               <span id='ue_bad_ident_dl'>&staff.patron.ue.bad_ident_dl.label;</span>
+               <span id='ue_bad_ident_ssn'>&staff.patron.ue.bad_ident_ssn.label;</span>
+               <span id='ue_bad_email'>&staff.patron.ue.bad_email.label;</span>
+               <span id='ue_bad_phone'>&staff.patron.ue.bad_phone.label;</span>
+               <span id='ue_no_profile'>&staff.patron.ue.no_profile.label;</span>
+               <span id='ue_bad_expire'>&staff.patron.ue.bad_expire.label;</span>
+               <span id='ue_bad_claims_returned'>&staff.patron.ue.bad_claims_returned.label;</span>
+               <span id='ue_no_profile'>&ev.staff.patron.ue_xhtml.no_profile.label;</span>
+               <span id='ue_unknown_error'>&staff.patron.ue.unknown_error.label;</span>
+               <span id='ue_bad_addr_label'>&staff.patron.ue.bad_addr_label.label;</span>
+               <span id='ue_bad_addr_street'>&staff.patron.ue.bad_addr_street.label;</span>
+               <span id='ue_bad_addr_city'>&staff.patron.ue.bad_addr_city.label;</span>
+               <span id='ue_bad_addr_county'>&staff.patron.ue.bad_addr_county.label;</span>
+               <span id='ue_bad_addr_state'>&staff.patron.ue.bad_addr_state.label;</span>
+               <span id='ue_bad_addr_country'>&staff.patron.ue.bad_addr_country.label;</span>
+               <span id='ue_bad_addr_zip'>&staff.patron.ue.bad_addr_zip.label;</span>
+               <span id='ue_bad_survey'>&staff.patron.ue.bad_survey.label;</span>
+               <span id='ue_delete_addr_warn'>&staff.patron.ue.delete_addr_warn.label;</span>
+               <span id='yes'>&staff.patron.ue.yes.label;</span>
+               <span id='no'>&staff.patron.ue.no.label;</span>
+               <span id='ue_summary_window'>&staff.patron.ue.summary_window.label;</span>
+               <span id='ue_success'>&staff.patron.ue.success.label;</span>
+               <span id='ue_dup_ident1'>&staff.patron.ue.dup_ident1.label;</span>
+               <span id='ue_dup_username'>&staff.patron.ue.dup_username.label;</span>
+               <span id='ue_dup_barcode'>&staff.patron.ue.dup_barcode.label;</span>
+               <span class='hide_me' id='ue_cancel_confirm'>&staff.patron.ue.cancel_confirm.label;</span>
+               <span class='hide_me' id='ue_juv_guardian'>&staff.patron.ue.juv_guardian.label;</span>
+               <span class='hide_me' id='ue_bad_date'>&staff.patron.ue.bad_date.label;</span>
+               <span class='hide_me' id='ue_made_barred'>&staff.patron.ue.made_barred.label;</span>
+               <span class='hide_me' id='ue_claims_return_confirm'>&ev.staff.patron.ue_xhtml.claims_return_confirm.label;</span>
+               <span class='hide_me' id='ue_unsaved_changes'>&ev.staff.patron.ue_xhtml.unsaved_changes.label;</span>
+               <span class='hide_me' id='ue_xact_collision'>&ev.staff.patron.ue_xhtml.xact_collision.label;</span>
 
        </div>
 
index 894aa55..3bee68a 100644 (file)
@@ -86,7 +86,7 @@ NameVirtualHost *:80
        ServerName localhost:80
        ServerAlias 127.0.0.1:80
        DocumentRoot /openils/var/web/
-       DirectoryIndex index.xml index.html
+       DirectoryIndex index.xml index.html index.xhtml
     # - absorb the shared virtual host settings
     Include eg_vhost.conf
 </VirtualHost>
index f940f9f..94eb200 100644 (file)
@@ -275,6 +275,8 @@ vim:et:ts=4:sw=4:
                     <marc_html_xsl>oilsMARC21slim2HTML.xsl</marc_html_xsl>
                     <!-- Default to using staged search -->
                     <use_staged_search>true</use_staged_search>
+                    <superpage_size>500</superpage_size>
+                    <max_superpages>20</max_superpages>
                     <!-- zip code database file -->
                     <!--<zips_file>/openils/var/data/zips.txt</zips_file>-->
                 </app_settings>
index 8d91d99..c3aca94 100644 (file)
@@ -127,7 +127,7 @@ vim:et:ts=2:sw=2:
 
       </transport>
       <logfile>/openils/var/log/router.log</logfile>
-      <loglevel>3</loglevel>
+      <loglevel>2</loglevel>
     </router>
 
   </routers>
index 367e3cd..3056109 100644 (file)
@@ -36,13 +36,23 @@ my $pfx = "open-ils.search_";
 
 my $cache;
 my $cache_timeout;
+my $superpage_size;
+my $max_superpages;
 
 sub initialize {
        $cache = OpenSRF::Utils::Cache->new('global');
        my $sclient = OpenSRF::Utils::SettingsClient->new();
        $cache_timeout = $sclient->config_value(
                        "apps", "open-ils.search", "app_settings", "cache_timeout" ) || 300;
-       $logger->info("Search cache timeout is $cache_timeout");
+
+       $superpage_size = $sclient->config_value(
+                       "apps", "open-ils.search", "app_settings", "superpage_size" ) || 500;
+
+       $max_superpages = $sclient->config_value(
+                       "apps", "open-ils.search", "app_settings", "max_superpages" ) || 20;
+
+       $logger->info("Search cache timeout is $cache_timeout, ".
+        " superpage_size is $superpage_size, max_superpages is $max_superpages");
 }
 
 
@@ -744,8 +754,6 @@ __PACKAGE__->register_method(
        api_name        => 'open-ils.search.metabib.multiclass.staged.staff',
        signature       => q/@see open-ils.search.biblio.multiclass.staged/);
 
-my $PAGE_SIZE = 1000;
-my $SEARCH_PAGES = 25;
 sub staged_search {
        my($self, $conn, $search_hash, $docache) = @_;
 
@@ -765,8 +773,12 @@ sub staged_search {
     # we're grabbing results on a per-superpage basis, which means the 
     # limit and offset should coincide with superpage boundaries
     $search_hash->{offset} = 0;
-    $search_hash->{limit} = $PAGE_SIZE;
-    $search_hash->{check_limit} = $PAGE_SIZE; # force a well-known check_limit
+    $search_hash->{limit} = $superpage_size;
+
+    # force a well-known check_limit
+    $search_hash->{check_limit} = $superpage_size; 
+    # restrict total tested to superpage size * number of superpages
+    $search_hash->{core_limit} = $superpage_size * $max_superpages;
 
     # pull any existing results from the cache
     my $key = search_cache_key($method, $search_hash);
@@ -777,8 +789,9 @@ sub staged_search {
     my $all_results = [];
     my $page; # current superpage
     my $est_hit_count = 0;
+    my $current_page_summary = {};
 
-    for($page = 0; $page < $SEARCH_PAGES; $page++) {
+    for($page = 0; $page < $max_superpages; $page++) {
 
         my $data = $cache_data->{$page};
         my $results;
@@ -795,7 +808,7 @@ sub staged_search {
         } else {
             # retrieve the window of results from the database
             $logger->debug("staged search: fetching results from the database");
-            $search_hash->{skip_check} = $page * $PAGE_SIZE;
+            $search_hash->{skip_check} = $page * $superpage_size;
             my $start = time;
             $results = $U->storagereq($method, %$search_hash);
             $logger->info("staged search: DB call took ".(time - $start)." seconds");
@@ -812,6 +825,8 @@ sub staged_search {
             cache_staged_search_page($key, $page, $summary, $results) if $docache;
         }
 
+        $current_page_summary = $summary;
+
         # add the new set of results to the set under construction
         push(@$all_results, @$results);
 
@@ -831,13 +846,16 @@ sub staged_search {
         last if $current_count >= ($user_limit + $user_offset);
 
         # we've scanned all possible hits
-        last if $summary->{checked} < $PAGE_SIZE;
+        last if $summary->{checked} < $superpage_size;
     }
 
     my @results = grep {defined $_} @$all_results[$user_offset..($user_offset + $user_limit - 1)];
 
     return {
         count => $est_hit_count,
+        core_limit => $search_hash->{core_limit},
+        superpage_size => $search_hash->{check_limit},
+        superpage_summary => $current_page_summary,
         ids => \@results
     };
 }
index 015d4bc..8b0199f 100644 (file)
@@ -121,30 +121,34 @@ sub complete_reshelving {
        throw OpenSRF::EX::InvalidArg ("I need an interval of more than 0 seconds!")
                unless (interval_to_seconds( $window ));
 
+       my $setting = actor::org_unit_setting->table;
        my $circ = action::circulation->table;
        my $cp = asset::copy->table;
 
        my $sql = <<"   SQL";
                UPDATE  $cp
                  SET   status = 0
-                 WHERE id IN
-                       ( SELECT id FROM (
-                               SELECT  cp.id, MAX(circ.checkin_time)
-                                 FROM  $cp cp
-                                       JOIN $circ circ ON (circ.target_copy = cp.id)
-                                 WHERE circ.checkin_time IS NOT NULL
-                                       AND cp.status = 7
-                                 GROUP BY 1
-                                       HAVING MAX(circ.checkin_time) < NOW() - CAST(? AS INTERVAL)
-                         ) AS foo
-                       )
-                       OR id IN
-                       ( SELECT        cp.id
-                           FROM        $cp cp 
-                                       LEFT JOIN $circ circ ON (circ.target_copy = cp.id AND circ.id IS NULL)
-                           WHERE       cp.status = 7
-                                       AND cp.create_date < NOW() - CAST(? AS INTERVAL)
-                       )
+                 WHERE id IN (
+            SELECT  id
+              FROM  (SELECT cp.id, MAX(circ.checkin_time)
+                      FROM  $cp cp
+                            JOIN $circ circ ON (circ.target_copy = cp.id)
+                            LEFT JOIN $setting setting
+                                ON (cp.circ_lib = setting.org_unit AND setting.name = 'circ.reshelving_complete.interval')
+                      WHERE circ.checkin_time IS NOT NULL
+                            AND cp.status = 7
+                      GROUP BY 1
+                      HAVING MAX(circ.checkin_time) < NOW() - CAST( COALESCE( BTRIM( setting.value,'"' ), ? )  AS INTERVAL)
+                    ) AS foo
+                                UNION ALL
+            SELECT  cp.id
+                          FROM $cp cp 
+                    LEFT JOIN $setting setting
+                        ON (cp.circ_lib = setting.org_unit AND setting.name = 'circ.reshelving_complete.interval')
+                    LEFT JOIN $circ circ ON (circ.target_copy = cp.id AND circ.id IS NULL)
+              WHERE cp.status = 7
+                    AND cp.create_date < NOW() - CAST( COALESCE( BTRIM( setting.value,'"' ), ? )  AS INTERVAL)
+          )
        SQL
 
        my $sth = action::circulation->db_Main->prepare_cached($sql);
diff --git a/Open-ILS/src/sql/Pg/000.english.pg83.fts-config.sql b/Open-ILS/src/sql/Pg/000.english.pg83.fts-config.sql
new file mode 100644 (file)
index 0000000..b089f77
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2004-2008  Georgia Public Library Service
+ * Copyright (C) 2008  Equinox Software, Inc., Laurentian University
+ * Mike Rylander <miker@esilibrary.com>
+ * Dan Scott <dscott@laurentian.ca>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+BEGIN;
+
+CREATE OR REPLACE FUNCTION oils_tsearch2 () RETURNS TRIGGER AS $$
+BEGIN
+       NEW.index_vector = to_tsvector((TG_ARGV[0])::regconfig, NEW.value);
+       RETURN NEW;
+END;
+$$ LANGUAGE PLPGSQL;
+
+DROP TEXT SEARCH DICTIONARY IF EXISTS english_nostop CASCADE;
+
+CREATE TEXT SEARCH DICTIONARY english_nostop (TEMPLATE=pg_catalog.snowball, language='english');
+COMMENT ON TEXT SEARCH DICTIONARY english_nostop IS 'English snowball stemmer with no stopwords for ASCII words only.';
+
+CREATE TEXT SEARCH CONFIGURATION title ( COPY = pg_catalog.english );
+ALTER TEXT SEARCH CONFIGURATION title ALTER MAPPING FOR word, hword, hword_part WITH pg_catalog.simple;
+ALTER TEXT SEARCH CONFIGURATION title ALTER MAPPING FOR asciiword, asciihword, hword_asciipart WITH public.english_nostop;
+CREATE TEXT SEARCH CONFIGURATION author ( COPY = title );
+CREATE TEXT SEARCH CONFIGURATION subject ( COPY = title );
+CREATE TEXT SEARCH CONFIGURATION keyword ( COPY = title );
+CREATE TEXT SEARCH CONFIGURATION series ( COPY = title );
+CREATE TEXT SEARCH CONFIGURATION "default" ( COPY = title );
+
+COMMIT;
index 6a65297..e70fb92 100644 (file)
@@ -46,16 +46,6 @@ COMMENT ON SCHEMA config IS $$
  */
 $$;
 
-CREATE TABLE config.i18n_core (
-    id              BIGSERIAL   PRIMARY KEY,
-    fq_field        TEXT        NOT NULL,
-    identity_value  TEXT        NOT NULL,
-    translation     TEXT        NOT NULL,
-    string          TEXT        NOT NULL
-);
-
-CREATE UNIQUE INDEX i18n_identity ON config.i18n_core (fq_field,identity_value,translation);
-
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,
        quality         INT     CHECK ( quality BETWEEN 0 AND 100 ),
@@ -496,5 +486,22 @@ INSERT INTO config.z3950_attr (source,name,label,code,format) VALUES ('oclc','pu
 INSERT INTO config.z3950_attr (source,name,label,code,format) VALUES ('oclc','item_type','Item Type',1001,1);
 
 
+CREATE TABLE config.i18n_locale (
+    code        TEXT    PRIMARY KEY,
+    marc_code   TEXT    NOT NULL REFERENCES config.language_map (code),
+    name        TEXT    UNIQUE NOT NULL,
+    description TEXT
+);
+
+CREATE TABLE config.i18n_core (
+    id              BIGSERIAL   PRIMARY KEY,
+    fq_field        TEXT        NOT NULL,
+    identity_value  TEXT        NOT NULL,
+    translation     TEXT        NOT NULL    REFERENCES config.i18n_locale (code),
+    string          TEXT        NOT NULL
+);
+
+CREATE UNIQUE INDEX i18n_identity ON config.i18n_core (fq_field,identity_value,translation);
+
 COMMIT;
 
index bc41328..775588c 100644 (file)
@@ -78,9 +78,9 @@ CREATE TABLE permission.usr_grp_map (
 
 CREATE OR REPLACE FUNCTION permission.grp_ancestors ( INT ) RETURNS SETOF permission.grp_tree AS $$
        SELECT  a.*
-       FROM    connectby('permission.grp_tree','parent','id','name',$1,'100','.')
+       FROM    connectby('permission.grp_tree'::text,'parent'::text,'id'::text,'name'::text,$1::text,100,'.'::text)
                        AS t(keyid text, parent_keyid text, level int, branch text,pos int)
-               JOIN permission.grp_tree a ON a.id = t.keyid
+               JOIN permission.grp_tree a ON a.id::text = t.keyid::text
        ORDER BY
                CASE WHEN a.parent IS NULL
                        THEN 0
index efc253d..9528e1d 100644 (file)
@@ -134,30 +134,30 @@ $$ language 'plpgsql';
 
 CREATE OR REPLACE FUNCTION actor.org_unit_descendants ( INT ) RETURNS SETOF actor.org_unit AS $$
        SELECT  a.*
-         FROM  connectby('actor.org_unit','id','parent_ou','name',$1,'100','.')
+         FROM  connectby('actor.org_unit'::text,'id'::text,'parent_ou'::text,'name'::text,$1::text,100,'.'::text)
                        AS t(keyid text, parent_keyid text, level int, branch text,pos int)
-               JOIN actor.org_unit a ON a.id = t.keyid
+               JOIN actor.org_unit a ON a.id::text = t.keyid::text
          ORDER BY  CASE WHEN a.parent_ou IS NULL THEN 0 ELSE 1 END, a.name;
 $$ LANGUAGE SQL STABLE;
 
 CREATE OR REPLACE FUNCTION actor.org_unit_ancestors ( INT ) RETURNS SETOF actor.org_unit AS $$
        SELECT  a.*
-         FROM  connectby('actor.org_unit','parent_ou','id','name',$1,'100','.')
+         FROM  connectby('actor.org_unit'::text,'parent_ou'::text,'id'::text,'name'::text,$1::text,100,'.'::text)
                        AS t(keyid text, parent_keyid text, level int, branch text,pos int)
-               JOIN actor.org_unit a ON a.id = t.keyid
+               JOIN actor.org_unit a ON a.id::text = t.keyid::text
          ORDER BY  CASE WHEN a.parent_ou IS NULL THEN 0 ELSE 1 END, a.name;
 $$ LANGUAGE SQL STABLE;
 
 CREATE OR REPLACE FUNCTION actor.org_unit_descendants ( INT,INT ) RETURNS SETOF actor.org_unit AS $$
        SELECT  a.*
-         FROM  connectby('actor.org_unit','id','parent_ou','name',
+         FROM  connectby('actor.org_unit'::text,'id'::text,'parent_ou'::text,'name'::text,
                                (SELECT x.id
                                   FROM actor.org_unit_ancestors($1) x
                                        JOIN actor.org_unit_type y ON x.ou_type = y.id
-                                 WHERE y.depth = $2)
-               ,'100','.')
+                                 WHERE y.depth = $2)::text
+               ,100,'.'::text)
                        AS t(keyid text, parent_keyid text, level int, branch text,pos int)
-               JOIN actor.org_unit a ON a.id = t.keyid
+               JOIN actor.org_unit a ON a.id::text = t.keyid::text
          ORDER BY  CASE WHEN a.parent_ou IS NULL THEN 0 ELSE 1 END, a.name;
 $$ LANGUAGE SQL STABLE;
 
diff --git a/Open-ILS/src/sql/Pg/1.2.2.2-1.2.2.3-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.2.2.2-1.2.2.3-upgrade-db.sql
new file mode 100644 (file)
index 0000000..062cf70
--- /dev/null
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2008  Equinox Software, Inc.
+ * Mike Rylander <miker@esilibrary.com.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+
+-- It's OK if any of the following, before the transaction, fails ...
+
+CREATE SCHEMA extend_reporter;
+
+CREATE TABLE extend_reporter.legacy_circ_count (
+    id          BIGSERIAL   PRIMARY KEY REFERENCES asset.copy (id),
+    circ_count  INT         NOT NULL DEFAULT 0
+);
+
+INSERT INTO permission.perm_list (code, description) VALUES ('DELETE_RECORD', 'Allow a staff member to directly remove a bibliographic record');
+SELECT SETVAL('permission.perm_list_id_seq'::TEXT, (SELECT MAX(id) FROM permission.perm_list));
+
+BEGIN;
+
+CREATE OR REPLACE VIEW extend_reporter.full_circ_count AS
+ SELECT cp.id, COALESCE(sum(c.circ_count), 0::bigint) + COALESCE(count(circ.id), 0::bigint) AS circ_count
+   FROM asset."copy" cp
+   LEFT JOIN extend_reporter.legacy_circ_count c USING (id)
+   LEFT JOIN "action".circulation circ ON circ.target_copy = c.id
+  GROUP BY cp.id;
+
+UPDATE  metabib.title_field_entry
+  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
+  WHERE value ~ E'(\\d{4})-(\\d{4})';
+
+UPDATE  metabib.author_field_entry
+  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
+  WHERE value ~ E'(\\d{4})-(\\d{4})';
+
+UPDATE  metabib.keyword_field_entry
+  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
+  WHERE value ~ E'(\\d{4})-(\\d{4})';
+
+UPDATE  metabib.subject_field_entry
+  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
+  WHERE value ~ E'(\\d{4})-(\\d{4})';
+
+UPDATE  metabib.series_field_entry
+  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
+  WHERE value ~ E'(\\d{4})-(\\d{4})';
+
+UPDATE  metabib.full_rec
+  SET   value = REGEXP_REPLACE(value, E'(\\d{4})-(\\d{4})', E'\\1 \\2','g')
+  WHERE value ~ E'(\\d{4})-(\\d{4})';
+
+COMMIT;
+
index 8c91ba6..b8498d8 100644 (file)
@@ -191,8 +191,10 @@ BEGIN
                 END IF;
 
 
-                current_rank := current_rank || ' * ( CASE WHEN ' || tmp_text ||
-                    ' THEN ' || rank_adjust.multiplier || '::REAL ELSE 1.0 END )';
+                IF tmp_text IS NOT NULL THEN
+                    current_rank := current_rank || ' * ( CASE WHEN ' || tmp_text ||
+                        ' THEN ' || rank_adjust.multiplier || '::REAL ELSE 1.0 END )';
+                END IF;
 
                 used_ranks := array_append( used_ranks, rank_adjust.bump_type );
 
index e1aa61f..f96dbf4 100644 (file)
@@ -173,6 +173,7 @@ INSERT INTO config.lit_form_map (code, value, description) VALUES
     ('u', oils_i18n_gettext('Unknown'), oils_i18n_gettext('The literary form of the item is unknown.'));
 
 -- TO-DO: Auto-generate these values from CLDR
+-- XXX These are the values used in MARC records ... does that match CLDR, including deprecated languages?
 INSERT INTO config.language_map (code, value) VALUES ('aar', oils_i18n_gettext('Afar'));
 INSERT INTO config.language_map (code, value) VALUES ('abk', oils_i18n_gettext('Abkhaz'));
 INSERT INTO config.language_map (code, value) VALUES ('ace', oils_i18n_gettext('Achinese'));
@@ -691,6 +692,20 @@ INSERT INTO config.bib_level_map (code, value) VALUES ('i', oils_i18n_gettext('I
 INSERT INTO config.bib_level_map (code, value) VALUES ('m', oils_i18n_gettext('Monograph/Item'));
 INSERT INTO config.bib_level_map (code, value) VALUES ('s', oils_i18n_gettext('Serial'));
 
+
+-- available locales
+INSERT INTO config.i18n_locale (code,marc_code,name,description)
+    VALUES ('en_us','eng',oils_i18n_gettext('American English'),oils_i18n_gettext('American English'));
+INSERT INTO config.i18n_locale (code,marc_code,name,description)
+    VALUES ('en_ca','eng',oils_i18n_gettext('Canadian English'),oils_i18n_gettext('Canadian English'));
+INSERT INTO config.i18n_locale (code,marc_code,name,description)
+    VALUES ('fr_ca','fre',oils_i18n_gettext('Canadian Fench'),oils_i18n_gettext('Canadian French'));
+INSERT INTO config.i18n_locale (code,marc_code,name,description)
+    VALUES ('es_us','spa',oils_i18n_gettext('American Spanish'),oils_i18n_gettext('American Spanish'));
+INSERT INTO config.i18n_locale (code,marc_code,name,description)
+    VALUES ('es_mx','spa',oils_i18n_gettext('Mexican Spanish'),oils_i18n_gettext('Mexican Spanish'));
+
+
 --005.schema.actors.sql:
 
 -- The PINES levels
index 549c22a..ea7d1dd 100644 (file)
@@ -83,8 +83,7 @@
                                             'instantiate('+
                                                                                                'openils.widget.TranslatorPopup,{field:"value",'+
                                                'targetObject:"grid_row_object_cache.cam['+row+']"}'+
-                                                                                       ');'+
-                                        'cam_grid.rowHeightChanged('+row+');',
+                                                                                       ');cam_grid.rowHeightChanged('+row+');',
                                         0
                                     );
                                     var oldnode = dojo.byId('value_translation_cam_' + row);
                                             'instantiate('+
                                                                                                'openils.widget.TranslatorPopup,{field:"description",'+
                                                'targetObject:"grid_row_object_cache.cam['+row+']"}'+
-                                                                                       ');'+
-                                        'cam_grid.rowHeightChanged('+row+');',
+                                                                                       ');cam_grid.rowHeightChanged('+row+');',
                                         0
                                     );
                                     var oldnode = dojo.byId('description_translation_cam_' + row);
                 }
             ];
 
-                       var codelist = ['cam','cblvl','cifm','citm','clm','clfm'];//,'cvrfm'];
+                       var codelist = ['cam','cblvl','cifm','citm','clm','clfm','cvrfm'];
                        var hashes = {};
                        var objects = {};
-                       var models = {};
+                       var stores = {};
 
                        console.log('about to loop over codelist: ' + codelist);
 
                        for (var i in codelist) {
-                               var classname = codelist[i];
-
-                               hashes[classname] = fieldmapper.standardRequest(
-                                       [ 'open-ils.fielder', 'open-ils.fielder.' + classname + '.atomic'],
-                                       [ { query : { code : { '!=' : null } } } ]
-                               );
-
-                               console.log('created hashes for ' + classname);
-
-                               if (!hashes[classname]) continue;
-
-                               objects[classname] = dojo.map(
-                                       hashes[classname].concat(),
-                                       new Function('x', 'return new fieldmapper.' + classname + '().fromHash( x );')
-                               );
-
-                               console.log('created objects for ' + classname);
-
-                               stores[classname] =  new dojo.data.ItemFileWriteStore(
-                                       { data : fieldmapper[classname].toStoreData( objects[classname], 'value' ) }
-                               );
-
-                               console.log('create store for ' + classname);
-
-                               if (classname != 'cam') {
-                                       layouts[classname] = [
-                        {   cells : [
-                                [
-                                    { name : "Code",  field : "code",  width : "5em",  editor : dojox.grid.editors.Dijit,  rowSpan : "2" },
-                                    { name : "Value", field : "value", width : "auto", editor : dojox.grid.editors.Editor, style : "minHeight:1em;" },
-                                    { name : "Translation",
-                                      width : "10em",
-                                      height : "2em",
-                                      get : function (row) {
-                                        if (!grid_row_object_cache[classname]) grid_row_object_cache[classname] = [];
-                                        var r = this.grid.model.getRow(row);
-                                        if (r) {
-                                               grid_row_object_cache[classname][row] = new fieldmapper[classname]().fromHash(this.grid.model.getRow(row));
-                                            setTimeout(
-                                                'dojo.query(".'+classname+'_value_' + row + '").'+
-                                                    'instantiate('+
-                                                                                                       'openils.widget.TranslatorPopup,{field:"value",'+
-                                                       'targetObject:"grid_row_object_cache.'+classname+'['+row+']"}'+
-                                                                                               ');'+
-                                                classname+'_grid.rowHeightChanged('+row+');',
-                                                0
-                                            );
-                                            return '<span class="'+classname+'_value_'+row+'"></span>';
-                                        }
-                                        return '';
-                                      }
-                                    }
-                                ]
-                            ]
-                        }
-                    ];
-                               }
+
+                               (function (classname) {
+
+                                       hashes[classname] = fieldmapper.standardRequest(
+                                               [ 'open-ils.fielder', 'open-ils.fielder.' + classname + '.atomic'],
+                                               [ { query : { code : { '!=' : null } } } ]
+                                       );
+
+                                       console.log('created hashes for ' + classname);
+
+                                       if (!hashes[classname]) return;
+
+                                       objects[classname] = dojo.map(
+                                               hashes[classname].concat(),
+                                               new Function('x', 'return new fieldmapper.' + classname + '().fromHash( x );')
+                                       );
+
+                                       console.log('created objects for ' + classname);
+
+                                       stores[classname] =  new dojo.data.ItemFileWriteStore(
+                                               { data : fieldmapper[classname].toStoreData( objects[classname], 'value' ) }
+                                       );
+
+                                       console.log('create store for ' + classname);
+
+                                       if (classname != 'cam') {
+                                               layouts[classname] = [
+                                           {   cells : [
+                                                       [
+                                                               { name : "Code",  field : "code",  width : "5em",  editor : dojox.grid.editors.Dijit },
+                                                                   { name : "Value", field : "value", width : "auto", editor : dojox.grid.editors.Editor, style : "minHeight:1em;" },
+                                                                       { name : "Translation",
+                                                                             width : "10em",
+                                                                                 height : "2em",
+                                             get : function (row) {
+                                                   if (!grid_row_object_cache[classname]) grid_row_object_cache[classname] = [];
+                                                       var r = this.grid.model.getRow(row);
+                                                           if (r) {
+                                                                       grid_row_object_cache[classname][row] = new fieldmapper[classname]().fromHash(r);
+                                                                       setTimeout(
+                                                                               'dojo.query(".'+classname+'_value_' + row + '").'+
+                                                                                       'instantiate('+
+                                                                                                                       'openils.widget.TranslatorPopup,{field:"value",'+
+                                                                                                       'targetObject:"grid_row_object_cache.'+classname+'['+row+']"}'+
+                                                                                                               ');'+classname+'_grid.rowHeightChanged('+row+');',
+                                                       0
+                                                       );
+                                                                                               var oldnode = dojo.byId('value_translation_' + classname + '_' + row);
+                                                                                               if (oldnode) dijit.byNode(oldnode).destroyRecursive();
+                                                                   return '<span class="'+classname+'_value_'+row+'"></span>';
+                                                                   }
+                                                                       return '';
+                                                                         }
+                                           }
+                                           ]
+                                           ]
+                                           }
+                                           ];
+                                       }
+                               })(codelist[i])
+
                        }
 
                </script>
                <div dojoType="dijit.layout.TabContainer" id="grid_container" class="grid_container" style="margin: 5px;" orientation="vertical" layoutAlign="top">
 
                        <div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="Audience Map">
-                               <script type="dojo/connect" event="onShow">
-                                       cam_model.refresh();
-                                       cam_grid.refresh();
-                               </script>
-
                                <div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
                
                                        <div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
                                                <button style="margin-left:10px" layoutAlign="bottom" jsId="delete_cam_button" dojoType="dijit.form.Button" label="Delete Selected" onclick="delete_grid_selection('cam',cam_grid)"></button>
                                                <button style="margin-left:20px" layoutAlign="bottom" jsId="save_button" dojoType="dijit.form.Button" label="Save Changes" onClick="save_them_all()"></button>
                                        </div>
-
+               
                                        <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-                                               <div dojoType="dojox.grid.data.DojoData" jsId="cam_model"store="stores.cam" query="{ code : '*' }"></div>
-                                               <div dojoType="dojox.Grid" jsId="cam_grid" model="cam_model" structure="layouts.cam"></div>
+                                               <div dojoType="dojox.grid.data.DojoData" jsId="cam_model" store="stores.cam" query="{ code : '*' }"></div>
+                                               <div dojoType="dojox.Grid" jsId="cam_grid">
+                                                       <script type="dojo/connect" event="startup">
+                                                               this.setStructure(window.layouts.cam);
+                                                               this.setModel(window.cam_model);
+                                                       </script>
+                                               </div>
+
                                        </div>
                
                                </div>
 
                        </div>
                
-                       <div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="Bib Level Map">
+                       <div id="cblvl_pane" dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="Bib Level Map">
                                <script type="dojo/connect" event="onShow">
-                                       cblvl_model.refresh();
-                                       cblvl_grid.refresh();
+                                       if (!window.cblvl_once) setTimeout("cblvl_grid.render()",0);
+                                       window.cblvl_once = 1;
                                </script>
                                <div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
 
                
                                        <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
                                                <div dojoType="dojox.grid.data.DojoData" jsId="cblvl_model"store="stores.cblvl" query="{ code : '*' }"></div>
-                                               <div dojoType="dojox.Grid" jsId="cblvl_grid" model="cblvl_model" structure="layouts.cblvl"></div>
-                                       </div>
+                                               <div dojoType="dojox.Grid"  jsId="cblvl_grid">
+                                                       <script type="dojo/connect" event="startup">
+                                                               this.setStructure(window.layouts.cblvl);
+                                                               this.setModel(window.cblvl_model);
+                                                       </script>
+                                               </div>
 
+                                       </div>
+       
                                </div>
 
                        </div>
 
                        <div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="Item Form Map">
                                <script type="dojo/connect" event="onShow">
-                                       cifm_model.refresh();
-                                       cifm_grid.refresh();
+                                       if (!window.cifm_once) setTimeout("cifm_grid.render()",0);
+                                       window.cifm_once = 1;
                                </script>
-
                                <div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
 
                                        <div dojoType="dijit.form.Form" orientation="horizontal" style="margin: 5px;" layoutAlign="top" onSubmit="create_marc_code">
        
                                        <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
                                                <div dojoType="dojox.grid.data.DojoData" jsId="cifm_model"store="stores.cifm" query="{ code : '*' }"></div>
-                                               <div dojoType="dojox.Grid" jsId="cifm_grid" model="cifm_model" structure="layouts.cifm"></div>
+                                               <div dojoType="dojox.Grid"  jsId="cifm_grid">
+                                                       <script type="dojo/connect" event="startup">
+                                                               this.setStructure(window.layouts.cifm);
+                                                               this.setModel(window.cifm_model);
+                                                       </script>
+                                               </div>
+
                                        </div>
        
                                </div>
 
                        <div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="Item Type Map">
                                <script type="dojo/connect" event="onShow">
-                                       citm_model.refresh();
-                                       citm_grid.refresh();
+                                       if (!window.citm_once) setTimeout("citm_grid.render()",0);
+                                       window.citm_once = 1;
                                </script>
 
                                <div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
                
                                        <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
                                                <div dojoType="dojox.grid.data.DojoData" jsId="citm_model"store="stores.citm" query="{ code : '*' }"></div>
-                                               <div dojoType="dojox.Grid" jsId="citm_grid" model="citm_model" structure="layouts.citm"></div>
+                                               <div dojoType="dojox.Grid"  jsId="citm_grid">
+                                                       <script type="dojo/connect" event="startup">
+                                                               this.setStructure(window.layouts.citm);
+                                                               this.setModel(window.citm_model);
+                                                       </script>
+                                               </div>
+
                                        </div>
        
                                </div>
 
                        <div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="Language Map">
                                <script type="dojo/connect" event="onShow">
-                                       clm_model.refresh();
-                                       clm_grid.refresh();
+                                       if (!window.clm_once) setTimeout("clm_grid.render()",0);
+                                       window.clm_once = 1;
                                </script>
 
                                <div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
                
                                        <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
                                                <div dojoType="dojox.grid.data.DojoData" jsId="clm_model"store="stores.clm" query="{ code : '*' }"></div>
-                                               <div dojoType="dojox.Grid" jsId="clm_grid" model="clm_model" structure="layouts.clm"></div>
+                                               <div dojoType="dojox.Grid"  jsId="clm_grid">
+                                                       <script type="dojo/connect" event="startup">
+                                                               this.setStructure(window.layouts.clm);
+                                                               this.setModel(window.clm_model);
+                                                       </script>
+                                               </div>
+
                                        </div>
        
                                </div>
 
                        <div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="Literary Form Map">
                                <script type="dojo/connect" event="onShow">
-                                       clfm_model.refresh();
-                                       clfm_grid.refresh();
+                                       if (!window.clfm_once) setTimeout("clfm_grid.render()",0);
+                                       window.clfm_once = 1;
                                </script>
 
                                <div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
                
                                        <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
                                                <div dojoType="dojox.grid.data.DojoData" jsId="clfm_model"store="stores.clfm" query="{ code : '*' }"></div>
-                                               <div dojoType="dojox.Grid" jsId="clfm_grid" model="clfm_model" structure="layouts.clfm"></div>
+                                               <div dojoType="dojox.Grid"  jsId="clfm_grid">
+                                                       <script type="dojo/connect" event="startup">
+                                                               this.setStructure(window.layouts.clfm);
+                                                               this.setModel(window.clfm_model);
+                                                       </script>
+                                               </div>
+
                                        </div>
        
                                </div>
 
                        <div dojoType="dijit.layout.ContentPane" class="grid_container" orientation="vertical" title="Vidoe Recording Format Map">
                                <script type="dojo/connect" event="onShow">
-                                       cvrfm_model.refresh();
-                                       cvrfm_grid.refresh();
+                                       if (!window.cvrfm_once) setTimeout("cvrfm_grid.render()",0);
+                                       window.cvrfm_once = 1;
                                </script>
 
                                <div dojoType="dijit.layout.LayoutContainer" class="grid_container" orientation="vertical">
                
                                        <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
                                                <div dojoType="dojox.grid.data.DojoData" jsId="cvrfm_model"store="stores.cvrfm" query="{ code : '*' }"></div>
-                                               <div dojoType="dojox.Grid" jsId="cvrfm_grid" model="cvrfm_model" structure="layouts.cvrfm"></div>
+                                               <div dojoType="dojox.Grid"  jsId="cvrfm_grid">
+                                                       <script type="dojo/connect" event="startup">
+                                                               this.setStructure(window.layouts.cvrfm);
+                                                               this.setModel(window.cvrfm_model);
+                                                       </script>
+                                               </div>
+
                                        </div>
        
                                </div>
 
-                       </div>
+               </div>
 
                </div>
-       
+               
        </body>
 </html>
index 4eed81b..4c32ddd 100644 (file)
@@ -105,7 +105,7 @@ function save_them_all (event) {
                store.fetch({
                        query : { ischanged : 1 },
                        onItem : function (item, req) { try { if (this.isItem( item )) window.dirtyStore.push( item ); } catch (e) { /* meh */ } },
-                       scope : perm_store
+                       scope : store
                });
 
                var confirmation = true;
index 029ea78..215a530 100644 (file)
@@ -22,14 +22,6 @@ if(!dojo._hasResource["openils.I18N"]) {
     dojo.require("fieldmapper.dojoData");
     dojo.require("DojoSRF");
        dojo.require("dojo.data.ItemFileWriteStore");
-       dojo.require("dijit._Widget");
-       dojo.require("dijit._Templated");
-       dojo.require("dijit.layout.ContentPane");
-       dojo.require("dijit.Dialog");
-       dojo.require("dijit.form.Button");
-       dojo.require("dijit.form.TextBox");
-       dojo.require("dijit.form.ComboBox");
-
 
     dojo.declare('openils.I18N', null, {});
 
@@ -53,7 +45,7 @@ if(!dojo._hasResource["openils.I18N"]) {
                var classname = obj.classname;
 
                // XXX need to derive identity field from IDL...
-               var ident_field = fieldmapper[classname].Identifier || 'id';
+               var ident_field = fieldmapper[classname].Identifier;
                var ident_value = obj[ident_field]();
 
                var fielder_args = { query : { fq_field : classname + '.' + field, identity_value : ident_value } };
index fe7f74d..76a4666 100644 (file)
@@ -67,7 +67,9 @@ if(!dojo._hasResource["openils.widget.TranslatorPopup"]) {
                        },
 
                        renderTranslatorPopup : function () {
-               
+
+                               var _trans_dijit = this;
+
                                var _trans_dijit = this;
 
                                this._targetObject = dojox.jsonPath.query(window, '$.' + this.targetObject, {evalType:"RESULT"});
@@ -183,7 +185,7 @@ if(!dojo._hasResource["openils.widget.TranslatorPopup"]) {
                                        isdeleted : method == 'delete' ? 1 : 0,
                                        id : trans_id,
                                        fq_field : this._targetObject.classname + '.' + this.field,
-                                       identity_value : this._targetObject.id(),
+                                       identity_value : this._targetObject[fieldmapper[this._targetObject.classname].Identifier](),
                                        translation : dijit.byId('locale_' + trans_id).getValue(),
                                        string : dijit.byId('translation_' + trans_id).getValue()
                                });
@@ -197,7 +199,7 @@ if(!dojo._hasResource["openils.widget.TranslatorPopup"]) {
                                var trans_obj = new i18n().fromHash({
                                        isnew : 1,
                                        fq_field : this._targetObject.classname + '.' + this.field,
-                                       identity_value : this._targetObject.id(),
+                                       identity_value : this._targetObject[fieldmapper[this._targetObject.classname].Identifier](),
                                        translation : dijit.byId('i18n_new_locale_' + this._targetObject.classname + '.' + this.field + this.unique).getValue(),
                                        string : dijit.byId('i18n_new_translation_' + this._targetObject.classname + '.' + this.field + this.unique).getValue()
                                });
index e33aaba..8ba6519 100644 (file)
@@ -55,8 +55,6 @@
 
 <!ENTITY ilsperm.CREATE_HOLD "User is not allowed to create holds for other users at this location">
 
-
-
 <!ENTITY common.cancel.accesskey "C">
 <!ENTITY common.login.accesskey "L">
 <!ENTITY common.password.accesskey "P">
@@ -64,9 +62,9 @@
 <!ENTITY staff.about.title "About">
 <!ENTITY staff.acp_label_barcode "Barcode">
 <!ENTITY staff.acp_label_call_number "Call Number">
-<!ENTITY staff.acp_label_circ_as_type "Circ As Type">
-<!ENTITY staff.acp_label_circ_lib "Circ Lib">
-<!ENTITY staff.acp_label_circ_modifier "Circ Modifier">
+<!ENTITY staff.acp_label_circ_as_type "Circulate As Type">
+<!ENTITY staff.acp_label_circ_lib "Circulation Library">
+<!ENTITY staff.acp_label_circ_modifier "Circulation Modifier">
 <!ENTITY staff.acp_label_copy_number "Copy Number">
 <!ENTITY staff.acp_label_deposit "Deposit">
 <!ENTITY staff.acp_label_deposit_amount "Deposit Amount">
 <!ENTITY staff.ahr_fulfillment_time_label "Fulfillment Time">
 <!ENTITY staff.ahr_hold_type_label "Type">
 <!ENTITY staff.ahr_holdable_formats_label "Holdable Formats">
-<!ENTITY staff.ahr_id_label "Hold Id">
-<!ENTITY staff.ahr_ischanged_label "Ischanged">
-<!ENTITY staff.ahr_isdeleted_label "Isdeleted">
-<!ENTITY staff.ahr_isnew_label "Isnew">
+<!ENTITY staff.ahr_id_label "Hold ID">
+<!ENTITY staff.ahr_ischanged_label "Is changed">
+<!ENTITY staff.ahr_isdeleted_label "Is deleted">
+<!ENTITY staff.ahr_isnew_label "Is new">
 <!ENTITY staff.ahr_phone_notify_label "Phone Notify">
-<!ENTITY staff.ahr_pickup_lib_label "Pickup Lib">
-<!ENTITY staff.ahr_prev_check_time_label "Prev Check Time">
+<!ENTITY staff.ahr_pickup_lib_label "Pickup Library">
+<!ENTITY staff.ahr_prev_check_time_label "Previous Check Time">
 <!ENTITY staff.ahr_request_time_label "Request Time">
 <!ENTITY staff.ahr_requestor_label "Requestor">
 <!ENTITY staff.ahr_selection_depth_label "Selection Depth">
 <!ENTITY staff.ahr_status_label "Status">
 <!ENTITY staff.ahr_target_label "Target">
-<!ENTITY staff.ahr_usr_label "Usr">
+<!ENTITY staff.ahr_usr_label "User">
 <!ENTITY staff.au_active_label "Active">
 <!ENTITY staff.au_addresses_label "Addresses">
 <!ENTITY staff.au_alert_message_label "Alert Message">
 <!ENTITY staff.au_billing_address_label "Billing Address">
 <!ENTITY staff.au_card_label "Card">
 <!ENTITY staff.au_cards_label "Cards">
-<!ENTITY staff.au_checkouts_label "Checkouts">
+<!ENTITY staff.au_checkouts_label "Check Outs">
 <!ENTITY staff.au_claims_returned_count_label "Claims Returned Count">
 <!ENTITY staff.au_create_date_label "Create Date">
 <!ENTITY staff.au_credit_forward_balance_label "Credit Forward Balance">
 <!ENTITY staff.au_day_phone_label "Day Phone">
-<!ENTITY staff.au_dob_label "Dob">
+<!ENTITY staff.au_dob_label "Date of Birth">
 <!ENTITY staff.au_email_label "Email">
 <!ENTITY staff.au_evening_phone_label "Evening Phone">
 <!ENTITY staff.au_expire_date_label "Expire Date">
 <!ENTITY staff.au_family_name_label "Family Name">
 <!ENTITY staff.au_first_given_name_label "First Given Name">
 <!ENTITY staff.au_hold_requests_label "Hold Requests">
-<!ENTITY staff.au_home_ou_label "Home Ou">
-<!ENTITY staff.au_id_label "User Id">
-<!ENTITY staff.au_ident_type2_label "Ident Type2">
-<!ENTITY staff.au_ident_type_label "Ident Type">
-<!ENTITY staff.au_ident_value2_label "Ident Value2">
-<!ENTITY staff.au_ident_value_label "Ident Value">
-<!ENTITY staff.au_ischanged_label "Ischanged">
-<!ENTITY staff.au_isdeleted_label "Isdeleted">
-<!ENTITY staff.au_isnew_label "Isnew">
+<!-- "OU" is an organization unit - typically a library -->
+<!ENTITY staff.au_home_ou_label "Home OU">
+<!ENTITY staff.au_id_label "User ID">
+<!ENTITY staff.au_ident_type2_label "Identification Type2">
+<!ENTITY staff.au_ident_type_label "Identification Type">
+<!ENTITY staff.au_ident_value2_label "Identification Value2">
+<!ENTITY staff.au_ident_value_label "Identification Value">
+<!ENTITY staff.au_ischanged_label "Is changed">
+<!ENTITY staff.au_isdeleted_label "Is deleted">
+<!ENTITY staff.au_isnew_label "Is new">
 <!ENTITY staff.au_label_active "Active">
 <!ENTITY staff.au_label_family_name "Family Name">
 <!ENTITY staff.au_label_first_given_name "First Name">
 <!ENTITY staff.au_label_prefix "Prefix">
 <!ENTITY staff.au_label_second_given_name "Middle Name">
 <!ENTITY staff.au_label_suffix "Suffix">
-<!ENTITY staff.au_last_xact_id_label "Last Xact Id">
+<!-- "xact" is a transaction -->
+<!ENTITY staff.au_last_xact_id_label "Last Xact ID">
 <!ENTITY staff.au_mailing_address_label "Mailing Address">
 <!ENTITY staff.au_master_account_label "Master Account">
 <!ENTITY staff.au_net_access_level_label "Net Access Level">
 <!ENTITY staff.au_other_phone_label "Other Phone">
-<!ENTITY staff.au_passwd_label "Passwd">
+<!ENTITY staff.au_passwd_label "Password">
 <!ENTITY staff.au_password_label "Password">
-<!ENTITY staff.au_photo_url_label "Photo Url">
+<!ENTITY staff.au_photo_url_label "Photo URL">
 <!ENTITY staff.au_prefix_label "Prefix">
 <!ENTITY staff.au_profile_label "Profile">
 <!ENTITY staff.au_second_given_name_label "Second Given Name">
 <!ENTITY staff.au_settings_label "Settings">
 <!ENTITY staff.au_standing_label "Standing">
-<!ENTITY staff.au_stat_cat_entries_label "Stat Cat Entries">
+<!ENTITY staff.au_stat_cat_entries_label "Statistical Category Entries">
 <!ENTITY staff.au_suffix_label "Suffix">
 <!ENTITY staff.au_super_user_label "Super User">
 <!ENTITY staff.au_survey_responses_label "Survey Responses">
-<!ENTITY staff.au_usrgroup_label "Usrgroup">
-<!ENTITY staff.au_usrname_label "Usrname">
+<!ENTITY staff.au_usrgroup_label "User group">
+<!ENTITY staff.au_usrname_label "User name">
 <!ENTITY staff.admin.survey.available.label "Available to:">
 <!ENTITY staff.admin.survey.description.label "Description:">
 <!ENTITY staff.admin.survey.end.label "End:">
 <!ENTITY staff.admin.survey.save_question.label "Save this Question">
 <!ENTITY staff.admin.survey.staff_client.label "Staff Client:">
 <!ENTITY staff.admin.survey.start.label "Start:">
-<!ENTITY staff.auth.login_header "Login">
-<!ENTITY staff.auth.logoff_prompt "Log Off">
+<!ENTITY staff.auth.login_header "Log in">
+<!ENTITY staff.auth.logoff_prompt "Log off">
 <!ENTITY staff.auth.logoff_prompt.accesskey "f">
 <!ENTITY staff.auth.logoff_prompt.key "L">
 <!ENTITY staff.auth.name_prompt "Name:">
 <!ENTITY staff.auth.version "Evergreen 0.1.0 20051202">
 <!ENTITY staff.bills_current_payment_label "Current Payment">
 <!ENTITY staff.bills_information "Information">
-<!ENTITY staff.bills_interface_label "BILLS">
+<!ENTITY staff.bills_interface_label "Bills">
 <!ENTITY staff.bills_money_label "Money">
 <!ENTITY staff.bills_total_owed_label "Total Owed">
 <!ENTITY staff.bills_wizard_label "Bill Patron">
-<!ENTITY staff.bills_xact_dates_label "Record / Dates">
+<!ENTITY staff.bills_xact_dates_label "Record and Dates">
 <!ENTITY staff.browse_list.barcode "Barcode">
 <!ENTITY staff.browse_list.callnumber "Call Number">
 <!ENTITY staff.browse_list.circ_as_type "Circulate As">
-<!ENTITY staff.browse_list.circ_lib "Circulating Lib">
+<!ENTITY staff.browse_list.circ_lib "Circulating Library">
 <!ENTITY staff.browse_list.circ_modifier "Circ Modifier">
 <!ENTITY staff.browse_list.circulate "Circulate">
 <!ENTITY staff.browse_list.copy_number "Copy Number">
 <!ENTITY staff.browse_list.fine_level "Fine Level">
 <!ENTITY staff.browse_list.library "Owning Lib">
 <!ENTITY staff.browse_list.loan_duration "Loan Duration">
-<!ENTITY staff.browse_list.location "Location/Barcode">
+<!ENTITY staff.browse_list.location "Location and Barcode">
 <!ENTITY staff.browse_list.location2 "Location">
 <!ENTITY staff.browse_list.opac_visible "OPAC">
 <!ENTITY staff.browse_list.price "Price">
 <!ENTITY staff.cat.search_format "Format">
 <!ENTITY staff.cat.search_format.key "F">
 <!ENTITY staff.cat.search_id "System ID">
-<!ENTITY staff.cat.search_isbn "ISBN/ISSN">
+<!ENTITY staff.cat.search_isbn "ISBN or ISSN">
 <!ENTITY staff.cat.search_location "Location">
 <!ENTITY staff.cat.search_location.key "L">
 <!ENTITY staff.cat.search_order "Order">
 <!ENTITY staff.cat.type_of_material.m "Computer File">
 <!ENTITY staff.cat.type_of_material.o "Kit">
 <!ENTITY staff.cat.type_of_material.p "Mixed Material">
-<!ENTITY staff.cat.type_of_material.r "Three-dimensional Artifact or Naturally Occuring Object">
+<!ENTITY staff.cat.type_of_material.r "Three-dimensional Artifact or Naturally Occurring Object">
 <!ENTITY staff.cat.type_of_material.t "Manuscript Language Material">
 <!ENTITY staff.checkin.auto_print_label 'Auto-Print'>
 <!ENTITY staff.checkin.auto_print_label.accesskey 'A'>
 <!ENTITY staff.checkin.done_label 'Done'>
 <!ENTITY staff.checkin.done_label.accesskey 'D'>
-<!ENTITY staff.checkin.print_receipt_label 'Print List'>
-<!ENTITY staff.checkin.print_receipt_label.accesskey ''>
+<!ENTITY staff.checkin.print_receipt.label 'Print List'>
+<!ENTITY staff.checkin.print_receipt.accesskey ''>
 <!ENTITY staff.checkin.reprint_receipt_label 'Re-Print Last List'>
 <!ENTITY staff.checkin.reprint_receipt_label.accesskey 'L'>
-<!ENTITY staff.checkin_interface_label "CHECK IN">
+<!ENTITY staff.checkin_interface_label "Check In">
 <!ENTITY staff.checkin_label_route_to "Route To">
 <!ENTITY staff.checkin_label_status "Status">
 <!ENTITY staff.checkin_label_text "Message">
 <!ENTITY staff.checkin_patron.name.label 'Patron Name'>
 <!ENTITY staff.checkin_patron.retrieve 'Retrieve Patron'>
 <!ENTITY staff.checkin_patron.retrieve.accesskey 'R'>
-<!ENTITY staff.checkout_interface_label "CHECK OUT">
+<!ENTITY staff.checkout_interface_label "Check Out">
 <!ENTITY staff.circ.offline.main.label 'Evergreen Offline'>
 <!ENTITY staff.circ.offline.server_time.tooltiptext 'Estimated Server Time - Click to adjust'>
 <!ENTITY staff.circ.offline.cmd_checkout.accesskey 'C'>
 <!ENTITY staff.circ.offline_register.family_name.label 'Last Name:'>
 <!ENTITY staff.circ.offline_register.first_given_name.label 'First Name:'>
 <!ENTITY staff.circ.offline_register.dob.label 'Date of Birth:'>
-<!ENTITY staff.circ.offline_register.x_ident_type.label 'Ident Type:'>
+<!ENTITY staff.circ.offline_register.x_ident_type.label 'Identification Type:'>
 <!ENTITY staff.circ.offline_register.ident_value.label 'Ident Value:'>
 <!ENTITY staff.circ.offline_register.billing_address.label 'Billing Address'>
 <!ENTITY staff.circ.offline_register.street1.label 'Line 1'>
 <!ENTITY staff.circ.offline_renew.step5.label 'Repeat Steps 3 and 4 until done.'>
 
 <!ENTITY staff.circ.checkin.caption 'Check In'>
-<!ENTITY staff.circ.checkin.scan_label 'Enter Barcode:'>
-<!ENTITY staff.circ.checkin.scan_label.accesskey 'a'>
-<!ENTITY staff.circ.checkin.submit_label 'Submit'>
-<!ENTITY staff.circ.checkin.submit_label.accesskey 'S'>
+<!ENTITY staff.circ.checkin.scan.label 'Enter Barcode:'>
+<!ENTITY staff.circ.checkin.scan.accesskey 'a'>
+<!ENTITY staff.circ.checkin.submit.label 'Submit'>
+<!ENTITY staff.circ.checkin.submit.accesskey 'S'>
 <!ENTITY staff.circ.context_cancel_hold "Cancel Hold">
 <!ENTITY staff.circ.context_checkin "Check In">
 <!ENTITY staff.circ.context_edit "Edit Copy">
 <!ENTITY staff.circ.hold_capture.submit_label 'Submit'>
 <!ENTITY staff.circ.hold_capture.submit_label.accesskey 'S'>
 <!ENTITY staff.circ_label_due_date "Due Date">
-<!ENTITY staff.circ_label_id "Circ Id">
+<!ENTITY staff.circ_label_id "Circulation ID">
 <!ENTITY staff.circ_label_renewal_remaining "Remaining Renewals">
-<!ENTITY staff.circ_label_xact_finish "Checkin Date">
-<!ENTITY staff.circ_label_xact_start "Checkout Date">
-<!ENTITY staff.copies_editor_interface_label "COPIES EDIT">
+<!ENTITY staff.circ_label_xact_finish "Check in Date">
+<!ENTITY staff.circ_label_xact_start "Check out Date">
+<!ENTITY staff.copies_editor_interface_label "Copies Edit">
 <!ENTITY staff.copy.attr.barcode "Barcode">
 <!ENTITY staff.copy.attr.circulate "Circulate?">
 <!ENTITY staff.copy.attr.circulate.no "No">
 <!ENTITY staff.copy.transfer "Transfer Copy">
 <!ENTITY staff.copy.transfer.key "">
 <!ENTITY staff.copy.wizard.title "Batch Add Copies Wizard">
-<!ENTITY staff.copy_browser_interface_label "COPIES">
-<!ENTITY staff.copy_stat_cat_editor_interface_label "COPY STAT-CATS">
-<!ENTITY staff.display_patron_interface_label "DISPLAY PATRON">
+<!ENTITY staff.copy_browser_interface_label "Copies">
+<!ENTITY staff.copy_stat_cat_editor_interface_label "Copy statistical categories">
+<!ENTITY staff.display_patron_interface_label "Display patron">
 <!ENTITY staff.displaying.hits_per_page 'Results per page'>
 <!ENTITY staff.displaying.of 'of'>
 <!ENTITY staff.displaying.results 'Displaying results'>
-<!ENTITY staff.fieldmapper_label "FIELDMAPPER">
-<!ENTITY staff.filter_console_label "FCONSOLE">
-<!ENTITY staff.hold_capture.auto_print_label 'Auto-Print'>
-<!ENTITY staff.hold_capture.auto_print_label.accesskey 'A'>
-<!ENTITY staff.hold_capture.done_label 'Done'>
-<!ENTITY staff.hold_capture.done_label.accesskey 'D'>
-<!ENTITY staff.hold_capture.print_receipt_label 'Print List'>
-<!ENTITY staff.hold_capture.print_receipt_label.accesskey ''>
+<!ENTITY staff.fieldmapper_label "Fieldmapper">
+<!ENTITY staff.filter_console_label "Filter Console">
+<!ENTITY staff.hold_capture.auto_print.label 'Auto-Print'>
+<!ENTITY staff.hold_capture.auto_print.accesskey 'A'>
+<!ENTITY staff.hold_capture.done.label 'Done'>
+<!ENTITY staff.hold_capture.done.accesskey 'D'>
+<!ENTITY staff.hold_capture.print_receipt.label 'Print List'>
+<!ENTITY staff.hold_capture.print_receipt.accesskey ''>
 <!ENTITY staff.hold_capture.reprint_receipt_label 'Re-Print Last List'>
 <!ENTITY staff.hold_capture.reprint_receipt_label.accesskey 'L'>
-<!ENTITY staff.hold_capture_interface_label "HOLD CAPTURE">
+<!ENTITY staff.hold_capture_interface_label "Hold capture">
 <!ENTITY staff.hold_capture_patron.name.label 'Patron Name'>
 <!ENTITY staff.hold_capture_patron.retrieve 'Retrieve Patron'>
 <!ENTITY staff.hold_capture_patron.retrieve.accesskey 'R'>
 <!ENTITY staff.holds_status_in_transit "In Transit">
 <!ENTITY staff.holds_status_waiting_for_capture "Copy found, waiting for capture">
 <!ENTITY staff.holds_status_waiting_for_copy "Waiting for available copy">
-<!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.items_out_interface_label "Items out">
+<!ENTITY staff.javascript_console_label "Console">
+<!ENTITY staff.javascript_shell_label "JavaScript Shell">
+<!ENTITY staff.main.auth.caption "Startup and Shutdown">
+<!ENTITY staff.main.authentication.caption "Authentication">
 <!ENTITY staff.main.auth.debug.caption "Debug Options">
 <!ENTITY staff.main.auth.debug.clear "Clear Cache">
 <!ENTITY staff.main.auth.debug.clear.accesskey "C">
-<!ENTITY staff.main.auth.debug.javascript "Javascript Console">
+<!ENTITY staff.main.auth.debug.javascript "JavaScript Console">
 <!ENTITY staff.main.auth.debug.javascript.accesskey "J">
 <!ENTITY staff.main.auth.hostname "Hostname">
 <!ENTITY staff.main.auth.hostname.accesskey "H">
 <!ENTITY staff.main.menu.admin.clear_cache.accesskey "3">
 <!ENTITY staff.main.menu.admin.clear_cache.label "Clear Cache">
 <!ENTITY staff.main.menu.admin.cmd_console.accesskey "J">
-<!ENTITY staff.main.menu.admin.cmd_console.label "Javascript Console">
+<!ENTITY staff.main.menu.admin.cmd_console.label "JavaScript Console">
 <!ENTITY staff.main.menu.admin.cmd_shell.accesskey "H">
-<!ENTITY staff.main.menu.admin.cmd_shell.label "Javascript Shell">
+<!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.accesskey "L">
 <!ENTITY staff.main.menu.admin.copy_location_edit.label "Copy Location Editor">
 <!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.label "Merge/Transfer Interface">
+<!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">
 <!ENTITY staff.main.menu.cat.edit_record_buckets.accesskey "R">
 <!ENTITY staff.main.menu.reports.key "">
 <!ENTITY staff.main.menu.reports.label "Reports">
 <!ENTITY staff.main.menu.search.catalog.accesskey "C">
-<!ENTITY staff.main.menu.search.catalog.label "the Catalog">
+<!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 "for copies by Barcode">
+<!ENTITY staff.main.menu.search.copies.label "Search for copies by Barcode">
 <!ENTITY staff.main.menu.search.key "r">
 <!ENTITY staff.main.menu.search.label "Search">
 <!ENTITY staff.main.menu.search.patrons.accesskey "P">
-<!ENTITY staff.main.menu.search.patrons.label "for Patrons">
+<!ENTITY staff.main.menu.search.patrons.label "Search for Patrons">
 <!ENTITY staff.main.menu.search.patrons_barcode.accesskey "n">
-<!ENTITY staff.main.menu.search.patrons_barcode.label "for patron by Barcode">
+<!ENTITY staff.main.menu.search.patrons_barcode.label "Search for patron by Barcode">
 <!ENTITY staff.main.menu.search.record.accesskey "T">
-<!ENTITY staff.main.menu.search.record.label "for record by TCN">
+<!ENTITY staff.main.menu.search.record.label "Search for record by TCN">
 <!ENTITY staff.main.menu.search.record_via_id.accesskey "D">
-<!ENTITY staff.main.menu.search.record_via_id.label "for record by Record ID">
+<!ENTITY staff.main.menu.search.record_via_id.label "Search for record by Record ID">
 <!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.marc.LDR.type.short "Type"> 
 <!ENTITY staff.marc.close.editor.key "W">
 <!ENTITY staff.marc.display "Display">
-<!ENTITY staff.marc.display.control_fields "Toggle Control/Data Fields">
+<!ENTITY staff.marc.display.control_fields "Toggle Control and Data Fields">
 <!ENTITY staff.marc.display.control_fields.key "F">
 <!ENTITY staff.marc.display.cover_art "Toggle Cover Art">
 <!ENTITY staff.marc.display.cover_art.key "A">
 <!ENTITY staff.marc.display.key "D">
 <!ENTITY staff.marc.display.legend "Legend">
 <!ENTITY staff.marc.display.legend.key "L">
-<!ENTITY staff.marc.display.meta_data "Toggle Meta Data">
+<!ENTITY staff.marc.display.meta_data "Toggle Metadata">
 <!ENTITY staff.marc.display.meta_data.key "E">
 <!ENTITY staff.marc.editor.keys.help "Control+D = Delimiter Symbol ; Control+Enter = Insert Row ; Control+Delete = Delete Row;">
 <!ENTITY staff.marc.file "MARC">
 <!ENTITY staff.marc.groupbox.cover "Cover Art">
 <!ENTITY staff.marc.groupbox.data "Data Fields">
 <!ENTITY staff.marc.groupbox.fixed "Fixed Fields">
-<!ENTITY staff.marc.groupbox.meta "Meta Data (NOT YET IMPLEMENTED)">
+<!ENTITY staff.marc.groupbox.meta "Metadata (NOT YET IMPLEMENTED)">
 <!ENTITY staff.marc_editor_interface_label "MARC">
 <!ENTITY staff.mbts_balance_owed_label "Balance Owed">
 <!ENTITY staff.mbts_id_label "Bill # ">
 <!ENTITY staff.mbts_xact_finish_label "Finish">
 <!ENTITY staff.mbts_xact_start_label "Start">
 <!ENTITY staff.mvr_label_author "Author">
-<!ENTITY staff.mvr_label_doc_id "Doc Id">
+<!ENTITY staff.mvr_label_doc_id "Document ID">
 <!ENTITY staff.mvr_label_title "Title">
 <!ENTITY staff.next.range 'Next'>
 <!ENTITY staff.next.range.key 'N'>
-<!ENTITY staff.opac_navigator_interface_label "CATALOG NAVIGATOR">
+<!ENTITY staff.opac_navigator_interface_label "CAtalog Navigator">
 <!ENTITY staff.patron.context_display "Retrieve Patron">
-<!ENTITY staff.patron_barcode_entry_interface_label "PATRON">
+<!ENTITY staff.patron_barcode_entry_interface_label "Patron">
 <!ENTITY staff.patron_display.bills.label 'Bills:'>
-<!ENTITY staff.patron_display.checkout.auto_print_label 'Auto-Print'>
-<!ENTITY staff.patron_display.checkout.auto_print_label.accesskey 'A'>
-<!ENTITY staff.patron_display.checkout.done_label 'Done'>
-<!ENTITY staff.patron_display.checkout.done_label.accesskey 'D'>
-<!ENTITY staff.patron_display.checkout.print_receipt_label 'Print Receipt'>
-<!ENTITY staff.patron_display.checkout.print_receipt_label.accesskey ''>
+<!ENTITY staff.patron_display.checkout.auto_print.label 'Auto-Print'>
+<!ENTITY staff.patron_display.checkout.auto_print.accesskey 'A'>
+<!ENTITY staff.patron_display.checkout.done.label 'Done'>
+<!ENTITY staff.patron_display.checkout.done.accesskey 'D'>
+<!ENTITY staff.patron_display.checkout.print_receipt.label 'Print Receipt'>
+<!ENTITY staff.patron_display.checkout.print_receipt.accesskey ''>
 <!ENTITY staff.patron_display.checkout.reprint_receipt_label 'Re-Print Last Receipt'>
 <!ENTITY staff.patron_display.checkout.reprint_receipt_label.accesskey 'L'>
-<!ENTITY staff.patron_display.checkout.scan_label 'Enter Barcode:'>
-<!ENTITY staff.patron_display.checkout.scan_label.accesskey 'a'>
-<!ENTITY staff.patron_display.checkout.submit_label 'Submit'>
-<!ENTITY staff.patron_display.checkout.submit_label.accesskey 'S'>
+<!ENTITY staff.patron_display.checkout.scan.label 'Enter Barcode:'>
+<!ENTITY staff.patron_display.checkout.scan.accesskey 'a'>
+<!ENTITY staff.patron_display.checkout.submit.label 'Submit'>
+<!ENTITY staff.patron_display.checkout.submit.accesskey 'S'>
 <!ENTITY staff.patron_display.checkouts.label 'Check Outs:'>
 <!ENTITY staff.patron_display.checkouts_overdue.label 'Overdue:'>
 <!ENTITY staff.patron_display.contact.caption 'Identity &amp; Contact Info'>
 <!ENTITY staff.patron_display.credit.label 'Credit:'>
-<!ENTITY staff.patron_display.date_of_birth.label 'DOB:'>
+<!ENTITY staff.patron_display.date_of_birth.label 'Date of Birth:'>
 <!ENTITY staff.patron_display.day_phone.label 'Day Phone:'>
 <!ENTITY staff.patron_display.email.label 'Email:'>
 <!ENTITY staff.patron_display.evening_phone.label 'Evening Phone:'>
 <!ENTITY staff.patron_display.home_ou.label 'Home Library:'>
 <!ENTITY staff.patron_display.ident1.label 'ID 1:'>
 <!ENTITY staff.patron_display.ident2.label 'ID 2:'>
-<!ENTITY staff.patron_display.items.print_receipt_label 'Print Receipt'>
-<!ENTITY staff.patron_display.items.print_receipt_label.accesskey 'P'>
+<!ENTITY staff.patron_display.items.print_receipt.label 'Print Receipt'>
+<!ENTITY staff.patron_display.items.print_receipt.accesskey 'P'>
 <!ENTITY staff.patron_display.items_claimed_returned.label 'Items Claimed Returned:'>
 <!ENTITY staff.patron_display.library_card.label 'Library Card:'>
 <!ENTITY staff.patron_display.mailing.city.label 'Mailing City:'>
 <!ENTITY staff.patron_display.second_given_name.label 'Middle Name:'>
 <!ENTITY staff.patron_display.standing.label 'Standing:'>
 <!ENTITY staff.patron_display.status.caption 'Status'>
-<!ENTITY staff.patron_display_interface_label "PATRON">
-<!ENTITY staff.patron_editor_interface_label "PATRON EDIT">
-<!ENTITY staff.patron_interface_label "PATRON ">
+<!ENTITY staff.patron_display_interface_label "Patron">
+<!ENTITY staff.patron_editor_interface_label "Patron Edit">
+<!ENTITY staff.patron_interface_label "Patron ">
 <!ENTITY staff.patron_navbar.bills 'Bills'>
 <!ENTITY staff.patron_navbar.bills.accesskey 'B'>
 <!ENTITY staff.patron_navbar.checkout 'Check Out'>
 <!ENTITY staff.patron_navbar.info.accesskey 'o'>
 <!ENTITY staff.patron_navbar.items 'Items Out'>
 <!ENTITY staff.patron_navbar.items.accesskey 'I'>
-<!ENTITY staff.patron_navbar.items.problem_items.caption 'Lost / Claimed Returned / Long Overdue / Has Unpaid Billings'>
+<!ENTITY staff.patron_navbar.items.problem_items.caption 'Lost, Claimed Returned, Long Overdue, Has Unpaid Billings'>
 <!ENTITY staff.patron_navbar.refresh 'Refresh'>
 <!ENTITY staff.patron_navbar.refresh.accesskey 'R'>
 <!ENTITY staff.patron_navbar.retrieve 'Retrieve Patron'>
 <!ENTITY staff.patron_navbar.retrieve.accesskey 'R'>
-<!ENTITY staff.patron_register_interface_label "NEW PATRON">
+<!ENTITY staff.patron_register_interface_label "New Patron">
 <!ENTITY staff.patron_search_form.caption 'Search for Patron'>
 <!ENTITY staff.patron_search_form.city.accesskey ''>
 <!ENTITY staff.patron_search_form.city.label 'City:'>
 <!ENTITY staff.patron_search_form.street1.label 'Address 1:'>
 <!ENTITY staff.patron_search_form.street2.accesskey ''>
 <!ENTITY staff.patron_search_form.street2.label 'Address 2:'>
-<!ENTITY staff.patron_search_interface_label "PATRON SEARCH">
-<!ENTITY staff.patron_stat_cat_editor_interface_label "PATRON STAT-CATS">
+<!ENTITY staff.patron_search_interface_label "Patron Search">
+<!ENTITY staff.patron_stat_cat_editor_interface_label "Patron Statistical Categories">
 <!ENTITY staff.previous.range 'Previous'>
 <!ENTITY staff.previous.range.key 'P'>
-<!ENTITY staff.receipt_template_editor_interface_label "RECEIPTS">
+<!ENTITY staff.receipt_template_editor_interface_label "Receipts">
 <!ENTITY staff.record_list.author "Author">
 <!ENTITY staff.record_list.copy_count "Copies&#740;">
 <!ENTITY staff.record_list.isbn "ISBN">
 <!ENTITY staff.survey.wizard.page1 "Initial Settings">
 <!ENTITY staff.survey.wizard.page2 "Add Questions for Survey:">
 <!ENTITY staff.survey.wizard.title "Add a Survey Wizard">
-<!ENTITY staff.survey_admin_interface_label "SURVEY ADMIN">
+<!ENTITY staff.survey_admin_interface_label "Survey Administration">
 <!ENTITY staff.volume.attr.callnumber "Call Number">
 <!ENTITY staff.volume.attr.owning_lib "Owning Library">
 <!ENTITY staff.volume.wizard.page1 "Entering Volumes">
 <!ENTITY staff.volume.wizard.page2 "Entering Copies">
 <!ENTITY staff.volume.wizard.page3 "Entering Barcodes">
 <!ENTITY staff.volume.wizard.page4 "Entering Copy-Level Attribute Defaults">
-<!ENTITY staff.volume.wizard.title "Batch Add Volumes/Copies Wizard">
+<!ENTITY staff.volume.wizard.title "Batch Add Volumes or Copies Wizard">
 <!ENTITY staff.xuleditor_label "XUL TEST">
 <!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.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.art "Papers or Articles"> 
 <!ENTITY staff.z39_50.search_class.item_type.bks "Books"> 
 <!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.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">
+<!ENTITY staff.z39_50_import_interface_label "Z39.50 Import">
 <!ENTITY staff.server.admin.offline.xacts.caption "Offline Sessions">
 <!ENTITY staff.server.admin.offline.xacts.refresh.accesskey "R">
 <!ENTITY staff.server.admin.offline.xacts.create.label "Create">
 <!ENTITY staff.server.admin.font.large "Large">
 <!ENTITY staff.server.admin.font.xlarge "X-Large">
 <!ENTITY staff.server.admin.font.xxlarge "XX-Large">
+<!-- "5pt" is an abbreviation for "5 point font size" -->
 <!ENTITY staff.server.admin.font.5pt "5pt">
+<!-- "6pt" is an abbreviation for "6 point font size" -->
 <!ENTITY staff.server.admin.font.6pt "6pt">
+<!-- "7pt" is an abbreviation for "7 point font size" -->
 <!ENTITY staff.server.admin.font.7pt "7pt">
+<!-- "8pt" is an abbreviation for "8 point font size" -->
 <!ENTITY staff.server.admin.font.8pt "8pt">
+<!-- "9pt" is an abbreviation for "9 point font size" -->
 <!ENTITY staff.server.admin.font.9pt "9pt">
+<!-- "10pt" is an abbreviation for "10 point font size" -->
 <!ENTITY staff.server.admin.font.10pt "10pt">
+<!-- "11pt" is an abbreviation for "11 point font size" -->
 <!ENTITY staff.server.admin.font.11pt "11pt">
+<!-- "12pt" is an abbreviation for "12 point font size" -->
 <!ENTITY staff.server.admin.font.12pt "12pt">
+<!-- "13pt" is an abbreviation for "13 point font size" -->
 <!ENTITY staff.server.admin.font.13pt "13pt">
+<!-- "14pt" is an abbreviation for "14 point font size" -->
 <!ENTITY staff.server.admin.font.14pt "14pt">
+<!-- "15pt" is an abbreviation for "15 point font size" -->
 <!ENTITY staff.server.admin.font.15pt "15pt">
+<!-- "16pt" is an abbreviation for "16 point font size" -->
 <!ENTITY staff.server.admin.font.16pt "16pt">
+<!-- "17pt" is an abbreviation for "17 point font size" -->
 <!ENTITY staff.server.admin.font.17pt "17pt">
+<!-- "18pt" is an abbreviation for "18 point font size" -->
 <!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.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.submit "Submit">
 <!ENTITY staff.server.admin.cash.desk "Desk Payments">
 <!ENTITY staff.server.admin.cash.user "User Payments">
 <!ENTITY staff.server.admin.closed_dates.title "Evergreen: Library Closed Dates Editor">
 <!ENTITY staff.server.admin.copy_locations.editor.opac_visible.label "OPAC Visible: ">
 <!ENTITY staff.server.admin.copy_locations.editor.circulate.label "Circulate: ">
 <!ENTITY staff.server.admin.copy_locations.editor.library.label "Owning Library:">
-<!ENTITY staff.server.admin.copy_locations.editor.name "Name">
 <!ENTITY staff.server.admin.copy_locations.editor.library "Owning Library">
 <!ENTITY staff.server.admin.copy_locations.editor.holdable "Holdable">
 <!ENTITY staff.server.admin.copy_locations.editor.help "Help">
 <!-- This will be followed by the user's name -->
 <!ENTITY staff.server.admin.hold_pull.greeting "Welcome ">
 <!ENTITY staff.server.admin.hold_pull.sort.note "Note: Click on a column header to sort the column">
-<!ENTITY staff.server.admin.hold_pull.title "Title">
+<!ENTITY staff.server.admin.hold_pull.title.label "Title">
 <!ENTITY staff.server.admin.hold_pull.author "Author">
 <!ENTITY staff.server.admin.hold_pull.copy_location "Copy Location">
 <!ENTITY staff.server.admin.hold_pull.call_number "Call Number">
 <!ENTITY staff.server.admin.non_cat_types.editor.weeks "Weeks">
 <!ENTITY staff.server.admin.non_cat_types.editor.months "Months">
 <!ENTITY staff.server.admin.non_cat_types.in_house_circ "Circulate In-House?">
-<!ENTITY staff.server.admin.non_cat_types.in_house_circ "Help">
 <!ENTITY staff.server.admin.non_cat_types.editor.create "Create">
 <!ENTITY staff.server.admin.non_cat_types.name "Name">
 <!ENTITY staff.server.admin.non_cat_types.owning_location "Owning Location">
 <!ENTITY staff.circ.checkin_overlay.sel_spine.label "Print Spine Label">
 <!ENTITY staff.circ.checkin_overlay.sel_spine.accesskey "P">
 <!ENTITY staff.circ.checkin_overlay.save_columns.label "Save Columns">
-<!ENTITY staff.circ.checkin_overlay.background_text "Check In / Process Item">
+<!ENTITY staff.circ.checkin_overlay.background_text "Check In or Process Item">
 <!ENTITY staff.circ.checkin_overlay.background_text.hold_capture "Auto-Print Hold and Transit Slips">
 <!ENTITY staff.circ.checkin_overlay.effective_date.label "Effective Date:">
 <!ENTITY staff.circ.checkin_overlay.actions.label "Actions for Selected Items">
 <!ENTITY staff.circ.checkout_overlay.sel_clip.label "Copy to Clipboard">
 <!ENTITY staff.circ.checkout_overlay.save_columns.label "Save Columns">
 <!ENTITY staff.circ.checkout_overlay.strict_barcode.label "Strict Barcode">
-<!ENTITY staff.circ.circ_brief.patron_id.label "Circ ID: ">
+<!ENTITY staff.circ.circ_brief.patron_id.label "Circulation ID: ">
 <!ENTITY staff.circ.circ_brief.add_billing.label "Add Billing">
 <!ENTITY staff.circ.circ_brief.xact_start.label "Check Out Time">
 <!ENTITY staff.circ.circ_brief.due_date.label "Due Date">
 <!ENTITY staff.circ.copy_status_overlay.cmd_delete_items.accesskey "">
 <!ENTITY staff.circ.copy_status_overlay.cmd_delete_volumes.label "Delete Volumes">
 <!ENTITY staff.circ.copy_status_overlay.cmd_delete_volumes.accesskey "">
-<!ENTITY staff.circ.copy_status_overlay.sel_mark_items_damaged.label "Mark Item Damaged">
-<!ENTITY staff.circ.copy_status_overlay.sel_mark_items_damaged.accesskey "D">
-<!ENTITY staff.circ.copy_status_overlay.sel_mark_items_missing.label "Mark Item Missing">
-<!ENTITY staff.circ.copy_status_overlay.sel_mark_items_missing.accesskey "g">
+<!ENTITY staff.circ.copy_status_overlay.copy_actions.sel_mark_items_damaged.label "Mark Item Damaged">
+<!ENTITY staff.circ.copy_status_overlay.copy_actions.sel_mark_items_damaged.accesskey "D">
+<!ENTITY staff.circ.copy_status_overlay.copy_actions.sel_mark_items_missing.label "Mark Item Missing">
+<!ENTITY staff.circ.copy_status_overlay.copy_actions.sel_mark_items_missing.accesskey "g">
 <!ENTITY staff.circ.copy_status_overlay.item_status.label "Item Status">
 <!ENTITY staff.circ.copy_status_overlay.last_scanned.caption "Scan Item">
 <!ENTITY staff.circ.copy_status_overlay.copy_status_scan_barcode.label "Barcode:">
 <!ENTITY staff.chrome.menu_frame_overlay.tab9.accesskey "9">
 <!ENTITY staff.circ.in_house_use.main.label "Record In-House Use">
 <!ENTITY staff.circ.in_house_use.cmgb1.caption "In-House Use">
-<!ENTITY staff.circ.in_house_use.multiplier_label.value "# of uses:">
-<!ENTITY staff.circ.in_house_use.multiplier_label.accesskey "u">
+<!ENTITY staff.circ.in_house_use.multiplier.label "# of uses:">
+<!ENTITY staff.circ.in_house_use.multiplier.accesskey "u">
 <!ENTITY staff.circ.in_house_use.submit.label "Submit">
 <!ENTITY staff.circ.in_house_use.submit.accesskey "S">
 <!ENTITY staff.circ.in_house_use.print.label "Print List">
 <!ENTITY staff.circ.pre_cat.dummy_author.value "Author">
 <!ENTITY staff.circ.pre_cat.cancel.label "Cancel">
 <!ENTITY staff.circ.pre_cat.cancel.accesskey "C">
-<!ENTITY staff.circ.pre_cat.checkout.label "Checkout">
+<!ENTITY staff.circ.pre_cat.checkout.label "Check Out">
 <!ENTITY staff.circ.pre_cat.checkout.accesskey "o">
 <!ENTITY staff.circ.print_list.main.label "Templates">
 <!ENTITY staff.circ.print_list.top_ui.label "ID">
 <!ENTITY staff.cat.bib_brief.author "Author:">
 <!ENTITY staff.cat.bib_brief.edition "Edition:">
 <!ENTITY staff.cat.bib_brief.pub_date "Publication Date:">
+<!-- "TCN" is an abbreviation for "title control number" -->
 <!ENTITY staff.cat.bib_brief.title_control_number "TCN:">
 <!ENTITY staff.cat.bib_brief.created_by "Created By:">
 <!ENTITY staff.cat.bib_brief.last_edited_by "Last Edited By:">
 <!ENTITY staff.cat.copy_summary.created.label "Created:">
 <!ENTITY staff.cat.copy_summary.edited.label "Edited:">
 <!ENTITY staff.cat.copy_summary.age_protect.label "Age Protect:">
-<!ENTITY staff.cat.copy_summary.total_circs.label "Total Circs:">
+<!ENTITY staff.cat.copy_summary.total_circs.label "Total Circulations:">
 <!ENTITY staff.cat.copy_summary.alternate_view.label "Alternate View">
 <!ENTITY staff.cat.copy_summary.save_columns.label "Save Columns">
 <!ENTITY staff.cat.copy_summary.sel_clip.label "Copy to Clipboard">
 <!ENTITY staff.cat.marc_new.load.label "Load">
 <!ENTITY staff.cat.marc_new.load.accesskey "L">
 <!ENTITY staff.cat.marc_view.title "MARC View">
-<!ENTITY staff.cat.opac.menu.label "Actions for this Record">
-<!ENTITY staff.cat.opac.menu.accesskey "A">
 <!ENTITY staff.cat.opac.menuitem.opacview.label "OPAC View">
 <!ENTITY staff.cat.opac.menuitem.opacview.accesskey "O">
 <!ENTITY staff.cat.opac.menuitem.marcview.label "MARC View">
 <!ENTITY staff.cat.record_buckets_overlay.new_bucket.label "New Bucket">
 <!ENTITY staff.cat.record_buckets_overlay.delete_bucket.label "Delete Bucket">
 <!ENTITY staff.cat.record_buckets_overlay.refresh_bucket.label "Refresh">
-<!ENTITY staff.cat.record_buckets_overlay.record_query_label.value "Query">
-<!ENTITY staff.cat.record_buckets_overlay.record_query_label.accesskey "y">
+<!ENTITY staff.cat.record_buckets_overlay.record_query.label "Query">
+<!ENTITY staff.cat.record_buckets_overlay.record_query.accesskey "y">
 <!ENTITY staff.cat.record_buckets_overlay.cmd_submit_query.button.label "Submit">
 <!ENTITY staff.cat.record_buckets_overlay.cmd_submit_query.button.accesskey "S">
 <!ENTITY staff.cat.record_buckets_overlay.query_help.button.label "Help">
 <!ENTITY staff.cat.spine_labels.preview_and_print.accesskey "P">
 <!ENTITY staff.cat.spine_labels.close_window.label "Close Window">
 <!ENTITY staff.cat.spine_labels.close_window.accesskey "C">
-<!ENTITY staff.cat.spine_labels.font_size_label.value "Font size (in pts):">
-<!ENTITY staff.cat.spine_labels.spine_label.value "Spine Label">
-<!ENTITY staff.cat.spine_labels.spine_label.left_margine.value "Left Margin (in characters):">
-<!ENTITY staff.cat.spine_labels.spine_label.label_width.value "Label Width (in characters):">
-<!ENTITY staff.cat.spine_labels.spine_label.label_length.value "Label Length (in lines):">
-<!ENTITY staff.cat.spine_labels.pocket_label.value "Pocket Label">
-<!ENTITY staff.cat.spine_labels.pocket_label.middle_margin.value "Middle Margin (in characters):">
-<!ENTITY staff.cat.spine_labels.pocket_label.label_width.value "Label Width (in characters):">
-<!ENTITY staff.cat.spine_labels.pocket_label.label_length.value "Label Length (in lines):">
+<!ENTITY staff.cat.spine_labels.font_size.label "Font size (in points):">
+<!ENTITY staff.cat.spine_labels.spine_label.label "Spine Label">
+<!ENTITY staff.cat.spine_labels.spine_label.left_margin.label "Left Margin (in characters):">
+<!ENTITY staff.cat.spine_labels.spine_label.label_width.label "Label Width (in characters):">
+<!ENTITY staff.cat.spine_labels.spine_label.label_length.label "Label Length (in lines):">
+<!ENTITY staff.cat.spine_labels.pocket_label.label "Pocket Label">
+<!ENTITY staff.cat.spine_labels.pocket_label.middle_margin.label "Middle Margin (in characters):">
+<!ENTITY staff.cat.spine_labels.pocket_label.label_width.label "Label Width (in characters):">
+<!ENTITY staff.cat.spine_labels.pocket_label.label_length.label "Label Length (in lines):">
 <!ENTITY staff.cat.spine_labels.pocket_label.title.label "Include Title (wraps on word at label width)">
-<!ENTITY staff.cat.spine_labels.on_line.value "On line:">
+<!ENTITY staff.cat.spine_labels.on_line.label "On line:">
 <!ENTITY staff.cat.spine_labels.pocket_label.include_title.label "Include Title (segment after wrapping)">
 <!ENTITY staff.cat.spine_labels.indent_title.label "Indent a space?">
 <!ENTITY staff.cat.spine_labels.inc_call_number.label "Include Call Number">
 <!ENTITY staff.cat.spine_labels.inc_item_barcode.label "Include Item Barcode">
 <!ENTITY staff.cat.spine_labels.custom.label "Custom:">
 <!ENTITY staff.cat.spine_labels.available_macros.label "Available Macros">
-<!ENTITY staff.cat.volume_copy_creator.title "Volume/Copy Editor">
-<!ENTITY staff.cat.volume_copy_creator.label "Volume/Copy Creator">
+<!ENTITY staff.cat.volume_copy_creator.title "Volume and Copy Editor">
+<!ENTITY staff.cat.volume_copy_creator.label "Volume and Copy Creator">
 <!ENTITY staff.cat.volume_copy_creator.check_barcodes.label "Check Barcodes?">
 <!ENTITY staff.cat.volume_copy_creator.check_barcodes.accesskey "B">
 <!ENTITY staff.cat.volume_copy_creator.print_labels.label "Print Labels?">
 <!ENTITY staff.cat.volume_editor.caption.label "Volume Editor">
 <!ENTITY staff.cat.volume_editor.modify.label "Modify">
 <!ENTITY staff.cat.z3950.marc_import.label "MARC Import via Z39.50">
+<!ENTITY staff.cat.z3950.marc_import.accesskey "I">
 <!ENTITY staff.cat.z3950.service_credentials.label "Service and Credentials">
 <!ENTITY staff.cat.z3950.service.label "Service">
 <!ENTITY staff.cat.z3950.username.label "Username">
 <!ENTITY staff.cat.z3950.catalog_service.tooltiptext "Evergreen Native Catalog">
 <!ENTITY staff.cat.z3950.save_creds.label "Save as Default">
 <!ENTITY staff.cat.z3950.save_creds.accesskey "D">
-<!ENTITY staff.cat.z3950.query.description "Description">
 <!ENTITY staff.cat.z3950.query.label "Query">
-<!ENTITY staff.cat.z3950.query.label "Tip: Click a search field label and then the 'Save as Default' button to have that field focused by default.">
+<!ENTITY staff.cat.z3950.query.description "Tip: Click a search field label and then the 'Save as Default' button to have that field focused by default.">
 <!ENTITY staff.cat.z3950.clear.label "Clear Form">
 <!ENTITY staff.cat.z3950.clear.accesskey "C">
 <!ENTITY staff.cat.z3950.search.label "Search">
 <!ENTITY staff.cat.z3950.marc_view.accesskey "V">
 <!ENTITY staff.cat.z3950.marc_import_overlay.label "MARC Editor for Overlay">
 <!ENTITY staff.cat.z3950.marc_import_overlay.accesskey "O">
-<!ENTITY staff.cat.z3950.marc_import.label "MARC Editor for Import">
-<!ENTITY staff.cat.z3950.marc_import.accesskey "I">
+<!ENTITY staff.cat.z3950.result_message.marc_import.label "MARC Editor for Import">
+<!ENTITY staff.cat.z3950.result_message.marc_import.accesskey "I">
 <!ENTITY staff.pat.barcode_entry.retrieve_patron.label "Retrieve Patron">
 <!ENTITY staff.pat.barcode_entry.barcode.label "Barcode:">
 <!ENTITY staff.pat.barcode_entry.barcode.accesskey "B">
 <!ENTITY staff.patron.bill_cc_info.american_express.label "American Express">
 <!ENTITY staff.patron.bill_cc_info.discover.label "Discover">
 <!ENTITY staff.patron.bill_cc_info.other.label "Other">
-<!ENTITY staff.patron.bill_cc_info.cc_number.value "CC Number">
+<!ENTITY staff.patron.bill_cc_info.cc_number.value "Credit Card Number">
 <!ENTITY staff.patron.bill_cc_info.month_expire.value "Expire Month">
 <!ENTITY staff.patron.bill_cc_info.year_expire.value "Expire Year">
 <!ENTITY staff.patron.bill_cc_info.approval_code.value "Approval Code">
 <!ENTITY staff.patron.bill_cc_info.submit.label "Submit this Info">
 <!ENTITY staff.patron.bill_cc_info.submit.accesskey "S">
 <!ENTITY staff.patron.bill_cc_info.info.label "Credit Card Info">
-<!ENTITY staff.patron.bill_cc_info.type.label "CC Type">
-<!ENTITY staff.patron.bill_check_info.check_info.label "Check Info">
+<!ENTITY staff.patron.bill_cc_info.type.label "Credit Card Type">
+<!-- "Check" is used here to indicate a payment by check, not "Verify" -->
+<!ENTITY staff.patron.bill_check_info.check_info.label "Check Information">
+<!-- "Check" is used here to indicate a payment by check, not "Verify" -->
 <!ENTITY staff.patron.bill_check_info.check_number.value "Check Number">
 <!ENTITY staff.patron.bill_check_info.note.value "Note">
 <!ENTITY staff.patron.bill_check_info.cancel.label "Cancel">
 <!ENTITY staff.patron.bill_check_info.cancel.accesskey "C">
-<!ENTITY staff.patron.bill_check_info.submit.label "Submit this Info">
+<!ENTITY staff.patron.bill_check_info.submit.label "Submit this Information">
 <!ENTITY staff.patron.bill_check_info.submit.accesskey "S">
 <!ENTITY staff.patron.bill_details.bills.label "Bills">
 <!ENTITY staff.patron.bill_details.save_columns.label "Save Columns">
 <!ENTITY staff.patron.bills_overlay.alternate_view.accesskey "V">
 <!ENTITY staff.patron.bills_overlay.summary.label "Summary">
 <!ENTITY staff.patron.bills_overlay.net_balance.value "Net Balance">
-<!ENTITY staff.patron.bills_overlay.payment_applied.value "- Payment applied">
 <!ENTITY staff.patron.bills_overlay.new_balance.value "= New Balance">
 <!ENTITY staff.patron.bills_overlay.pay_bill.label "Pay Bill">
 <!ENTITY staff.patron.bills_overlay.payment_type.value "Payment Type">
 <!ENTITY staff.patron.bill_summary_overlay.finish.value "Finish">
 <!ENTITY staff.patron.bill_summary_overlay.renewal.value "Renewal?">
 <!ENTITY staff.patron.bill_summary_overlay.checked_in.value "Checked In">
+<!ENTITY staff.patron.bill_wizard.title "Bill Patron Wizard">
 <!ENTITY staff.patron.bill_wizard.create_bill.label "Create Bill">
 <!ENTITY staff.patron.bill_wizard.location.value "Location">
 <!ENTITY staff.patron.bill_wizard.transaction_type.value "Transaction Type">
 <!ENTITY staff.patron.display_overlay.juvenile.value "(Juvenile)">
 <!ENTITY staff.patron.display_overlay.alert.value "(Alert)">
 <!ENTITY staff.patron.display_overlay.see_notes.value "(See Notes)">
-<!ENTITY staff.patron.display_overlay.max_bills.value "(Max Bills)">
-<!ENTITY staff.patron.display_overlay.max_overdues.value "(Max Overdues)">
+<!ENTITY staff.patron.display_overlay.max_bills.value "(Maximum Bills)">
+<!ENTITY staff.patron.display_overlay.max_overdues.value "(Maximum Overdues)">
 <!ENTITY staff.patron.display_overlay.has_bills.value "(Has Bills)">
 <!ENTITY staff.patron.display_overlay.has_overdues.value "(Has Overdues)">
-<!ENTITY staff.patron.display_overlay.invalid_dob.value "(Invalid DOB)">
+<!ENTITY staff.patron.display_overlay.invalid_dob.value "(Invalid Date of Birth)">
 <!ENTITY staff.patron.display_overlay.invalid_address.value "(Invalid Address)">
 <!ENTITY staff.patron.display_overlay.exit.label "Exit">
 <!ENTITY staff.patron.display_overlay.exit.accesskey "x">
 <!ENTITY staff.patron.display_overlay.search_form.accesskey "F">
 <!ENTITY staff.patron.display_overlay.retrieve_patron.label "Retrieve Patron">
 <!ENTITY staff.patron.display_overlay.retrieve_patron.accesskey "R">
+<!ENTITY staff.patron.bills_overlay.selected_balance.value "Selected Balance:">
+<!ENTITY staff.patron.bills_overlay.unselected.value "Un-Selected:">
+<!ENTITY staff.patron.bills_overlay.voided.value "Voided:">
+<!ENTITY staff.patron.bills_overlay.auto_print.label "Auto-Print">
 <!ENTITY staff.patron.hold_notices.add_record_notification.label "Add Record of Notification">
 <!ENTITY staff.patron.hold_notices.add_record_notification.accesskey "A">
 <!ENTITY staff.patron.hold_notices.close_window.label "Close">
 <!ENTITY staff.patron.hold_notices.close_window.accesskey "C">
+<!ENTITY staff.patron.hold_notices.method.label "Method:">
 <!ENTITY staff.patron.holds_overlay.pickup_lib.label "Pickup Library">
 <!ENTITY staff.patron.holds_overlay.request_lib.label "Requesting Library">
 <!ENTITY staff.patron.holds_overlay.fulfillment_lib.label "Fulfilling Library">
 <!ENTITY staff.patron.info_group.remove.accesskey "R">
 <!ENTITY staff.patron.info_group.remove.label "Remove Selected Patrons from the Group">
 <!ENTITY staff.patron.info_group.move.accesskey "M">
-<!ENTITY staff.patron.info_group.move.label "Move Selected Patrons to ANOTHER patron's group.">
+<!ENTITY staff.patron.info_group.move.label "Move Selected Patrons to another patron's group.">
 <!ENTITY staff.patron.info_group.add.accesskey "A">
-<!ENTITY staff.patron.info_group.add.label "Move ANOTHER patron to this patron group.">
+<!ENTITY staff.patron.info_group.add.label "Move another patron to this patron group.">
 <!ENTITY staff.patron.info_group.retrieve_p.accesskey "P">
 <!ENTITY staff.patron.info_group.retrieve_p.label "Retrieve Selected Patrons">
 <!ENTITY staff.patron.info_group.group_member.label "Group Members">
 <!ENTITY staff.patron.info_surveys.answer.value "Answer:">
 <!ENTITY staff.patron.info.notes.label "Notes">
 <!ENTITY staff.patron.info.notes.accesskey "N">
-<!ENTITY staff.patron.info.stat_cats.label "Stat Cats">
+<!ENTITY staff.patron.info.stat_cats.label "Statistical Categories">
 <!ENTITY staff.patron.info.stat_cats.accesskey "S">
 <!ENTITY staff.patron.info.surveys.label "Surveys">
 <!ENTITY staff.patron.info.surveys.accesskey "y">
 <!ENTITY staff.patron.summary_overlay.overdue.value "Long Overdue:">
 <!ENTITY staff.patron.summary_overlay.claimed_returned.value "Claimed Returned:">
 <!ENTITY staff.patron.summary_overlay.lost_label.value "Lost:">
-<!ENTITY staff.patron.summary_overlay.noncat_label.value "Non Cat:">
-<!ENTITY staff.patron.summary_overlay.summary_contact.label "ID/Contact Info">
+<!ENTITY staff.patron.summary_overlay.noncat_label.value "Non Cataloged:">
+<!ENTITY staff.patron.summary_overlay.summary_contact.label "ID and Contact Information">
 <!ENTITY staff.patron.summary_overlay.opac_login.value "OPAC Login:">
 <!ENTITY staff.patron.user_buckets.stub_not_implemented "Just a stub, Not Yet Implemented">
+<!ENTITY staff.patron.user_edit.title "Evergreen User Editor">
 <!ENTITY staff.patron.user_edit.user_name.label "User Name:">
 <!ENTITY staff.patron.user_edit.barcode.label "Barcode:">
+<!ENTITY staff.patron.user_edit.firstname.label "First Name:">
+<!ENTITY staff.patron.user_edit.middlename.label "Middle Name:">
+<!ENTITY staff.patron.user_edit.lastname.label "Last Name:">
+<!ENTITY staff.patron.user_edit.working_location.label "Working Location">
+<!ENTITY staff.patron.user_edit.permission.label "Permission">
+<!ENTITY staff.patron.user_edit.applied.label "Applied">
+<!ENTITY staff.patron.user_edit.depth.label "Depth">
+<!ENTITY staff.patron.user_edit.grantable.label "Grantable">
+<!ENTITY staff.patron.user_edit.save.label "Save">
+<!ENTITY staff.patron.ue.ev_user_editor.label "Evergreen User Editor">
+<!ENTITY staff.patron.ue.user_greeting.label "Welcome ">
+<!ENTITY staff.patron.ue.interface_note.label "Note: required or invalid fields are <span style='border-bottom: 2px solid red;'>marked with color</span>">
+<!ENTITY staff.patron.ue.view_errors.label "View Errors">
+<!ENTITY staff.patron.ue.nav.user_id.label "1. User Identification">
+<!ENTITY staff.patron.ue.nav.contact_info.label "2. Contact Info">
+<!ENTITY staff.patron.ue.nav.addresses.label "3. Addresses">
+<!ENTITY staff.patron.ue.nav.groups_permissions.label "4. Groups and Permissions">
+<!ENTITY staff.patron.ue.nav.stat_categories.label "5. Statistical Categories">
+<!ENTITY staff.patron.ue.nav.surveys.label "6. Surveys">
+<!ENTITY staff.patron.ue.nav.finish.label "7. Finish">
+<!ENTITY staff.patron.ue.loading_data.label "Loading data...">
+<!ENTITY staff.patron.ue.found_duplicate_patron.label "Number of possible duplicate patron(s):">
+<!ENTITY staff.patron.ue.mark_lost.label "Mark Lost">
+<!ENTITY staff.patron.ue.username.label "Username">
+<!ENTITY staff.patron.ue.password.label "Password">
+<!ENTITY staff.patron.ue.reset.label "Reset">
+<!ENTITY staff.patron.ue.re_password.label "Password: ">
+<!ENTITY staff.patron.ue.verify_password.label "Verify Password">
+<!ENTITY staff.patron.ue.first_name.label "First Name">
+<!ENTITY staff.patron.ue.middle_name.label "Middle Name">
+<!ENTITY staff.patron.ue.last_name.label "Last Name">
+<!ENTITY staff.patron.ue.suffix.label "Suffix">
+<!-- Used in a selection list, the '-' at the start and end draws attention to the entry -->
+<!ENTITY staff.patron.ue.choose.label "- Pick -">
+<!ENTITY staff.patron.ue.dob.label "Date of Birth">
+<!ENTITY staff.patron.ue.primary_id_type.label "Primary Identification Type">
+<!-- Used in a selection list, the '-' at the start and end draws attention to the entry -->
+<!ENTITY staff.patron.ue.required.label " -- Required -- ">
+<!ENTITY staff.patron.ue.primary_id.label "Primary Identification">
+<!ENTITY staff.patron.ue.secondary_id_type.label "Secondary Identification Type">
+<!-- Used in a selection list, the '-' at the start and end draws attention to the entry -->
+<!ENTITY staff.patron.ue.none_selected.label " -- None Selected -- ">
+<!ENTITY staff.patron.ue.secondary_id.label "Secondary Identification">
+<!ENTITY staff.patron.ue.parent_guardian.label "Parent or Guardian">
+<!ENTITY staff.patron.ue.email_address.label "Email Address">
+<!ENTITY staff.patron.ue.day_phone.label "Daytime Phone">
+<!ENTITY staff.patron.ue.evening_phone.label "Evening Phone">
+<!ENTITY staff.patron.ue.other_phone.label "Other Phone">
+<!ENTITY staff.patron.ue.home_library.label "Home Library">
+<!ENTITY staff.patron.ue.address.label "Address">
+<!ENTITY staff.patron.ue.in_city_limits.label "Within City Limits">
+<!ENTITY staff.patron.ue.valid.label "Valid">
+<!ENTITY staff.patron.ue.mailing_address.label "Mailing Address">
+<!ENTITY staff.patron.ue.physical_address.label "Physical Address">
+<!ENTITY staff.patron.ue.owned_address.label "Address is owned by">
+<!ENTITY staff.patron.ue.edit.label "Edit">
+<!ENTITY staff.patron.ue.label.label "Label">
+<!ENTITY staff.patron.ue.zip_code.label "Zip Code">
+<!ENTITY staff.patron.ue.street_1.label "Street 1">
+<!ENTITY staff.patron.ue.street_2.label "Street 2">
+<!ENTITY staff.patron.ue.city.label "City">
+<!ENTITY staff.patron.ue.county.label "County">
+<!ENTITY staff.patron.ue.state.label "State">
+<!ENTITY staff.patron.ue.country.label "Country">
+<!ENTITY staff.patron.ue.delete_this_address.label "Delete this Address">
+<!ENTITY staff.patron.ue.detach_this_address.label "Detach this Address">
+<!ENTITY staff.patron.ue.create_address.label "Create a New Address">
+<!ENTITY staff.patron.ue.profile_group.label "Profile Group">
+<!ENTITY staff.patron.ue.accoutn_expire_date.label "Account Expiration Date">
+<!ENTITY staff.patron.ue.internet_access_level.label "Internet Access Level">
+<!ENTITY staff.patron.ue.active.label "Active">
+<!ENTITY staff.patron.ue.barred.label "Barred">
+<!ENTITY staff.patron.ue.set_lead_account.label "Set as Family or Group Lead Account">
+<!ENTITY staff.patron.ue.claims_returned_count.label "Claims Returned Count">
+<!ENTITY staff.patron.ue.alert_message.label "Alert Message">
+<!ENTITY staff.patron.ue.stat_cat_name.label "Statistical Category Name">
+<!ENTITY staff.patron.ue.owner.label "Owner">
+<!ENTITY staff.patron.ue.value.label "Value">
+<!ENTITY staff.patron.ue.no_surveys_for_location.label "No surveys have been created for this location.">
+<!ENTITY staff.patron.ue.message1.label "You are now ready to save the user to the database.">
+<!ENTITY staff.patron.ue.message2.label "To view or print a summary of the changes, click on the 'View Summary' link.">
+<!ENTITY staff.patron.ue.message3.label "To save the user, click on the 'Save User' button.">
+<!ENTITY staff.patron.ue.view_summary.label "View Summary">
+<!ENTITY staff.patron.ue.back.label "Back">
+<!ENTITY staff.patron.ue.forward.label "Forward">
+<!ENTITY staff.patron.ue.user_summary.label "User Summary Information (Deleted items are marked in <span class='deleted'>color</span><span>)</span>">
+<!ENTITY staff.patron.ue.barcode.label "Barcode">
+<!ENTITY staff.patron.ue.addresses.label "Addresses">
+<!ENTITY staff.patron.ue.address_label.label "Address Label">
+<!ENTITY staff.patron.ue.billing_address.label "Billing Address">
+<!ENTITY staff.patron.ue.profile.label "Profile">
+<!ENTITY staff.patron.ue.expire_date.label "Expire Date">
+<!ENTITY staff.patron.ue.family_lead_account.label "Family Lead Account">
+<!ENTITY staff.patron.ue.stat_categories.label "Statistical Categories">
+<!ENTITY staff.patron.ue.survey.label "Survey">
+<!ENTITY staff.patron.ue.question.label "Question">
+<!ENTITY staff.patron.ue.answer.label "Answer">
+<!ENTITY staff.patron.ue.bad_dob.label "The date of birth field is not formatted correctly.  We are expecting YYYY-MM-DD">
+<!ENTITY staff.patron.ue.bad_username.label "Username is invalid">
+<!ENTITY staff.patron.ue.bad_passwords.label "Passwords do not match or are invalid">
+<!ENTITY staff.patron.ue.bad_firstname.label "First name is invalid">
+<!ENTITY staff.patron.ue.bad_middlename.label "Middle name is invalid">
+<!ENTITY staff.patron.ue.bad_lastname.label "Last name is invalid">
+<!ENTITY staff.patron.ue.bad_barcode.label "Barcode is invalid">
+<!ENTITY staff.patron.ue.duplicate_barcode.label "The selected barcode already exists in the database">
+<!ENTITY staff.patron.ue.new_barcode_warn.label "This will de-activate the existing barcode for this user!  If you wish to continue, enter the new barcode below.  Otherwise, click the Cancel button.">
+<!ENTITY staff.patron.ue.no_ident.label "You must select at least one type of identification">
+<!ENTITY staff.patron.ue.bad_ident_dl.label "Invalid drivers license. Should be STATE-NUMBER">
+<!ENTITY staff.patron.ue.bad_ident_ssn.label "Invalid social security number.  Format should be 111-22-3333">
+<!ENTITY staff.patron.ue.bad_email.label "The email addresses is not valid">
+<!ENTITY staff.patron.ue.bad_phone.label "An invalid phone number was entered">
+<!ENTITY staff.patron.ue.no_profile.label "A profile group must be selected">
+<!ENTITY staff.patron.ue.bad_expire.label "The user expiration date is invalid.  We are expecting YYYY-MM-DD">
+<!ENTITY staff.patron.ue.bad_claims_returned.label "The claims returned count is invalid">
+<!ENTITY staff.patron.ue.unknown_error.label "An unknown formatting error occurred">
+<!ENTITY staff.patron.ue.bad_addr_label.label "Address label is invalid">
+<!ENTITY staff.patron.ue.bad_addr_street.label "Address street is invalid">
+<!ENTITY staff.patron.ue.bad_addr_city.label "Address city is invalid">
+<!ENTITY staff.patron.ue.bad_addr_county.label "Address county is invalid">
+<!ENTITY staff.patron.ue.bad_addr_state.label "Address state is invalid">
+<!ENTITY staff.patron.ue.bad_addr_country.label "Address country is invalid">
+<!ENTITY staff.patron.ue.bad_addr_zip.label "Address zip is invalid">
+<!ENTITY staff.patron.ue.bad_survey.label "Required survey is unanswered">
+<!ENTITY staff.patron.ue.delete_addr_warn.label "This will remove this address from the user. Are you sure you wish to continue?">
+<!ENTITY staff.patron.ue.yes.label "Yes">
+<!ENTITY staff.patron.ue.no.label "No">
+<!ENTITY staff.patron.ue.summary_window.label "Patron Summary">
+<!ENTITY staff.patron.ue.success.label "User update succeeded">
+<!ENTITY staff.patron.ue.dup_ident1.label "A user already exists with the primary identification provided.  Do you wish to view the duplicate record now?">
+<!ENTITY staff.patron.ue.dup_username.label "The selected username is in use by another user. Please choose a different username.">
+<!ENTITY staff.patron.ue.dup_barcode.label "The selected barcode is in use by another user.  Please choose a different barcode.">
+<!ENTITY staff.patron.ue.cancel_confirm.label "Are you sure you wish to cancel this editing session? Canceling will destroy any unsaved changes you have made thus far to the user.">
+<!ENTITY staff.patron.ue.juv_guardian.label "This patron is under 18 years of age.  Please enter the name of the parent or guardian for this patron.">
+<!ENTITY staff.patron.ue.bad_date.label "The date provided is either in the future or invalid.  We are expecting YYYY-MM-DD">
+<!ENTITY staff.patron.ue.made_barred.label "Please add a note to the patron's alert message explaining why the patron is barred.">
+<!ENTITY staff.patron.items_overlay.sel_clip.label "Copy to Clipboard">
+<!ENTITY staff.patron.items_overlay.sel_clip.accesskey "C">
+<!ENTITY staff.patron.items_overlay.sel_bucket.label "Add to Item Bucket">
+<!ENTITY staff.patron.items_overlay.sel_bucket.accesskey "A">
+<!ENTITY staff.patron.items_overlay.show_catalog.label "Show in Catalog">
+<!ENTITY staff.patron.items_overlay.sel_copy_details.label "Show Item Details">
+<!ENTITY staff.patron.items_overlay.sel_copy_details.accesskey "I">
+<!ENTITY staff.patron.items_overlay.sel_patron.label "Show Last Few Circulations">
+<!ENTITY staff.patron.items_overlay.sel_patron.accesskey "L">
+<!ENTITY staff.patron.items_overlay.items_edit.label "Edit Due Date">
+<!ENTITY staff.patron.items_overlay.items_mark_lost.label "Mark Lost (by Patron)">
+<!ENTITY staff.patron.items_overlay.items_claimed_returned.label "Mark Claimed Returned">
+<!ENTITY staff.patron.items_overlay.items_renew.label "Renew">
+<!ENTITY staff.patron.items_overlay.items_renew_all.label "Renew All">
+<!ENTITY staff.patron.items_overlay.items_checkin.label "Check In">
+<!ENTITY staff.patron.items_overlay.add_billing.label "Add Billing">
+<!ENTITY staff.patron.items_overlay.save_columns.label "Save Columns">
+<!ENTITY staff.patron.items_overlay.actions_for_selected_items.label "Actions for Selected Items">
+<!ENTITY staff.patron.items_overlay.actions_for_selected_items.accesskey "S">
+<!ENTITY staff.patron.items_overlay.show_noncats.label "Show Non-Cataloged Circulations in List Above">
+<!ENTITY staff.patron.items_overlay.show_noncats.accesskey "N">
+<!ENTITY staff.patron.items_overlay.items_export.label "Export">
+<!ENTITY ev.staff.patron.ue_xhtml.ev_user_editor.label "Evergreen User Editor">
+<!ENTITY ev.staff.patron.ue_xhtml.welcome.label "Welcome ">
+<!ENTITY ev.staff.patron.ue_xhtml.view_errors.label "View Errors">
+<!ENTITY ev.staff.patron.ue_xhtml.user_id.label "1. User Identification">
+<!ENTITY ev.staff.patron.ue_xhtml.contact_info.label "2. Contact Info">
+<!ENTITY ev.staff.patron.ue_xhtml.addresses.label "3. Addresses">
+<!ENTITY ev.staff.patron.ue_xhtml.groups_permissions.label "4. Groups and Permissions">
+<!ENTITY ev.staff.patron.ue_xhtml.statistical_categories.label "5. Statistical Categories">
+<!ENTITY ev.staff.patron.ue_xhtml.surveys.label "6. Surveys">
+<!ENTITY ev.staff.patron.ue_xhtml.finish.label "7. Finish">
+<!ENTITY ev.staff.patron.ue_xhtml.loading_data.label "Loading data...">
+<!ENTITY ev.staff.patron.ue_xhtml.found_duplicate_patron.label "Number of possible duplicate patron(s):">
+<!ENTITY ev.staff.patron.ue_xhtml.barcode.label "Barcode">
+<!ENTITY ev.staff.patron.ue_xhtml.mark_lost.label "Mark Lost">
+<!ENTITY ev.staff.patron.ue_xhtml.username.label "Username">
+<!ENTITY ev.staff.patron.ue_xhtml.password.label "Password">
+<!ENTITY ev.staff.patron.ue_xhtml.reset.label "Reset">
+<!ENTITY ev.staff.patron.ue_xhtml.re_password.label "Password: ">
+<!ENTITY ev.staff.patron.ue_xhtml.verify_password.label "Verify Password">
+<!ENTITY ev.staff.patron.ue_xhtml.first_name.label "First Name">
+<!ENTITY ev.staff.patron.ue_xhtml.middle_name.label "Middle Name">
+<!ENTITY ev.staff.patron.ue_xhtml.last_name.label "Last Name">
+<!ENTITY ev.staff.patron.ue_xhtml.suffix.label "Suffix">
+<!-- Used in a selection list, the '-' at the start and end draws attention to the entry -->
+<!ENTITY ev.staff.patron.ue_xhtml.pick_suffix.label "- Pick -">
+<!ENTITY ev.staff.patron.ue_xhtml.dob.label "Date of Birth">
+<!ENTITY ev.staff.patron.ue_xhtml.primary_id_type.label "Primary Identification Type">
+<!ENTITY ev.staff.patron.ue_xhtml.primary_id.label "Primary Identification">
+<!ENTITY ev.staff.patron.ue_xhtml.parent_guardian.label "Parent or Guardian">
+<!ENTITY ev.staff.patron.ue_xhtml.email_address.label "Email Address">
+<!ENTITY ev.staff.patron.ue_xhtml.daytime_phone.label "Daytime Phone">
+<!ENTITY ev.staff.patron.ue_xhtml.evening_phone.label "Evening Phone">
+<!ENTITY ev.staff.patron.ue_xhtml.other_phone.label "Other (Cell Phone)">
+<!ENTITY ev.staff.patron.ue_xhtml.home_library.label "Home Library">
+<!ENTITY ev.staff.patron.ue_xhtml.address.label "Address">
+<!ENTITY ev.staff.patron.ue_xhtml.in_city_limits.label "Within City Limits">
+<!ENTITY ev.staff.patron.ue_xhtml.valid.label "Valid">
+<!ENTITY ev.staff.patron.ue_xhtml.mailing_address.label "Mailing Address">
+<!ENTITY ev.staff.patron.ue_xhtml.physical_address.label "Physical Address">
+<!ENTITY ev.staff.patron.ue_xhtml.address_owned_by.label "Address is owned by">
+<!ENTITY ev.staff.patron.ue_xhtml.label.label "Label">
+<!ENTITY ev.staff.patron.ue_xhtml.zip.label "Zip">
+<!ENTITY ev.staff.patron.ue_xhtml.street1.label "Street 1">
+<!ENTITY ev.staff.patron.ue_xhtml.street2.label "Street 2">
+<!ENTITY ev.staff.patron.ue_xhtml.city.label "City">
+<!ENTITY ev.staff.patron.ue_xhtml.conuty.label "County">
+<!ENTITY ev.staff.patron.ue_xhtml.state.label "State">
+<!ENTITY ev.staff.patron.ue_xhtml.country.label "Country">
+<!ENTITY ev.staff.patron.ue_xhtml.profile_group.label "Profile Group">
+<!-- Used in a selection list, the '-' at the start and end draws attention to the entry -->
+<!ENTITY ev.staff.patron.ue_xhtml.required.label " -- Required -- ">
+<!ENTITY ev.staff.patron.ue_xhtml.account_expiration_date.label "Account Expiration Date">
+<!ENTITY ev.staff.patron.ue_xhtml.net_access_level.label "Internet Access Level">
+<!ENTITY ev.staff.patron.ue_xhtml.active.label "Active">
+<!ENTITY ev.staff.patron.ue_xhtml.barred.label "Barred">
+<!ENTITY ev.staff.patron.ue_xhtml.set_family_group_lead_account.label "Set as Family or Group Lead Account">
+<!ENTITY ev.staff.patron.ue_xhtml.claims_returned_count.label "Claims Returned Count">
+<!ENTITY ev.staff.patron.ue_xhtml.alert_message.label "Alert Message">
+<!ENTITY ev.staff.patron.ue_xhtml.stat_cat_name.label "Statistical Category Name">
+<!ENTITY ev.staff.patron.ue_xhtml.owner.label "Owner">
+<!ENTITY ev.staff.patron.ue_xhtml.value.label "Value">
+<!-- Used in a selection list, the '-' at the start and end draws attention to the entry -->
+<!ENTITY ev.staff.patron.ue_xhtml.none_selected.label " -- None Selected -- ">
+<!ENTITY ev.staff.patron.ue_xhtml.no_surveys_for_location.label "No surveys have been created for this location.">
+<!ENTITY ev.staff.patron.ue_xhtml.finishing_message.label "You are now ready to save the user to the database.<br/>To view or print a summary of the changes, click on the 'View Summary' link.<br/>To save the user, click on the 'Save User' button.">
+<!ENTITY ev.staff.patron.ue_xhtml.back.label "Back">
+<!ENTITY ev.staff.patron.ue_xhtml.forward.label "Forward">
+<!ENTITY ev.staff.patron.ue_xhtml.secondary_id_type.label "Secondary Identification Type">
+<!ENTITY ev.staff.patron.ue_xhtml.secondary_id.label "Secondary Identification">
+<!ENTITY ev.staff.patron.ue_xhtml.address_label.label "Address Label">
+<!ENTITY ev.staff.patron.ue_xhtml.mailing.label "Mailing">
+<!ENTITY ev.staff.patron.ue_xhtml.billing.label "Billing">
+<!ENTITY ev.staff.patron.ue_xhtml.profile.label "Profile">
+<!ENTITY ev.staff.patron.ue_xhtml.expire_date.label "Expire Date">
+<!ENTITY ev.staff.patron.ue_xhtml.family_lead_account.label "Family Lead Account">
+<!ENTITY ev.staff.patron.ue_xhtml.stat_categories.label "Statistical Categories">
+<!ENTITY ev.staff.patron.ue_xhtml.survey.label "Survey">
+<!ENTITY ev.staff.patron.ue_xhtml.question.label "Question">
+<!ENTITY ev.staff.patron.ue_xhtml.answer.label "Answer">
+<!ENTITY ev.staff.patron.ue_xhtml.claims_return_confirm.label "This will reset the claims returned count for this user. Are you sure you wish to perform this action?">
+<!ENTITY ev.staff.patron.ue_xhtml.unsaved_changes.label "You have unsaved changes.">
+<!ENTITY ev.staff.patron.ue_xhtml.xact_collision.label "It appears that someone else was also editing this user. Saving the user now will destroy their changes.  Click 'OK' to refresh the user and continue editing. Click 'Cancel' to do nothing. Note that you will not be able to save the user until this page has been refreshed.">
+<!ENTITY ev.staff.patron.ue_xhtml.no_profile.label "A profile group must be selected">
+<!ENTITY ev.staff.patron.ue_xhtml.print_page.label "Print Page">
+<!ENTITY ev.staff.patron.ue_xhtml.return_to_editor.label "Return to Editor">
+<!ENTITY ev.staff.patron.ue_xhtml.save_user.value "Save User">
+<!ENTITY ev.staff.patron.ue_xhtml.save_clone_user.value "Save and Clone User">
+<!ENTITY ev.staff.patron.ue_xhtml.cancel.value "Cancel">
+<!ENTITY ev.staff.patron.ue_xhtml.alert_message_reset.value "Clear">
+<!ENTITY ev.staff.patron.ue_xhtml.date_selector.label "Date selector">
+<!ENTITY staff.portal.title "Evergreen Staff Client Portal Page">
+<!ENTITY staff.portal.default.welcome "This is the Evergreen staff client portal page. You can customize this with the information or functionality your organization needs to support its operations. For example, you could add links to process and procedure documents.">
index 8be327b..ece075b 100644 (file)
@@ -132,7 +132,6 @@ Are you sure you wish to continue?">
 <!ENTITY myopac.view "(View)">
 <!ENTITY myopac.atom.feed "ATOM Feed">
 <!ENTITY myopac.bookbag.hide "Hide">
-<!ENTITY myopac.bookbag.share "Share">
 <!ENTITY myopac.delete "Delete">
 <!ENTITY myopac.bookbag.create "Create a new Bookbag">
 <!ENTITY myopac.bookbag.naming "Enter the name of the new Bookbag: ">
@@ -205,7 +204,6 @@ avoid using bookbags all together.  Thank you.">
 <!ENTITY myopac.holds.status.waiting "Waiting for copy">
 <!ENTITY myopac.holds.status.intransit "In Transit">
 <!ENTITY myopac.holds.status.available "Ready for Pickup">
-<!ENTITY myopac.holds.edit "Edit">
 <!ENTITY myopac.holds.cancel "Cancel">
 <!ENTITY myopac.holds.verify "If you wish to cancel the selected hold, click OK, otherwise click Cancel.">
 <!ENTITY myopac.holds.freeze_selected "Suspend">
index 11beca3..21c5d23 100644 (file)
@@ -69,7 +69,20 @@ function advSyncCopyLocLink(org) {
 
 }
 
-function initSearchBoxes(clean) {
+function clearSearchBoxes() {
+    var rows = $('adv_global_tbody').getElementsByTagName('tr');
+    for(var t = 0; t < rows.length; t++) {
+        if($n(rows[t], 'term')) {
+            $n(rows[t], 'term').value = '';
+            setSelector($n(rows[t], 'contains'), 'contains');
+            setSelector($n(rows[t], 'type'), 'keyword');
+        }
+    }
+    $n(rows[0], 'term').focus();
+}
+
+
+function initSearchBoxes() {
     /* loads the compiled search from the search cookie 
         and sets the widgets accordingly */
 
@@ -88,14 +101,6 @@ function initSearchBoxes(clean) {
 
     var rows = $('adv_global_tbody').getElementsByTagName('tr');
 
-    if(clean) {
-        for(var t = 0; t < rows.length; t++) {
-            var input = $n(rows[t], 'term');
-            if(input) input.value = '';
-        }
-        return;
-    }
-
     for(var t = 0; t < types.length; t++) {
         var row = rows[t];
         setSelector($n(row, 'type'), types[t]);
index 33c589d..437f321 100644 (file)
@@ -33,8 +33,8 @@
                                        <!-- add a new row -->
                                        <tr id='adv_global_addrow'>
                                                <td align='center'>
-                            <button onclick='initSearchBoxes(1);'>&advanced.search.reset;</button>
-                                                       <span style='padding-left: 10px;'> </span>
+                            <button onclick='clearSearchBoxes();'>&advanced.search.reset;</button>
+                            <span style='padding-left: 10px;'> </span>
                                                        <button id='myopac_new_global_row' onclick='advAddGblRow();'>&advanced.add.row;</button>
                                                        <span style='padding-left: 10px;'> </span>
                             <button onclick='advSubmitGlobal();'>&advanced.search.submit;</button>
index 007ced5..c277bd5 100644 (file)
@@ -34,7 +34,7 @@
                        </tr>
                        <tr>
                                <th>Report Columns:</th>
-                               <td nowrap='nowrap'><b id='oils_rpt_report_editor_cols'/></td>
+                               <td><b id='oils_rpt_report_editor_cols'/></td>
                        </tr>
                        <tr class='hide_me' id='oils_rpt_editor_pivot_label_row'>
                                <th>Pivot Label Column:</th>
index 13f4ae9..07bdce3 100644 (file)
@@ -54,6 +54,14 @@ var OILS_RPT_FILTERS = {
 
        'is not' : {
                label : 'Is not NULL'
+    },
+
+    'is blank' : {
+        label : 'Is NULL or Blank'
+    },
+
+    'is not blank' : {
+        label : 'Is not NULL or Blank'
        }
 }
 
index 8f30018..f51348d 100644 (file)
@@ -12,12 +12,13 @@ function oilsRptReportEditor(rptObject, folderWindow) {
        appendClear(DOM.oils_rpt_report_editor_template_name, tmpl.name());
        appendClear(DOM.oils_rpt_report_editor_template_creator, tmpl.owner().usrname());
        appendClear(DOM.oils_rpt_report_editor_template_description, tmpl.description());
-
-       appendClear(DOM.oils_rpt_report_editor_cols,' | ');
+    
+    appendClear(DOM.oils_rpt_report_editor_cols,'');
        iterate(rptObject.def.select, 
                function(i) {
                        if(i)
-                               DOM.oils_rpt_report_editor_cols.appendChild(text(i.alias +' | '));
+                               DOM.oils_rpt_report_editor_cols.appendChild(text(i.alias));
+                               DOM.oils_rpt_report_editor_cols.appendChild(document.createElement('br'));
                }
        );
 
index 13fe535..de6297e 100644 (file)
 </row>
 <row flex="1">
                <groupbox flex="1">
-                       <caption label="&staff.main.auth.caption;"/>
+                       <caption label="&staff.main.authentication.caption;"/>
                        <grid>
                                <columns> <column /> <column /> </columns>
                                <rows>
index d8d5323..540e44d 100644 (file)
@@ -52,7 +52,7 @@
                        <table width='100%' class='data_grid sortable' id='pl_table'>
                                <thead>
                                        <tr>
-                                               <td>&staff.server.admin.hold_pull.title;</td>
+                                               <td>&staff.server.admin.hold_pull.title.label;</td>
                                                <td>&staff.server.admin.hold_pull.author;</td>
                                                <td>&staff.server.admin.hold_pull.copy_location;</td>
                                                <td id='pl_callnumber'>&staff.server.admin.hold_pull.call_number;</td>
index e81a0d4..46bf52e 100644 (file)
@@ -73,8 +73,8 @@
 </vbox>
 
 <hbox id="record_query_top_ui">
-    <label id="record_query_label" value="&staff.cat.record_buckets_overlay.record_query_label.value;"
-        accesskey="&staff.cat.record_buckets_overlay.record_query_label.accesskey;" control="record_query_input"/>
+    <label id="record_query_label" value="&staff.cat.record_buckets_overlay.record_query.label;"
+        accesskey="&staff.cat.record_buckets_overlay.record_query.accesskey;" control="record_query_input"/>
     <textbox id="record_query_input" flex="1"/>
     <button command="cmd_submit_query" label="&staff.cat.record_buckets_overlay.cmd_submit_query.button.label;"
         accesskey="&staff.cat.record_buckets_overlay.cmd_submit_query.button.accesskey;"/>
index dcf1b15..1b42234 100644 (file)
                        </hbox>
 
                        <hbox>
-                               <label value="&staff.cat.spine_labels.font_size_label.value;" control="pt"/>
+                               <label value="&staff.cat.spine_labels.font_size.label;" control="pt"/>
                                <textbox id="pt" value="10" onchange="this.setAttribute('value',this.value)" persist="value"/>
                        </hbox>
                        <grid><columns><column/><column/><column/><column/></columns><rows>
-                               <row> <label class="header" value="&staff.cat.spine_labels.spine_label.value;"/><spacer/> </row>
-                               <row> <label value="&staff.cat.spine_labels.spine_label.left_margine.value;" control="lm"/><textbox id="lm" value="0" onchange="this.setAttribute('value',this.value)" persist="value"/> </row>
-                               <row> <label value="&staff.cat.spine_labels.spine_label.label_width.value;" control="lw"/><textbox id="lw" value="8" onchange="this.setAttribute('value',this.value)" persist="value"/> </row>
-                               <row> <label value="&staff.cat.spine_labels.spine_label.label_length.value;" control="ll"/><textbox id="ll" value="9" onchange="this.setAttribute('value',this.value)" persist="value"/> </row>
-                               <row> <label class="header" value="&staff.cat.spine_labels.pocket_label.value;"/><checkbox id="pl" checked="false" persist="checked" label="Enabled"/> </row>
-                               <row> <label value="&staff.cat.spine_labels.pocket_label.middle_margin.value;" control="mm"/><textbox id="mm" value="2" onchange="this.setAttribute('value',this.value)" persist="value"/> </row>
-                               <row> <label value="&staff.cat.spine_labels.pocket_label.label_width.value;" control="plw"/><textbox id="plw" value="28" onchange="this.setAttribute('value',this.value)" persist="value"/> </row>
-                               <row> <label value="&staff.cat.spine_labels.pocket_label.label_length.value;" control="pll"/><textbox id="pll" value="9" onchange="this.setAttribute('value',this.value)" persist="value"/> </row>
+                               <row> <label class="header" value="&staff.cat.spine_labels.spine_label.label;"/><spacer/> </row>
+                               <row> <label value="&staff.cat.spine_labels.spine_label.left_margin.label;" control="lm"/><textbox id="lm" value="0" onchange="this.setAttribute('value',this.value)" persist="value"/> </row>
+                               <row> <label value="&staff.cat.spine_labels.spine_label.label_width.label;" control="lw"/><textbox id="lw" value="8" onchange="this.setAttribute('value',this.value)" persist="value"/> </row>
+                               <row> <label value="&staff.cat.spine_labels.spine_label.label_length.label;" control="ll"/><textbox id="ll" value="9" onchange="this.setAttribute('value',this.value)" persist="value"/> </row>
+                               <row> <label class="header" value="&staff.cat.spine_labels.pocket_label.label;"/><checkbox id="pl" checked="false" persist="checked" label="Enabled"/> </row>
+                               <row> <label value="&staff.cat.spine_labels.pocket_label.middle_margin.label;" control="mm"/><textbox id="mm" value="2" onchange="this.setAttribute('value',this.value)" persist="value"/> </row>
+                               <row> <label value="&staff.cat.spine_labels.pocket_label.label_width.label;" control="plw"/><textbox id="plw" value="28" onchange="this.setAttribute('value',this.value)" persist="value"/> </row>
+                               <row> <label value="&staff.cat.spine_labels.pocket_label.label_length.label;" control="pll"/><textbox id="pll" value="9" onchange="this.setAttribute('value',this.value)" persist="value"/> </row>
                                <row>
                                        <checkbox id="title" checked="true" persist="checked" label="&staff.cat.spine_labels.pocket_label.title.label;"/>
                                        <hbox>
-                                               <label value="&staff.cat.spine_labels.on_line.value;"/>
+                                               <label value="&staff.cat.spine_labels.on_line.label;"/>
                                                <textbox id="title_line" value="4" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                        </hbox>
                                </row>
                                <row>
                                        <checkbox id="title_r" checked="true" persist="checked" label="&staff.cat.spine_labels.pocket_label.include_title.label;"/>
                                        <hbox>
-                                               <label value="&staff.cat.spine_labels.on_line.value;"/>
+                                               <label value="&staff.cat.spine_labels.on_line.label;"/>
                                                <textbox id="title_r_line" value="5" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                        </hbox>
                                </row>
                                <row>
                                        <checkbox id="author" checked="true" persist="checked" label="Include Author"/>
                                        <hbox>
-                                               <label value="&staff.cat.spine_labels.on_line.value;"/>
+                                               <label value="&staff.cat.spine_labels.on_line.label;"/>
                                                <textbox id="author_line" value="3" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                        </hbox>
                                </row>
                                <row>
                                        <checkbox id="call_number" checked="true" persist="checked" label="&staff.cat.spine_labels.inc_call_number.label;"/>
                                        <hbox>
-                                               <label value="&staff.cat.spine_labels.on_line.value;"/>
+                                               <label value="&staff.cat.spine_labels.on_line.label;"/>
                                                <textbox id="call_number_line" value="2" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                        </hbox>
                                </row>
                                <row>
                                        <checkbox id="owning_lib_shortname" checked="false" persist="checked" label="&staff.cat.spine_labels.inc_owning_library_policy_code.label;"/>
                                        <hbox>
-                                               <label value="&staff.cat.spine_labels.on_line.value;"/>
+                                               <label value="&staff.cat.spine_labels.on_line.label;"/>
                                                <textbox id="owning_lib_shortname_line" value="" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                        </hbox>
                                </row>
                                <row>
                                        <checkbox id="owning_lib" checked="false" persist="checked" label="&staff.cat.spine_labels.inc_owning_library.label;"/>
                                        <hbox>
-                                               <label value="&staff.cat.spine_labels.on_line.value;"/>
+                                               <label value="&staff.cat.spine_labels.on_line.label;"/>
                                                <textbox id="owning_lib_line" value="" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                        </hbox>
                                </row>
                                <row>
                                        <checkbox id="shelving_location" checked="false" persist="checked" label="&staff.cat.spine_labels.inc_shelving_location.label;"/>
                                        <hbox>
-                                               <label value="&staff.cat.spine_labels.on_line.value;"/>
+                                               <label value="&staff.cat.spine_labels.on_line.label;"/>
                                                <textbox id="shelving_location_line" value="" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                </hbox>
                                </row>
                                <row>
                                        <checkbox id="barcode" checked="true" persist="checked" label="&staff.cat.spine_labels.inc_item_barcode.label;"/>
                                        <hbox>
-                                               <label value="&staff.cat.spine_labels.on_line.value;"/>
+                                               <label value="&staff.cat.spine_labels.on_line.label;"/>
                                                <textbox id="barcode_line" value="1" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                        </hbox>
                                </row>
                                                <textbox id="custom1_tb" value="%price%" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                        </hbox>
                                        <hbox>
-                                               <label value="&staff.cat.spine_labels.on_line.value;"/>
+                                               <label value="&staff.cat.spine_labels.on_line.label;"/>
                                                <textbox id="custom1_line" value="" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                        </hbox>
                                </row>
                                                <textbox id="custom2_tb" value="%deposit_amount%" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                        </hbox>
                                        <hbox>
-                                                       <label value="&staff.cat.spine_labels.on_line.value;"/>
+                                                       <label value="&staff.cat.spine_labels.on_line.label;"/>
                                                        <textbox id="custom2_line" value="" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                        </hbox>
                                </row>
                                                <textbox id="custom3_tb" value="%alert_message%" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                        </hbox>
                                        <hbox>
-                                               <label value="&staff.cat.spine_labels.on_line.value;"/>
+                                               <label value="&staff.cat.spine_labels.on_line.label;"/>
                                                <textbox id="custom3_line" value="" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                        </hbox>
                                </row>
                                                <textbox id="custom4_tb" value="Don't sell me on eBay" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                        </hbox>
                                        <hbox>
-                                               <label value="&staff.cat.spine_labels.on_line.value;"/>
+                                               <label value="&staff.cat.spine_labels.on_line.label;"/>
                                                <textbox id="custom4_line" value="" persist="value" onchange="this.setAttribute('value',this.value)"/>
                                        </hbox>
                                </row>
index d485f2e..6ca311a 100644 (file)
                     <spacer flex="1"/>
                     <button id="marc_view" label="&staff.cat.z3950.marc_view.label;" accesskey="&staff.cat.z3950.marc_view.accesskey;" disabled="true"/>
                     <button id="marc_import_overlay" label="&staff.cat.z3950.marc_import_overlay.label;" accesskey="&staff.cat.z3950.marc_import_overlay.accesskey;" disabled="true"/>
-                    <button id="marc_import" label="&staff.cat.z3950.marc_import.label;" accesskey="&staff.cat.z3950.marc_import.accesskey;" disabled="true"/>
+                    <button id="marc_import" label="&staff.cat.z3950.result_message.marc_import.label;" accesskey="&staff.cat.z3950.result_message.marc_import.accesskey;" disabled="true"/>
                 </hbox>
                 <deck id="deck" flex="1">
                     <tree id="results" flex="1" enableColumnDrag="true" seltype="single"/>
index 39d8715..b94b212 100644 (file)
        <vbox>
                <hbox>
                        <label id="checkin_scan_barcode_label" 
-                               value="&staff.circ.checkin.scan_label;" 
-                               accesskey="&staff.circ.checkin.scan_label.accesskey;" 
+                               value="&staff.circ.checkin.scan.label;" 
+                               accesskey="&staff.circ.checkin.scan.accesskey;" 
                                control="checkin_barcode_entry_textbox"/>
                        <textbox id="checkin_barcode_entry_textbox"/>
                        <button id="checkin_submit_barcode_button" 
-                               label="&staff.circ.checkin.submit_label;" 
+                               label="&staff.circ.checkin.submit.label;" 
                                command="cmd_checkin_submit_barcode"
-                               oldaccesskey="&staff.circ.checkin.submit_label.accesskey;"/>
+                               oldaccesskey="&staff.circ.checkin.submit.accesskey;"/>
                </hbox>
                <label id="no_change_label" value="" style="color: red" hidden="true"/>
        </vbox>
 
 <hbox id="checkin_bottom_ui">
        <button id="checkin_print" 
-               label="&staff.checkin.print_receipt_label;" 
+               label="&staff.checkin.print_receipt.label;" 
                command="cmd_checkin_print"
-               accesskey="&staff.checkin.print_receipt_label.accesskey;"/>
+               accesskey="&staff.checkin.print_receipt.accesskey;"/>
        <button id="checkin_export" 
                label="&staff.circ.checkin_overlay.checkin_export.label;"
                command="cmd_checkin_export"
index 1eef372..e56703d 100644 (file)
 
 <hbox id="checkout_top_ui">
 <!--
-       <label id="checkout_scan_barcode_label" 
-               value="&staff.patron_display.checkout.scan_label;" 
-               accesskey="&staff.patron_display.checkout.scan_label.accesskey;" 
+       <label id="checkout_scan_barcode.label" 
+               value="&staff.patron_display.checkout.scan.label;" 
+               accesskey="&staff.patron_display.checkout.scan.accesskey;" 
                control="checkout_barcode_entry_textbox"/>
 -->
        <hbox id="checkout_menu_placeholder" flex="0"/>
        <label accesskey="&staff.circ.checkout_overlay.barcode.accesskey;" control="checkout_barcode_entry_textbox"/>
        <textbox id="checkout_barcode_entry_textbox"/>
        <button id="checkout_submit_barcode_button" 
-               label="&staff.patron_display.checkout.submit_label;" 
+               label="&staff.patron_display.checkout.submit.label;" 
                command="cmd_checkout_submit"
-               accesskey="&staff.patron_display.checkout.submit_label.accesskey;"/>
+               accesskey="&staff.patron_display.checkout.submit.accesskey;"/>
        <spacer flex="1"/>
        <hbox id="duedate_hbox">
                <label value="&staff.circ.checkout_overlay.duedate_menu.label;" accesskey="&staff.circ.checkout_overlay.duedate_menu.accesskey;" control="checkout_duedate_menu"/>
@@ -54,9 +54,9 @@
 
 <hbox id="checkout_bottom_ui">
        <button id="checkout_print" 
-               label="&staff.patron_display.checkout.print_receipt_label;" 
+               label="&staff.patron_display.checkout.print_receipt.label;" 
                command="cmd_checkout_print"
-               accesskey="&staff.patron_display.checkout.print_receipt_label.accesskey;"/>
+               accesskey="&staff.patron_display.checkout.print_receipt.accesskey;"/>
        <button id="checkout_export" 
                label="&staff.circ.checkout_overlay.export.label;"
                command="cmd_checkout_export"
        <checkbox id="strict_barcode" label="&staff.circ.checkout_overlay.strict_barcode.label;" checked="false" persist="checked"/> 
        <spacer id="pcii3s" flex="1"/>
        <checkbox id="checkout_auto" persist="checked"
-               label="&staff.patron_display.checkout.auto_print_label;" 
-               accesskey_old="&staff.patron_display.checkout.auto_print_label.accesskey;"/> 
+               label="&staff.patron_display.checkout.auto_print.label;" 
+               accesskey_old="&staff.patron_display.checkout.auto_print.accesskey;"/> 
        <button id="checkout_done" 
-               label="&staff.patron_display.checkout.done_label;" 
+               label="&staff.patron_display.checkout.done.label;" 
                command="cmd_checkout_done"
-               accesskey="&staff.patron_display.checkout.done_label.accesskey;"/>
+               accesskey="&staff.patron_display.checkout.done.accesskey;"/>
 </hbox>
 
 </overlay>
index 6fd1a31..ae46bf4 100644 (file)
@@ -57,8 +57,8 @@
                <menuitem command="cmd_delete_items" label="&staff.circ.copy_status_overlay.cmd_delete_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_items.accesskey;"/>
                <menuitem command="cmd_delete_volumes" label="&staff.circ.copy_status_overlay.cmd_delete_volumes.label;" accesskey="&staff.circ.copy_status_overlay.cmd_delete_volumes.accesskey;"/>
                <menuseparator/>
-               <menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_damaged.accesskey;"/>
-               <menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.sel_mark_items_missing.accesskey;"/>
+               <menuitem command="sel_mark_items_damaged" label="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_damaged.label;" accesskey="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_damaged.accesskey;"/>
+               <menuitem command="sel_mark_items_missing" label="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_missing.label;" accesskey="&staff.circ.copy_status_overlay.copy_actions.sel_mark_items_missing.accesskey;"/>
                <menuseparator/>
                <menuitem command="sel_spine" label="&staff.circ.copy_status_overlay.sel_spine.label;" accesskey="&staff.circ.copy_status_overlay.sel_spine.accesskey;"/>
                <menuitem command="cmd_replace_barcode" label="&staff.circ.copy_status_overlay.cmd_replace_barcode.label;" accesskey="&staff.circ.copy_status_overlay.cmd_replace_barcode.accesskey;"/>
index bee9bf3..7ea88fd 100644 (file)
@@ -92,7 +92,7 @@
        <caption label="&staff.circ.in_house_use.cmgb1.caption;" />
 
        <hbox id="in_house_use_top_ui">
-               <label id="in_house_use_multiplier_label" value="&staff.circ.in_house_use.multiplier_label.value;" control="in_house_use_multiplier_textbox" accesskey="&staff.circ.in_house_use.multiplier_label.accesskey;" hidden="false"/>
+               <label id="in_house_use_multiplier_label" value="&staff.circ.in_house_use.multiplier.label;" control="in_house_use_multiplier_textbox" accesskey="&staff.circ.in_house_use.multiplier.accesskey;" hidden="false"/>
                <textbox id="in_house_use_multiplier_textbox" value="1" hidden="false" size="2" cols="2"/>
                <hbox id="in_house_use_menu_placeholder" flex="0"/>
                <textbox id="in_house_use_barcode_entry_textbox"/>
diff --git a/Open-ILS/xul/staff_client/server/index.xhtml b/Open-ILS/xul/staff_client/server/index.xhtml
new file mode 100644 (file)
index 0000000..53c48bf
--- /dev/null
@@ -0,0 +1,18 @@
+<?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'>
+<head>
+<title>&staff.portal.title;</title>
+</head>
+<body>
+<h1>&staff.portal.title;</h1>
+<p>&staff.portal.default.welcome;</p>
+<img src="/opac/images/main_logo.jpg" style="display: block; margin-left: auto; margin-right: auto;"/>
+</body>
+</html>
index e6ec76b..b37e2ee 100644 (file)
@@ -29,6 +29,7 @@ staff.patron.bill_history.handle_add.btn_yes=Yes
 staff.patron.bill_history.handle_add.btn_no=No
 staff.patron.bill_history.handle_add.confirm_message=Check here to confirm this message
 staff.patron.bill_history.print_bills.print_error=printing bills
+staff.patron.bills.init_controller.money_summary_label=Money Summary
 staff.patron.bills.bill_payment_amount.credit_amount=Patron only has %1$s in credit.
 staff.patron.bills.bill_change_amount.greedy=Someone wanted more money than they deserved
 staff.patron.bills.apply_payment.nothing_applied=No payments or patron credit applied.
@@ -42,6 +43,7 @@ staff.patron.bills.info_box.label_value.last_billing=Last Billing:
 staff.patron.bills.info_box.label_value.add_billing=Add Billing
 staff.patron.bills.info_box.label_value.refund=Refund
 staff.patron.bills.info_box.label_value.void_all_billings=Void All Billings
+staff.patron.bills.info_box.label_value.full_details=Full Details
 staff.patron.bills.void_all_billings.all_voided=All billings already voided on this bill.
 staff.patron.bills.void_all_billings.void.message=Are you sure you would like to void $%1$s worth of line-item billings?
 staff.patron.bills.void_all_billings.void.title=Voiding Bills
@@ -245,3 +247,5 @@ staff.patron.ue.uEditShowSearch.search=Search would be:\n%1$s
 staff.patron.user_edit.save_user.depth_required=Depth is required on the %1$s permission.
 staff.patron.user_edit.save_user.user_modified_successfully=User %1$s [%2$s] successfully modified.\n%3$s permissions and %4$s work locations updated.
 staff.patron.user_edit.display_perm.select_one=-- Select One --
+web.staff.patron.ue.session_no_defined=User session is not defined
+web.staff.patron.ue.uedit_show_search.search_would_be=Search would be:\n%1$s
index 444f418..ca8d7c9 100644 (file)
@@ -20,7 +20,7 @@
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 <?xul-overlay href="/xul/server/patron/bill_summary_overlay.xul"?>
 
-<window id="patron_bill" title="Bill Patron Wizard"
+<window id="patron_bill" title="&staff.patron.bill_wizard.title;"
        orient="vertical" style="overflow: auto"
        onload="try { patron_bill_init(); font_helper(); } catch(E) { alert(E); }" width="700" height="550"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
index d0aa614..322bc84 100644 (file)
@@ -143,7 +143,7 @@ patron.bills.prototype = {
                                                                        'primary' : false, 'hidden' : false, 'render' : 'obj.info_box(my)'
                                                                },
                                                                {
-                                                                       'id' : 'money', 'label' : 'Money Summary', 'flex' : 1,
+                                                                       'id' : 'money', 'label' : $('patronStrings').getString('staff.patron.bills.init_controller.money_summary_label'), 'flex' : 1,
                                                                        'primary' : false, 'hidden' : false, 'render' : 'obj.money_box(my.mobts)'
                                                                },
                                                                {
@@ -866,7 +866,7 @@ patron.bills.prototype = {
                                        try {
                                        switch(my.mobts.xact_type()) {
                                                case 'circulation':
-                                                       xt_label.setAttribute( 'value', 'Title:' );
+                                                       xt_label.setAttribute( 'value', $("patronStrings").getString('staff.patron.bills.info_box.label_value.title') );
                                                        obj.network.simple_request(
                                                                'FM_CIRC_RETRIEVE_VIA_ID',
                                                                [ ses(), my.mobts.id() ],
@@ -950,7 +950,7 @@ patron.bills.prototype = {
                                        vbox.appendChild( btn_box ); btn_box.flex = 1;
                                                        var btn = document.createElement('button');
                                                                btn_box.appendChild( btn );
-                                                               btn.setAttribute( 'label', 'Full Details' );
+                                                               btn.setAttribute( 'label', $("patronStrings").getString('staff.patron.bills.info_box.label_value.full_details') );
                                                                btn.setAttribute( 'name', 'full_details' );
                                                                btn.setAttribute( 'mobts_id', my.mobts.id() );  
                                                                btn.addEventListener(
index c823839..a3b80b7 100644 (file)
@@ -12,9 +12,9 @@
 <box id="bills_main" flex="1" orient="vertical" class="my_overflow">
        <vbox id="bills_top_ui" />
        <hbox>
-               <label style="font-weight: bold;" value="Selected Balance:"/><label id="selected_balance"/>
-               <label style="font-weight: bold;" value="Un-Selected:"/><label id="unselected_balance"/>
-               <label style="font-weight: bold;" value="Voided:"/><label id="voided_balance"/>
+               <label style="font-weight: bold;" value="&staff.patron.bills_overlay.selected_balance.value;"/><label id="selected_balance"/>
+               <label style="font-weight: bold;" value="&staff.patron.bills_overlay.unselected.value;"/><label id="unselected_balance"/>
+               <label style="font-weight: bold;" value="staff.patron.bills_overlay.voided.value;"/><label id="voided_balance"/>
                <spacer flex="1"/>
                <label id="circulating_hint" hidden="true" style="background: red; color: white" value="&staff.patron.bills_overlay.still_checked_out.label;"/>
        </hbox>
                <button id="bill_history" label="&staff.patron.bills_overlay.history.label;" accesskey="&staff.patron.bills_overlay.history.accesskey;" command="cmd_bill_history"/>
                <spacer flex="2"/>
                <checkbox id="annotate_payment" label="&staff.patron.bills_overlay.annotate_payment.label;" persist="checked" checked="false" />
-               <checkbox id="auto_print" label="Auto-Print" persist="checked" checked="true" />
+               <checkbox id="auto_print" label="&staff.patron.bills_overlay.auto_print.label;" persist="checked" checked="true" />
                <button class="hide_patron_credit" hidden="true" disabled="true" id="change_to_credit" label="&staff.patron.bills_overlay.convert_change_to_credit.label;" command="cmd_change_to_credit"/>
                <button id="bill_apply_payment" label="&staff.patron.bills_overlay.apply_payment.label;" accesskey="&staff.patron.bills_overlay.apply_payment.accesskey;" command="cmd_bill_apply_payment"/>
        </hbox>
index 2f394b0..ebf2649 100644 (file)
                <groupbox flex="1" style="background-color: black;"/>
                <groupbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px;" >
                        <hbox>
-                               <description name="method" label="Method:" style="font-weight: bold"/>
+                               <description name="method" label="&staff.patron.hold_notices.method.label;" style="font-weight: bold"/>
                                <spacer flex="1"/>
                                <description name="notify_time" style="font-weight: bold"/>
                        </hbox>
index 3ac8d09..4669680 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE overlay PUBLIC "" ""[
-       <!--#include virtual="/opac/locale/en-US/lang.dtd"-->
+       <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
 ]>
 <overlay id="items_overlay" 
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <popupset id="items_popupset">
        <popup id="items_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 label="Show in Catalog" command="cmd_show_catalog" />
-               <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.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;"/>
+               <menuitem command="sel_bucket" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
+               <menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog" />
+               <menuitem command="sel_copy_details" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
+               <menuitem command="sel_patron" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
                <menuseparator />
-               <menuitem label="Edit Due Date" command="cmd_items_edit" />
-               <menuitem label="Mark Lost (by Patron)" command="cmd_items_mark_lost" />
-               <menuitem label="Mark Claimed Returned" command="cmd_items_claimed_returned" />
-               <menuitem label="Renew" command="cmd_items_renew" />
-               <menuitem label="Renew All" command="cmd_items_renew_all" hidden="false"/>
-               <menuitem label="Check In" command="cmd_items_checkin" />
-               <menuitem label="Add Billing" command="cmd_add_billing" />
+               <menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit" />
+               <menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost" />
+               <menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned" />
+               <menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew" />
+               <menuitem label="&staff.patron.items_overlay.items_renew_all.label;" command="cmd_items_renew_all" hidden="false"/>
+               <menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin" />
+               <menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing" />
                <menuseparator />
-               <menuitem command="save_columns" label="Save Columns"/>
+               <menuitem command="save_columns" label="&staff.patron.items_overlay.save_columns.label;"/>
        </popup>
        <popup id="items_actions2" position="at_pointer"> 
-               <menuitem command="sel_clip2" label="Copy to Clipboard" accesskey="C" />
-               <menuitem command="sel_bucket2" label="Add to Item Bucket" accesskey="A"/>
-               <menuitem label="Show in Catalog" command="cmd_show_catalog2" />
-               <menuitem command="sel_copy_details2" label="Show Item Details" accesskey="I" />
-               <menuitem command="sel_patron2" label="Show Last Few Circulations" accesskey="L"/>
+               <menuitem command="sel_clip2" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;" />
+               <menuitem command="sel_bucket2" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
+               <menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog2" />
+               <menuitem command="sel_copy_details2" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
+               <menuitem command="sel_patron2" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
                <menuseparator />
-               <menuitem label="Edit Due Date" command="cmd_items_edit2" />
-               <menuitem label="Mark Lost (by Patron)" command="cmd_items_mark_lost2" />
-               <menuitem label="Mark Claimed Returned" command="cmd_items_claimed_returned2" />
-               <menuitem label="Renew" command="cmd_items_renew2" />
-               <menuitem label="Check In" command="cmd_items_checkin2" />
-               <menuitem label="Add Billing" command="cmd_add_billing2" />
+               <menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit2" />
+               <menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost2" />
+               <menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned2" />
+               <menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew2" />
+               <menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin2" />
+               <menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing2" />
                <menuseparator />
-               <menuitem command="save_columns2" label="Save Columns"/>
+               <menuitem command="save_columns2" label="&staff.patron.items_overlay.save_columns.label;"/>
        </popup>
 
 </popupset>
 <hbox id="items_top_ui" flex="1">
        <spacer id="pcii3s" flex="1"/>
        <menubar>
-               <menu label="Actions for Selected Items" accesskey="S">
+               <menu label="&staff.patron.items_overlay.actions_for_selected_items.label;" accesskey="&staff.patron.items_overlay.actions_for_selected_items.accesskey;">
                        <menupopup>
-                               <menuitem command="sel_clip" label="Copy to Clipboard" accesskey="C" />
-                               <menuitem command="sel_bucket" label="Add to Item Bucket" accesskey="A"/>
-                               <menuitem label="Show in Catalog" command="cmd_show_catalog" />
-                               <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.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;"/>
+                               <menuitem command="sel_bucket" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
+                               <menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog" />
+                               <menuitem command="sel_copy_details" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
+                               <menuitem command="sel_patron" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
                                <menuseparator />
-                               <menuitem label="Edit Due Date" command="cmd_items_edit" />
-                               <menuitem label="Mark Lost (by Patron)" command="cmd_items_mark_lost" />
-                               <menuitem label="Mark Claimed Returned" command="cmd_items_claimed_returned" />
-                               <menuitem label="Renew" command="cmd_items_renew" />
-                               <menuitem label="Renew All" command="cmd_items_renew_all" hidden="false"/>
-                               <menuitem label="Check In" command="cmd_items_checkin" />
-                               <menuitem label="Add Billing" command="cmd_add_billing" />
+                               <menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit" />
+                               <menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost" />
+                               <menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned" />
+                               <menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew" />
+                               <menuitem label="&staff.patron.items_overlay.items_renew_all.label;" command="cmd_items_renew_all" hidden="false"/>
+                               <menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin" />
+                               <menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing" />
                                <menuseparator />
-                               <menuitem command="save_columns" label="Save Columns"/>
+                               <menuitem command="save_columns" label="&staff.patron.items_overlay.save_columns.label;"/>
                        </menupopup>
                </menu>
        </menubar>
 <hbox id="items_top_ui2" flex="1">
        <spacer id="pcii3s2" flex="1"/>
        <menubar>
-               <menu label="Actions for Selected Items" old_accesskey="S">
+               <menu label="&staff.patron.items_overlay.actions_for_selected_items.label;" old_accesskey="&staff.patron.items_overlay.actions_for_selected_items.accesskey;">
                        <menupopup>
-                               <menuitem command="sel_clip2" label="Copy to Clipboard" accesskey="C" />
-                               <menuitem command="sel_bucket2" label="Add to Item Bucket" accesskey="A"/>
-                               <menuitem label="Show in Catalog" command="cmd_show_catalog2" />
-                               <menuitem command="sel_copy_details2" label="Show Item Details" accesskey="I" />
-                               <menuitem command="sel_patron2" label="Show Last Few Circulations" accesskey="L"/>
+                               <menuitem command="sel_clip2" label="&staff.patron.items_overlay.sel_clip.label;" accesskey="&staff.patron.items_overlay.sel_clip.accesskey;" />
+                               <menuitem command="sel_bucket2" label="&staff.patron.items_overlay.sel_bucket.label;" accesskey="&staff.patron.items_overlay.sel_bucket.accesskey;"/>
+                               <menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog2" />
+                               <menuitem command="sel_copy_details2" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
+                               <menuitem command="sel_patron2" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
                                <menuseparator />
-                               <menuitem label="Edit Due Date" command="cmd_items_edit2" />
-                               <menuitem label="Mark Lost (by Patron)" command="cmd_items_mark_lost2" />
-                               <menuitem label="Mark Claimed Returned" command="cmd_items_claimed_returned2" />
-                               <menuitem label="Renew" command="cmd_items_renew2" />
-                               <menuitem label="Check In" command="cmd_items_checkin2" />
-                               <menuitem label="Add Billing" command="cmd_add_billing2" />
+                               <menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit2" />
+                               <menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost2" />
+                               <menuitem label="&staff.patron.items_overlay.items_claimed_returned.label;" command="cmd_items_claimed_returned2" />
+                               <menuitem label="&staff.patron.items_overlay.items_renew.label;" command="cmd_items_renew2" />
+                               <menuitem label="&staff.patron.items_overlay.items_checkin.label;" command="cmd_items_checkin2" />
+                               <menuitem label="&staff.patron.items_overlay.add_billing.label;" command="cmd_add_billing2" />
                                <menuseparator />
-                               <menuitem command="save_columns2" label="Save Columns"/>
+                               <menuitem command="save_columns2" label="&staff.patron.items_overlay.save_columns.label;"/>
                        </menupopup>
                </menu>
        </menubar>
 
 
 <hbox id="items_bottom_ui" flex="1">
-       <button id="noncat" label="Show Non-Cataloged Circulations in List Above" command="cmd_show_noncats" accesskey="N"/>
+       <button id="noncat" label="&staff.patron.items_overlay.show_noncats.label;" command="cmd_show_noncats" accesskey="&staff.patron.items_overlay.show_noncats.accesskey;"/>
        <spacer flex="1"/>
-       <button id="items_print" label="&staff.patron_display.items.print_receipt_label;" command="cmd_items_print" accesskey="&staff.patron_display.items.print_receipt_label.accesskey;" />
-       <button id="items_export" 
-               label="Export"
-               command="cmd_items_export"
-               accesskey=""/>
+       <button id="items_print" label="&staff.patron_display.items.print_receipt.label;" command="cmd_items_print" accesskey="&staff.patron_display.items.print_receipt.accesskey;" />
+       <button id="items_export" label="&staff.patron.items_overlay.items_export.label;" command="cmd_items_export" accesskey=""/>
 </hbox>
 
 <hbox id="items_bottom_ui2" flex="1">
        <spacer flex="1"/>
-       <button id="items_print2" label="&staff.patron_display.items.print_receipt_label;" command="cmd_items_print2" old_accesskey="&staff.patron_display.items.print_receipt_label.accesskey;" />
-       <button id="items_export2" 
-               label="Export"
-               command="cmd_items_export2"
-               accesskey=""/>
+       <button id="items_print2" label="&staff.patron_display.items.print_receipt.label;" command="cmd_items_print2" old_accesskey="&staff.patron_display.items.print_receipt.accesskey;" />
+       <button id="items_export2" label="&staff.patron.items_overlay.items_export.label;" command="cmd_items_export2" accesskey=""/>
 </hbox>
 
 </overlay>
index ad9693f..cc90762 100644 (file)
@@ -3,14 +3,14 @@
 <!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"-->
        <!ENTITY nbsp " "> <!-- calendar needs this entity -->
 ]>
 
-
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
        <head>
-               <title>Evergreen: User Editor</title>
+               <title>&staff.patron.ue.ev_user_editor.label;</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>
 
                </style>
        </head>
+       
+       <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
        <body onload='uEditInit();'>
 
        <center>
 
-               <h2>Evergreen User Editor</h2>
+               <h2>&staff.patron.ue.ev_user_editor.label;</h2>
 
                <div style='position:absolute; top: 5px; right: 5px;'>
-                       <span>Welcome </span><b><span id='uedit_user'/></b>
+                       <span>&staff.patron.ue.user_greeting.label;</span><b><span id='uedit_user'/></b>
                </div>
 
                <hr/><br/>
                                <tr>
                                        <td align='left' width='80%'>
                                                <b>
-                                                       <span>Note: required or invalid fields are </span>
-                                                       <span style='border-bottom: 2px solid red;'>marked with color</span>
+                                                       <span>&staff.patron.ue.interface_note.label;</span>
                                                </b>
                                        </td>
                                        <td align='right' width='20%'>
                                                <a class='hide_me' id='ue_errors' href='javascript:void(0);' 
                                                        style='color: red; font-size: 12pt; font-weight: bold' onclick='uEditAlertErrors();'>
-                                                       View Errors
+                                                       &staff.patron.ue.view_errors.label;
                                                </a>
                                        </td>
                                </tr>
                                                        <tbody>
                                                                <tr>
                                                                        <td id='uedit_userid_label' class='main_nav_link'>
-                                                                               <a href='javascript:uEditShowPage("uedit_userid");'>1. User Identification</a>
+                                                                               <a href='javascript:uEditShowPage("uedit_userid");'>&staff.patron.ue.nav.user_id.label;</a>
                                                                        </td>
                                                                </tr>
                                                                <tr>
                                                                        <td id='uedit_contact_info_label' class='main_nav_link'>        
-                                                                               <a href='javascript:uEditShowPage("uedit_contact_info");'>2. Contact Info</a>
+                                                                               <a href='javascript:uEditShowPage("uedit_contact_info");'>&staff.patron.ue.nav.contact_info.label;</a>
                                                                        </td>
                                                                </tr>
                                                                <tr>
                                                                        <td id='uedit_addresses_label' class='main_nav_link'>           
-                                                                               <a href='javascript:uEditShowPage("uedit_addresses");'>3. Addresses</a>
+                                                                               <a href='javascript:uEditShowPage("uedit_addresses");'>&staff.patron.ue.nav.addresses.label;</a>
                                                                        </td>
                                                                </tr>
                                                                <tr>
                                                                        <td id='uedit_groups_label' class='main_nav_link'>                      
-                                                                               <a href='javascript:uEditShowPage("uedit_groups");'>4. Groups and Permissions</a>
+                                                                               <a href='javascript:uEditShowPage("uedit_groups");'>&staff.patron.ue.nav.groups_permissions.label;</a>
                                                                        </td>
                                                                </tr>
                                                                <tr>
                                                                        <td id='uedit_stat_cats_label' class='main_nav_link'>           
-                                                                               <a href='javascript:uEditShowPage("uedit_stat_cats");'>5. Statistical Categories</a>
+                                                                               <a href='javascript:uEditShowPage("uedit_stat_cats");'>&staff.patron.ue.nav.stat_categories.label;</a>
                                                                        </td>
                                                                </tr>
                                                                <tr>
                                                                        <td id='uedit_surveys_label' class='main_nav_link'>                     
-                                                                               <a href='javascript:uEditShowPage("uedit_surveys");'>6. Surveys</a>
+                                                                               <a href='javascript:uEditShowPage("uedit_surveys");'>&staff.patron.ue.nav.surveys.label;</a>
                                                                        </td>
                                                                </tr>
                                                                <tr>
                                                                        <td id='uedit_finalize_label' class='main_nav_link'>                    
-                                                                               <a href='javascript:uEditShowPage("uedit_finalize");'>7. Finish</a>
+                                                                               <a href='javascript:uEditShowPage("uedit_finalize");'>&staff.patron.ue.nav.finish.label;</a>
                                                                        </td>
                                                                </tr>
                                                        </tbody>
                                        <td width='85%' id='uedit_loading'>
                                                <div class='main_div has_color' 
                                                        style='padding: 50px; vertical-align: middle;'>
-                                                       <b>Loading data...</b>
+                                                       <b>&staff.patron.ue.loading_data.label;</b>
                                                </div>
                                        </td>
 
                                                        <div id='dup_div' name='dup_div'>
                                                                <a name='link' class='dup_link hide_me'
                                                                        href='javascript:void(0);' onclick='uEditShowSearch(this);'>
-                                                                       Found <b name='count'/> possible duplicate patron(s):
+                                                                       &staff.patron.ue.found_duplicate_patron.label;<b name='count'/>
                                                                        <b name='data'/>
                                                                </a>
                                                        </div>
                                                                                                                }'
                                                                                                                /> -->
                                                                                                                <button style='padding-left: 5px;' class='hide_me' id='ue_mark_card_lost'
-                                                                                                       onclick='uEditMarkCardLost();'>Mark Lost</button>
+                                                                                                       onclick='uEditMarkCardLost();'>&staff.patron.ue.mark_lost.label;</button>
                                                                                        </div>
                                                                                </td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Username</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.username.label;</div></td>
                                                                                <td><div class='wide left'><input type='text' id='ue_username'/></div></td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Password</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.password.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input type='password' id='ue_password1'/>
-                                                                                               <button class='hide_me' onclick='uEditResetPw();' id='ue_reset_pw'>Reset</button>
+                                                                                               <button class='hide_me' onclick='uEditResetPw();' id='ue_reset_pw'>&staff.patron.ue.reset.label;</button>
                                                                                                <span style='padding-left: 10px;' class='hide_me' id='ue_password_gen'>
-                                                                                                       Password: 
+                                                                                                       &staff.patron.ue.re_password.label;
                                                                                                        <span style='text-decoration:underline;' id='ue_password_plain'/>
                                                                                                </span>
                                                                                        </div>
                                                                                </td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Verify Password</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.verify_password.label;</div></td>
                                                                                <td><div class='wide left'><input type='password' id='ue_password2'/></div></td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>First Name</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.first_name.label;</div></td>
                                                                                <td><div class='wide left'><input type='text' id='ue_firstname'/></div></td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Middle Name</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.middle_name.label;</div></td>
                                                                                <td><div class='wide left'><input type='text' id='ue_middlename'/></div></td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Last Name</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.last_name.label;</div></td>
                                                                                <td><div class='wide left'><input type='text' id='ue_lastname'/></div></td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Suffix</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.suffix.label;</div></td>
                                                                                <td><div class='wide left'>
                                                                                        <input type='text' id='ue_suffix'/>
                                                                                        <select id='ue_suffix_selector' style='width: 6em;'
                                                                                                onclick='$("ue_suffix").value = this.options[this.selectedIndex].value'
                                                                                                onchange='$("ue_suffix").value = this.options[this.selectedIndex].value'>
-                                                                                               <option value=''>- Pick -</option>
+                                                                                               <option value=''>&staff.patron.ue.choose.label;</option>
                                                                                                <option value='Jr'>Jr</option>
                                                                                                <option value='Sr'>Sr</option>
                                                                                                <option value='II'>II</option>
                                                                                </div></td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Date of Birth</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.dob.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
        
                                                                                </td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Primary Identification Type</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.primary_id_type.label;</div></td>
                                                                                <td><div class='wide left'>
                                                                                                <select id='ue_primary_ident_type'>
-                                                                                                       <option value=''> -- Required -- </option>
+                                                                                                       <option value=''>&staff.patron.ue.required.label;</option>
                                                                                                </select>
                                                                                        </div>
                                                                                </td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Primary Identification</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.primary_id.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input type='text' id='ue_primary_ident'/>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Secondary Identification Type</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.secondary_id_type.label;</div></td>
                                                                                <td><div class='wide left'>
                                                                                                <select id='ue_secondary_ident_type'>
-                                                                                                       <option value=''> -- None Selected -- </option>
+                                                                                                       <option value=''>&staff.patron.ue.none_selected.label;</option>
                                                                                                </select>
                                                                                        </div>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Secondary Identification</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.secondary_id.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input type='text' id='ue_secondary_ident'/>
                                                                                </td>
                                                                        </tr>
                                                                        <tr class='hide_me' id='ue_guardian_row'>
-                                                                               <td><div class='wide right'><b>Parent / Guardian</b></div></td>
+                                                                               <td><div class='wide right'><b>&staff.patron.ue.parent_guardian.label;</b></div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <span id='ue_guardian_field'/>
                                                        <table class='uedit_table'>
                                                                <tbody>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Email Address</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.email_address.label;</div></td>
                                                                                <td><div class='wide left'><input type='text' id='ue_email' size='32'/></div></td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Daytime Phone</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.day_phone.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input class='pad' type='text' id='ue_day_phone' size='18'/>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Evening Phone</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.evening_phone.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input class='pad' type='text' id='ue_night_phone' size='18'/>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Other/Cell Phone</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.other_phone.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input class='pad' type='text' id='ue_other_phone' size='18'/>
                                                                                </td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Home Library</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.home_library.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <select style='width: 20em;' id='ue_org_selector'/>
                                                        <table class='uedit_table' style='width: 98%; padding: 1px;'>
                                                                <thead>
                                                                        <tr>
-                                                                               <td>Address</td>
-                                                                               <td>Within City Limits</td>
-                                                                               <td>Valid</td>
-                                                                               <td>Mailing Address</td>
-                                                                               <td>Physical Address</td>
+                                                                               <td>&staff.patron.ue.address.label;</td>
+                                                                               <td>&staff.patron.ue.in_city_limits.label;</td>
+                                                                               <td>&staff.patron.ue.valid.label;</td>
+                                                                               <td>&staff.patron.ue.mailing_address.label;</td>
+                                                                               <td>&staff.patron.ue.physical_address.label;</td>
                                                                        </tr>
                                                                </thead>
                                                                <tbody id='ue_address_tbody'>
                                                                                                                <td colspan='6'>
                                                                                                                        <div style='padding: 8px;'>
                                                                                                                                <span style='color:red;'>*</span>
-                                                                                                                               Address is owned by
+                                                                                                                               &staff.patron.ue.owned_address.label;
                                                                                                                                <span name='addr_owner_name'/>
                                                                                                                                <span name='owner_link_div'>
-                                                                                                                                       (<a name='addr_owner' href='javascript:void(0);'>Edit</a>)
+                                                                                                                                       (<a name='addr_owner' href='javascript:void(0);'>&staff.patron.ue.edit.label;</a>)
                                                                                                                                </span>
                                                                                                                        </div>
                                                                                                                </td>
                                                                                                        </tr>
                                                                                                        <tr>
-                                                                                                               <td><div class='wide right'>Label</div></td>
+                                                                                                               <td><div class='wide right'>&staff.patron.ue.label.label;</div></td>
                                                                                                                <td colspan='3'>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_label' id='ue_addr_label'/>
                                                                                                                        </div>
                                                                                                                </td>
-                                                                                                               <td><div class='wide right'>Zip</div></td>
+                                                                                                               <td><div class='wide right'>&staff.patron.ue.zip_code.label;</div></td>
                                                                                                                <td>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_zip' size='10' maxlength='10'/>
                                                                                                                </td>
                                                                                                        </tr>
                                                                                                        <tr>
-                                                                                                               <td><div class='wide right'>Street 1</div></td>
+                                                                                                               <td><div class='wide right'>&staff.patron.ue.street_1.label;</div></td>
                                                                                                                <td colspan='5'>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_street1' size='42'/>
                                                                                                                </td>
                                                                                                        </tr>
                                                                                                        <tr>
-                                                                                                               <td><div class='wide right'>Street 2</div></td>
+                                                                                                               <td><div class='wide right'>&staff.patron.ue.street_2.label;</div></td>
                                                                                                                <td colspan='5'>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_street2' size='42'/>
                                                                                                                </td>
                                                                                                        </tr>
                                                                                                        <tr>
-                                                                                                               <td><div class='wide right'>City</div></td>
+                                                                                                               <td><div class='wide right'>&staff.patron.ue.city.label;</div></td>
                                                                                                                <td colspan='3'>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_city' size='17'/>
                                                                                                                        </div>
                                                                                                                </td>
-                                                                                                               <td><div class='wide right'>County</div></td>
+                                                                                                               <td><div class='wide right'>&staff.patron.ue.county.label;</div></td>
                                                                                                                <td>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_county' size='17'/>
                                                                                                                </td>
                                                                                                        </tr>
                                                                                                        <tr>
-                                                                                                               <td><div class='wide right'>State</div></td>
+                                                                                                               <td><div class='wide right'>&staff.patron.ue.state.label;</div></td>
                                                                                                                <td colspan='3'>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_state' size='2' maxlength='2'/>
                                                                                                                        </div>
                                                                                                                </td>
                                                                                                                -->
-                                                                                                               <td><div class='wide right'>Country</div></td>
+                                                                                                               <td><div class='wide right'>&staff.patron.ue.country.label;</div></td>
                                                                                                                <td>
                                                                                                                        <div class='wide left'>
                                                                                                                                <input type='text' name='ue_addr_country' size='6'/>
                                                                                                                <td colspan='6'>
                                                                                                                        <div class='button_row'>
                                                                                                                                <input type='submit' name='ue_addr_delete' 
-                                                                                                                                       value='Delete this Address'/>
+                                                                                                                                       value='&staff.patron.ue.delete_this_address.label;'/>
                                                                                                                                <span style='padding-left: 10px;'> </span>
                                                                                                                                <input type='submit' name='ue_addr_detach' 
-                                                                                                                                       value='Detach this Address' class='hide_me'/>
+                                                                                                                                       value='&staff.patron.ue.detach_this_address.label;' class='hide_me'/>
                                                                                                                        </div>
                                                                                                                </td>
                                                                                                        </tr>
                                                                <!--
                                                                <input type='submit' value='Create a New Address' id='ue_address_new'/>
                                                                -->
-                                                               <input type='submit' value='Create a New Address' onclick='uEditCreateNewAddr();'/>
+                                                               <input type='submit' value='&staff.patron.ue.create_address.label;' onclick='uEditCreateNewAddr();'/>
                                                        </div>
                                                </div>
        
                                                        <table class='uedit_table'>
                                                                <tbody>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Profile Group</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.profile_group.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <select id='ue_profile' class='select_big'>
-                                                                                                       <option value=''> -- Required -- </option>
+                                                                                                       <option value=''>&staff.patron.ue.required.label;</option>
                                                                                                </select>
                                                                                        </div>
                                                                                </td>
                                                                        </tr>
                                                                        <tr class='required_field'>
-                                                                               <td><div class='wide right'>Account Expiration Date</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.accoutn_expire_date.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input type='text' id='ue_expire' size='10' maxlength='10'/>
                                                                                                <button style='padding: 0px;' id='ue_expire_trigger'>
                                                                                                        <img src="/opac/common/js/jscalendar/img.gif" 
                                                                                                                style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;" 
-                                                                                                               title="Date selector"
+                                                                                                               title="&ev.staff.patron.ue_xhtml.date_selector.label;"
                                                                                                                onmouseover="this.style.background='red';" 
                                                                                                                onmouseout="this.style.background=''" />
                                                                                                </button>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Internet Access Level</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.internet_access_level.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <select id='ue_net_level'>
-                                                                                                       <option value=''> -- None Selected -- </option>
+                                                                                                       <option value=''>&staff.patron.ue.none_selected.label;</option>
                                                                                                </select>
                                                                                        </div>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Active</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.active.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input id='ue_active' type='checkbox' checked='checked'/>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Barred</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.barred.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input id='ue_barred' type='checkbox'/>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Set as Family/Group Lead Account</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.set_lead_account.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input id='ue_group_lead' type='checkbox'/>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Claims Returned Count</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.claims_returned_count.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <input id='ue_claims_returned' type='text' disabled='disabled' size='6'/>
                                                                                                        $('ue_claims_returned').value = 0;
                                                                                                        $('ue_claims_returned').disabled = true;
                                                                                                </script>
-                                                                                               <input class='pad' id='ue_claims_returned_reset' type='submit' value='Reset'/>
+                                                                                               <input class='pad' id='ue_claims_returned_reset' type='submit' value='&ev.staff.patron.ue_xhtml.alert_message_reset.value;'/>
                                                                                        </div>
                                                                                </td>
                                                                        </tr>
                                                                        <tr>
-                                                                               <td><div class='wide right'>Alert Message</div></td>
+                                                                               <td><div class='wide right'>&staff.patron.ue.alert_message.label;</div></td>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <textarea wrap='soft' cols='30' rows='4' id='ue_alert_message'/>
                                                                                                <input class='pad' id='ue_alert_message_reset' 
-                                                                                                       type='submit' value='Clear
+                                                                                                       type='submit' value='&ev.staff.patron.ue_xhtml.alert_message_reset.value;
                                                                                                                onclick='
                                                                                                                var node = $("ue_alert_message");
                                                                                                                node.value = "";
                                                        <table class='uedit_table' style='width: 98%'>
                                                                <thead>
                                                                        <tr style='font-weight: bold;'>
-                                                                               <td>Stat Cat Name</td>
-                                                                               <td>Owner</td>
-                                                                               <td>Value</td>
+                                                                               <td>&staff.patron.ue.stat_cat_name.label;</td>
+                                                                               <td>&staff.patron.ue.owner.label;</td>
+                                                                               <td>&staff.patron.ue.value.label;</td>
                                                                        </tr>
                                                                </thead>
                                                                <tbody id='ue_stat_cat_tbody'>
                                                                                <td>
                                                                                        <div class='wide left'>
                                                                                                <select name='ue_stat_cat_selector'>
-                                                                                                       <option value=''> -- None Selected -- </option>
+                                                                                                       <option value=''>&staff.patron.ue.none_selected.label;</option>
                                                                                                </select>
                                                                                                <span class='pad'> or </span>
                                                                                                <input class='pad' type='text' name='ue_stat_cat_newval'/>
                                                <!-- ************************************************************** -->
                                                <div id='uedit_surveys' class='main_div hide_me'>
                                                        <div id='uedit_no_surveys' class='hide_me'>
-                                                               <b>No surveys have been created for this location.</b>
+                                                               <b>&staff.patron.ue.no_surveys_for_location.label;</b>
                                                        </div>
                                                        <table id='ue_survey_table' 
                                                                class='uedit_table data_grid' style='width: 95%; margin-top: 17px;'>
                                                                                        style='width: 60%; text-align: left; padding-left: 40px;'/>
                                                                                <td>
                                                                                        <select name='ue_survey_answer'>
-                                                                                               <option value=''> -- None Selected -- </option>
+                                                                                               <option value=''>&staff.patron.ue.none_selected.label;</option>
                                                                                        </select>
                                                                                </td>
                                                                        </tr>
                                                <div id='uedit_finalize' class='main_div hide_me'>
                                                        <div class='has_color' style='width: 95%; margin-top: 40px; text-align: center'>
                                                                <div style='padding: 5px;'>
-                                                                       You are now ready to save the user to the database.  <br/>
-                                                                       To view or print a summary of the changes, click on the "View Summary" link.  <br/>
-                                                                       To save the user, click on the 'Save User' button.
+                                                                       &staff.patron.ue.message1.label;<br/>
+                                                                       &staff.patron.ue.message2.label;<br/>
+                                                                       &staff.patron.ue.message3.label;
                                                                </div>
                                                                <br/>
                                                                <div style='margin-bottom: 15px;'>
                                                                        <a style='margin-right: 30px;' id='ue_view_summary' 
-                                                                               href='javascript:uEditShowSummary();'>View Summary</a>
+                                                                               href='javascript:uEditShowSummary();'>&staff.patron.ue.view_summary.label;</a>
                                                                </div>
                                                                <input style='margin-left: 5px; margin-right: 5px;' id='ue_save'
-                                                                       type='submit' value='Save User' onclick='uEditSaveUser();'/>
+                                                                       type='submit' value='&ev.staff.patron.ue_xhtml.save_user.value;' onclick='uEditSaveUser();'/>
                                                                <input style='margin-left: 5px; margin-right: 5px;' id='ue_save_clone'
-                                                                       type='submit' value='Save and Clone User' onclick='uEditSaveUser(true);'/>
+                                                                       type='submit' value='&ev.staff.patron.ue_xhtml.save_clone_user.value;' onclick='uEditSaveUser(true);'/>
                                                                <button style='margin-left: 5px; margin-right: 5px;' 
-                                                                       onclick='if(confirm($("ue_cancel_confirm").innerHTML)) uEditCancel();'>Cancel</button>
+                                                                       onclick='if(confirm($("ue_cancel_confirm").innerHTML)) uEditCancel();'>&ev.staff.patron.ue_xhtml.cancel.value;</button>
                                                        </div>
                                                </div>
                                        </td>
                                                                        <td width='10%'/>
                                                                        <td width='40%'>
                                                                                <a id='ue_back' class='nav_link hide_me' 
-                                                                                       href='javascript:uEditPrev()'>&lt;&lt;Back</a>
+                                                                                       href='javascript:uEditPrev()'>&lt;&lt; &staff.patron.ue.back.label;</a>
                                                                        </td>
                                                                        <td width='40%'>
                                                                                <a id='ue_fwd' class='nav_link' 
-                                                                                       href='javascript:uEditNext()'>Forward&gt;&gt;</a>
+                                                                                       href='javascript:uEditNext()'>&staff.patron.ue.forward.label; &gt;&gt;</a>
                                                                        </td>
                                                                        <td width='10%'/>
                                                                </tr>
                        <thead>
                                <tr>
                                        <td colspan='2'>
-                                               <span>User Summary Information (Deleted items are marked in</span>
-                                               <span class='deleted'>color</span><span>)</span>
+                                               <span>&staff.patron.ue.user_summary.label;</span>
                                        </td>
                                </tr>
                        </thead>
                                <tr>
 
                                        <td colspan='2' align='center'>
-                                               <input style='margin-right: 15px;' type='submit' value='Print Page' onclick='window.print();'/>
-                                               <input style='margin-left: 15px;' type='submit' value='Return to Editor
+                                               <input style='margin-right: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.print_page.label;' onclick='window.print();'/>
+                                               <input style='margin-left: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.return_to_editor.label;
                                                        onclick=' unHideMe($("main_div_container")); 
                                                                hideMe($("summary_div_container"));'/>
                                        </td>
                                </tr>
 
-                               <tr><td>Barcode</td><td id='ue_summary_barcode'/></tr>
-                               <tr><td>Username</td><td id='ue_summary_usrname'/></tr>
-                               <tr><td>First Name</td><td id='ue_summary_first_given_name'/></tr>
-                               <tr><td>Middle Name</td><td id='ue_summary_second_given_name'/></tr>
-                               <tr><td>Last Name</td><td id='ue_summary_family_name'/></tr>
-                               <tr><td>Suffix</td><td id='ue_summary_suffix'/></tr>
-                               <tr><td>Date of Birth</td><td id='ue_summary_dob'/></tr>
-                               <tr><td>Primary Identification Type</td><td id='ue_summary_ident_type'/></tr>
-                               <tr><td>Primary Identification</td><td id='ue_summary_ident_value'/></tr>
-                               <tr><td>Secondary Identification Type</td><td id='ue_summary_ident_type2'/></tr>
-                               <tr><td>Secondary Identification</td><td id='ue_summary_ident_value2'/></tr>
-                               <tr><td>Email Address</td><td id='ue_summary_email'/></tr>
-                               <tr><td>Day Phone</td><td id='ue_summary_day_phone'/></tr>
-                               <tr><td>Evening Phone</td><td id='ue_summary_evening_phone'/></tr>
-                               <tr><td>Other Phone</td><td id='ue_summary_other_phone'/></tr>
-                               <tr><td>Home Library</td><td id='ue_summary_home_ou'/></tr>
+                               <tr><td>&staff.patron.ue.barcode.label;</td><td id='ue_summary_barcode'/></tr>
+                               <tr><td>&staff.patron.ue.username.label;</td><td id='ue_summary_usrname'/></tr>
+                               <tr><td>&staff.patron.ue.first_name.label;</td><td id='ue_summary_first_given_name'/></tr>
+                               <tr><td>&staff.patron.ue.middle_name.label;</td><td id='ue_summary_second_given_name'/></tr>
+                               <tr><td>&staff.patron.ue.last_name.label;</td><td id='ue_summary_family_name'/></tr>
+                               <tr><td>&staff.patron.ue.suffix.label;</td><td id='ue_summary_suffix'/></tr>
+                               <tr><td>&staff.patron.ue.dob.label;</td><td id='ue_summary_dob'/></tr>
+                               <tr><td>&staff.patron.ue.primary_id_type.label;</td><td id='ue_summary_ident_type'/></tr>
+                               <tr><td>&staff.patron.ue.primary_id.label;</td><td id='ue_summary_ident_value'/></tr>
+                               <tr><td>&staff.patron.ue.secondary_id_type.label;</td><td id='ue_summary_ident_type2'/></tr>
+                               <tr><td>&staff.patron.ue.primary_id.label;</td><td id='ue_summary_ident_value2'/></tr>
+                               <tr><td>&staff.patron.ue.email_address.label;</td><td id='ue_summary_email'/></tr>
+                               <tr><td>&staff.patron.ue.day_phone.label;</td><td id='ue_summary_day_phone'/></tr>
+                               <tr><td>&staff.patron.ue.evening_phone.label;</td><td id='ue_summary_evening_phone'/></tr>
+                               <tr><td>&staff.patron.ue.other_phone.label;</td><td id='ue_summary_other_phone'/></tr>
+                               <tr><td>&staff.patron.ue.home_library.label;</td><td id='ue_summary_home_ou'/></tr>
 
                                <tr>
                                        <td colspan='2'>
                                                <table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
-                                                       <thead><tr><td>Addresses</td></tr></thead>
+                                                       <thead><tr><td>&staff.patron.ue.addresses.label;</td></tr></thead>
                                                        <tbody name='ue_summary_addr_tbody'>
                                                                <tr name='ue_summary_addr_row'>
                                                                        <td>
                                                                                        <thead><tr><td colspan='4'/><span> </span></tr></thead>
                                                                                        <tbody>
                                                                                                <tr>
-                                                                                                       <td><b>Address Label</b></td><td name='label'/>
-                                                                                                       <td><b>Zip Code</b></td><td name='zip'/>
+                                                                                                       <td><b>&staff.patron.ue.address_label.label;</b></td><td name='label'/>
+                                                                                                       <td><b>&staff.patron.ue.zip_code.label;</b></td><td name='zip'/>
                                                                                                </tr>
                                                                                                <tr>
-                                                                                                       <td><b>Street1</b></td><td name='street1'/>
-                                                                                                       <td><b>Country</b></td><td name='country'/>
+                                                                                                       <td><b>&staff.patron.ue.street1.label;</b></td><td name='street1'/>
+                                                                                                       <td><b>&staff.patron.ue.country.label;</b></td><td name='country'/>
                                                                                                </tr>
                                                                                                <tr>
-                                                                                                       <td><b>Street2</b></td><td name='street2'/>
-                                                                                                       <td><b>Mailing</b></td><td name='mailing'/>
+                                                                                                       <td><b>&staff.patron.ue.street2.label;</b></td><td name='street2'/>
+                                                                                                       <td><b>&staff.patron.ue.mailing_address.label;</b></td><td name='mailing'/>
                                                                                                </tr>
                                                                                                <tr>
-                                                                                                       <td><b>City</b></td><td name='city'/>
-                                                                                                       <td><b>Billing</b></td><td name='billing'/>
+                                                                                                       <td><b>&staff.patron.ue.city.label;</b></td><td name='city'/>
+                                                                                                       <td><b>&staff.patron.ue.billing_address.label;</b></td><td name='billing'/>
                                                                                                </tr>
                                                                                                <tr>
-                                                                                                       <td><b>County</b></td><td name='county'/>
-                                                                                                       <td><b>Valid</b></td><td name='valid'/>
+                                                                                                       <td><b>&staff.patron.ue.county.label;</b></td><td name='county'/>
+                                                                                                       <td><b>&staff.patron.ue.valid.label;</b></td><td name='valid'/>
                                                                                                </tr>
                                                                                                <tr>
-                                                                                                       <td><b>State</b></td><td name='state'/>
-                                                                                                       <td><b>Within City Limits</b></td><td name='incorporated'/>
+                                                                                                       <td><b>&staff.patron.ue.state.label;</b></td><td name='state'/>
+                                                                                                       <td><b>&staff.patron.ue.in_city_limits.label;</b></td><td name='incorporated'/>
                                                                                                </tr>
                                                                                        </tbody>
                                                                                </table>
                                                </table>
                                        </td>
                                </tr>
-                               <tr><td>Profile</td><td id='ue_summary_profile'/></tr>
-                               <tr><td>Active</td><td id='ue_summary_active'/></tr>
-                               <tr><td>Barred</td><td id='ue_summary_barred'/></tr>
-                               <tr><td>Expire Date</td><td id='ue_summary_expire_date'/></tr>
-                               <tr><td>Family Lead Account</td><td id='ue_summary_master_account'/></tr>
-                               <tr><td>Claims Returned Count</td><td id='ue_summary_claims_returned_count'/></tr>
-                               <tr><td>Alert Message</td><td id='ue_summary_alert_message'/></tr>
+                               <tr><td>&staff.patron.ue.profile.label;</td><td id='ue_summary_profile'/></tr>
+                               <tr><td>&staff.patron.ue.active.label;</td><td id='ue_summary_active'/></tr>
+                               <tr><td>&staff.patron.ue.barred.label;</td><td id='ue_summary_barred'/></tr>
+                               <tr><td>&staff.patron.ue.expire_date.label;</td><td id='ue_summary_expire_date'/></tr>
+                               <tr><td>&staff.patron.ue.family_lead_account.label;</td><td id='ue_summary_master_account'/></tr>
+                               <tr><td>&staff.patron.ue.claims_returned_count.label;</td><td id='ue_summary_claims_returned_count'/></tr>
+                               <tr><td>&staff.patron.ue.alert_message.label;</td><td id='ue_summary_alert_message'/></tr>
                                <tr name='ue_summary_stat_cat_td'>
                                        <td colspan='2' >
                                                <table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
-                                                       <thead><tr><td colspan='2'>Statistical Categories</td></tr></thead>
+                                                       <thead><tr><td colspan='2'>&staff.patron.ue.stat_categories.label;</td></tr></thead>
                                                        <tbody name='ue_summary_stats_tbody'>
                                                                <tr name='ue_summary_stats_row'>
                                                                        <td name='ue_summary_stat_name'/><td name='ue_summary_stat_value'/>
                                <tr name='ue_summary_survey_td'>
                                        <td colspan='2'>
                                                <table width='100%' style='margin-top: 15px; margin-bottom: 15px;'>
-                                                       <thead><tr><td>Survey</td><td>Question</td><td>Answer</td></tr></thead>
+                                                       <thead><tr>
+                                                               <td>&staff.patron.ue.survey.label;</td>
+                                                               <td>&staff.patron.ue.question.label;</td>
+                                                               <td>&staff.patron.ue.answer.label;</td>
+                                                       </tr></thead>
                                                        <tbody name='ue_summary_survey_tbody'>
                                                                <tr name='ue_summary_survey_row'>
                                                                        <td name='ue_summary_survey_name'/>
                                </tr>
                                <tr>
                                        <td colspan='2' align='center'>
-                                               <input style='margin-right: 15px;' type='submit' value='Print Page' onclick='window.print();'/>
-                                               <input style='margin-left: 15px;' type='submit' value='Return to Editor
+                                               <input style='margin-right: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.print_page.label;' onclick='window.print();'/>
+                                               <input style='margin-left: 15px;' type='submit' value='&ev.staff.patron.ue_xhtml.return_to_editor.label;
                                                        onclick=' unHideMe($("main_div_container")); 
                                                                hideMe($("summary_div_container"));'/>
                                        </td>
        <!-- This holds all of the strings we may have to alert to the user -->
        <!-- ************************************************************** -->
        <div class='hide_me'>
-               <span id='ue_bad_dob'>The date of birth field is not formatted correctly.  We're expecting YYYY-MM-DD</span>
-               <span id='ue_bad_username'>Username is invalid</span>
-               <span id='ue_bad_password'>Passwords do not match or are invalid</span>
-               <span id='ue_bad_firstname'>First name is invalid</span>
-               <span id='ue_bad_middlename'>Middle name is invalid</span>
-               <span id='ue_bad_lastname'>Last name is invalid</span>
-               <span id='ue_bad_barcode'>Barcode is invalid</span>
-               <span id='ue_duplicate_barcode'>The selected barcode already exists in the database</span>
-               <span id='ue_new_barcode_warn'>
-                       This will de-activate the existing barcode for this user!  If you wish to continue, 
-                       enter the new barcode below.  Otherwise, click the Cancel button.
-               </span>
-               <span id='ue_no_ident'>You must select at least one type of identification</span>
-               <span id='ue_bad_ident_dl'>Invalid drivers license. Should be STATE-NUMBER</span>
-               <span id='ue_bad_ident_ssn'>Invalid social security number.  Format should be 111-22-3333</span>
-               <span id='ue_bad_email'>The email addresses is not valid</span>
-               <span id='ue_bad_phone'>An invalid phone number was entered</span>
-               <span id='ue_no_profile'>A profile group must be selected</span>
-               <span id='ue_bad_expire'>The user expiration date is invalid.  We're expecting YYYY-MM-DD</span>
-               <span id='ue_bad_claims_returned'>The claims returned count is invalid</span>
-               <span id='ue_unknown_error'>An unknown formatting error occurred</span>
-               <span id='ue_bad_addr_label'>Address label is invalid</span>
-               <span id='ue_bad_addr_street'>Address street is invalid</span>
-               <span id='ue_bad_addr_city'>Address city is invalid</span>
-               <span id='ue_bad_addr_county'>Address county is invalid</span>
-               <span id='ue_bad_addr_state'>Address state is invalid</span>
-               <span id='ue_bad_addr_country'>Address country is invalid</span>
-               <span id='ue_bad_addr_zip'>Address zip is invalid</span>
-               <span id='ue_bad_survey'>Required survey is unanswered</span>
-               <span id='ue_delete_addr_warn'>
-                       This will remove this address from the user.  
-                       Are you sure you wish to continue?
-               </span>
-               <span id='yes'>Yes</span>
-               <span id='no'>No</span>
-               <span id='ue_summary_window'>Patron Summary</span>
-               <span id='ue_success'>User update succeeded</span>
-               <span id='ue_dup_ident1'>
-                       A user already exists with the primary identification provided.  
-                       Do you wish to view the duplicate record now?
-               </span>
-               <span id='ue_dup_username'>
-                       The selected username is in use by another user.  
-                       Please choose a different username.
-               </span>
-               <span id='ue_dup_barcode'>
-                       The selected barcode is in use by another user.  
-                       Please choose a different barcode.
-               </span>
-               <span class='hide_me' id='ue_cancel_confirm'>
-                       Are you sure you wish to cancel this editing session?
-                       Canceling will destroy any unsaved changes you have made thus far to the user.
-               </span>
-               <span class='hide_me' id='ue_juv_guardian'>
-                       This patron is under 18 years of age.  Please enter the name 
-                       of the parent or guardian for this patron.
-               </span>
-               <span class='hide_me' id='ue_bad_date'>
-                       The date provided is either in the future or invalid.  We're expecting YYYY-MM-DD
-               </span>
-               <span class='hide_me' id='ue_made_barred'>
-                       Please add a note to the patron's alert message explaining why the patron is barred.
-               </span>
+               <span id='ue_bad_dob'>&staff.patron.ue.bad_dob.label;</span>
+               <span id='ue_bad_username'>&staff.patron.ue.bad_username.label;</span>
+               <span id='ue_bad_password'>&staff.patron.ue.bad_passwords.label;</span>
+               <span id='ue_bad_firstname'>&staff.patron.ue.bad_firstname.label;</span>
+               <span id='ue_bad_middlename'>&staff.patron.ue.bad_middlename.label;</span>
+               <span id='ue_bad_lastname'>&staff.patron.ue.bad_lastname.label;</span>
+               <span id='ue_bad_barcode'>&staff.patron.ue.bad_barcode.label;</span>
+               <span id='ue_duplicate_barcode'>&staff.patron.ue.duplicate_barcode.label;</span>
+               <span id='ue_new_barcode_warn'>&staff.patron.ue.new_barcode_warn.label;</span>
+               <span id='ue_no_ident'>&staff.patron.ue.no_ident.label;</span>
+               <span id='ue_bad_ident_dl'>&staff.patron.ue.bad_ident_dl.label;</span>
+               <span id='ue_bad_ident_ssn'>&staff.patron.ue.bad_ident_ssn.label;</span>
+               <span id='ue_bad_email'>&staff.patron.ue.bad_email.label;</span>
+               <span id='ue_bad_phone'>&staff.patron.ue.bad_phone.label;</span>
+               <span id='ue_no_profile'>&staff.patron.ue.no_profile.label;</span>
+               <span id='ue_bad_expire'>&staff.patron.ue.bad_expire.label;</span>
+               <span id='ue_bad_claims_returned'>&staff.patron.ue.bad_claims_returned.label;</span>
+               <span id='ue_unknown_error'>&staff.patron.ue.unknown_error.label;</span>
+               <span id='ue_bad_addr_label'>&staff.patron.ue.bad_addr_label.label;</span>
+               <span id='ue_bad_addr_street'>&staff.patron.ue.bad_addr_street.label;</span>
+               <span id='ue_bad_addr_city'>&staff.patron.ue.bad_addr_city.label;</span>
+               <span id='ue_bad_addr_county'>&staff.patron.ue.bad_addr_county.label;</span>
+               <span id='ue_bad_addr_state'>&staff.patron.ue.bad_addr_state.label;</span>
+               <span id='ue_bad_addr_country'>&staff.patron.ue.bad_addr_country.label;</span>
+               <span id='ue_bad_addr_zip'>&staff.patron.ue.bad_addr_zip.label;</span>
+               <span id='ue_bad_survey'>&staff.patron.ue.bad_survey.label;</span>
+               <span id='ue_delete_addr_warn'>&staff.patron.ue.delete_addr_warn.label;</span>
+               <span id='yes'>&staff.patron.ue.yes.label;</span>
+               <span id='no'>&staff.patron.ue.no.label;</span>
+               <span id='ue_summary_window'>&staff.patron.ue.summary_window.label;</span>
+               <span id='ue_success'>&staff.patron.ue.success.label;</span>
+               <span id='ue_dup_ident1'>&staff.patron.ue.dup_ident1.label;</span>
+               <span id='ue_dup_username'>&staff.patron.ue.dup_username.label;</span>
+               <span id='ue_dup_barcode'>&staff.patron.ue.dup_barcode.label;</span>
+               <span class='hide_me' id='ue_cancel_confirm'>&staff.patron.ue.cancel_confirm.label;</span>
+               <span class='hide_me' id='ue_juv_guardian'>&staff.patron.ue.juv_guardian.label;</span>
+               <span class='hide_me' id='ue_bad_date'>&staff.patron.ue.bad_date.label;</span>
+               <span class='hide_me' id='ue_made_barred'>&staff.patron.ue.made_barred.label;</span>
 
        </div>
 
index cff0a78..f73e9fd 100644 (file)
@@ -9,7 +9,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
         <head>
-                <title>Evergreen: User Editor</title>
+                <title>&staff.patron.user_edit.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>
                                <td class="value"><input type="text" name="user.card.barcode" id="user.card.barcode" disabled="true"/></td>
                        </tr>
                        <tr>
-                               <td class="label">First Name:</td>
+                               <td class="label">&staff.patron.user_edit.firstname.label;</td>
                                <td class="value"><input disabled="true" type="text" name="user.first_given_name" id="user.first_given_name"/></td>
-                               <td class="label">Middle Name:</td>
+                               <td class="label">&staff.patron.user_edit.middlename.label;</td>
                                <td class="value"><input disabled="true" type="text" name="user.second_given_name" id="user.second_given_name"/></td>
-                               <td class="label">Last Name:</td>
+                               <td class="label">&staff.patron.user_edit.lastname.label;</td>
                                <td class="value"><input disabled="true" type="text" name="user.family_name" id="user.family_name"/></td>
                        </tr>
                        <tr class='advanced hideme'>
@@ -91,7 +91,7 @@
                                                <thead>
                                                        <tr>
                                                                <th></th>
-                                                               <th>Working Location</th>
+                                                               <th>&staff.patron.user_edit.working_location.label;</th>
                                                        </tr>
                                                </thead>
                                                <tbody id="work_ous" name="work_ous"/>
                                        <table width="100%">
                                                <thead>
                                                        <tr>
-                                                               <th>Permission</th>
-                                                               <th>Applied</th>
-                                                               <th>Depth</th>
-                                                               <th>Grantable</th>
+                                                               <th>&staff.patron.user_edit.permission.label;</th>
+                                                               <th>&staff.patron.user_edit.applied.label;</th>
+                                                               <th>&staff.patron.user_edit.depth.label;</th>
+                                                               <th>&staff.patron.user_edit.grantable.label;</th>
                                                        </tr>
                                                </thead>
                                                <tbody id="permissions" name="permissions"/>
 
                </table>
 
-               <button onclick="save_user(); return false;">Save</button>
+               <button onclick="save_user(); return false;">&staff.patron.user_edit.save.label;</button>
                </form>
 
 
index 784effc..d1634a3 100644 (file)
@@ -62,8 +62,6 @@ def parse_entities():
     prefix = os.path.commonprefix(dtd_files)
 
     for d_file in dtd_files:
-               if DEBUG:
-                       print "Checking %s\n" % (d_file)
 
         # Get the shortest unique address for this file
         short_df = d_file[len(prefix):]
@@ -105,7 +103,7 @@ def parse_entities():
                 continue
 
             for entry in entities[entity_key]:
-                if ['file'] == short_df:
+                if entry['file'] == short_df:
                     print("%s:%d: Duplicate key '%s' in line [%s]" % (short_df, line_num, entity_key, line[0:-1]))
                     continue