From e429ee811b70365f7bad2a68bdf39217d30f521d Mon Sep 17 00:00:00 2001
From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 10 Nov 2008 04:09:27 +0000
Subject: [PATCH] Backport r11111 from trunk: Fix broken or missing entities
 discovered by updated check_entities.py script

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4@11113 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/opac/locale/en-US/lang.dtd            | 24 +++++++++++++++-------
 .../server/admin/org_unit_settings.xhtml           | 14 ++++++-------
 Open-ILS/xul/staff_client/server/patron/ue.xhtml   | 14 ++++++-------
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 37f7d5d57f..ed087f1a99 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -1224,6 +1224,12 @@
 <!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.server.admin.org_unit_settings.title "Organization Unit Settings">
+<!ENTITY staff.server.admin.org_unit_settings.context "Context Location">
+<!ENTITY staff.server.admin.org_unit_settings.uninherited " * Indicates the setting is not inherited from the parent at run time">
+<!ENTITY staff.server.admin.org_unit_settings.edit_setting "Edit Setting">
+<!ENTITY staff.server.admin.org_unit_settings.delete_setting "Delete Setting">
+<!ENTITY staff.server.admin.org_unit_settings.update_setting "Update Setting">
 <!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">
@@ -1384,7 +1390,7 @@
 <!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.hold_pull.barcode "Item Barcode">
+<!ENTITY staff.server.admin.hold_pull.item_barcode "Item Barcode">
 <!ENTITY staff.server.admin.hold_pull.copy "Copy Number">
 <!ENTITY staff.server.admin.hold_pull.format "Format">
 <!ENTITY staff.server.admin.hold_pull.patron_barcode "Patron Barcode">
@@ -1474,18 +1480,15 @@
 <!ENTITY staff.server.admin.org_settings.global.default_locale "Default Locale">
 <!ENTITY staff.server.admin.org_settings.circ.void_overdue_on_lost "Void overdue fines when items are marked lost">
 <!ENTITY staff.server.admin.org_settings.circ.hold_stalling.soft 'Soft hold stalling interval'>
-<!ENTITY staff.server.admin.org_settings.circ.hold_stalling.soft.desc 
-    'How long to wait before allowing remote items to be opportunisticaly captured for a hold.  Example "5 days"'>
+<!ENTITY staff.server.admin.org_settings.circ.hold_stalling.soft.desc 'How long to wait before allowing remote items to be opportunisticaly captured for a hold.  Example "5 days"'>
 <!ENTITY staff.server.admin.org_settings.circ.hold_boundary.hard "Hard hold boundary">
 <!ENTITY staff.server.admin.org_settings.circ.hold_boundary.soft "Soft hold boundary">
 <!ENTITY staff.server.admin.org_settings.opac.barcode_regex "Patron barcode format">
 <!ENTITY staff.server.admin.org_settings.opac.barcode_regex.desc 'Regular expression defining the patron barcode format'>
 <!ENTITY staff.server.admin.org_settings.circ.item_checkout_history.max "Maximum previous checkouts displayed">
-<!ENTITY staff.server.admin.org_settings.circ.item_checkout_history.max.desc 
-    "This is maximum number of previous circulations the staff client will display when investigating item details">
+<!ENTITY staff.server.admin.org_settings.circ.item_checkout_history.max.desc "This is maximum number of previous circulations the staff client will display when investigating item details">
 <!ENTITY staff.server.admin.org_settings.circ.reshelving_complete.interval "Change reshelving status interval">
-<!ENTITY staff.server.admin.org_settings.circ.reshelving_complete.interval.desc 
-    'Amount of time to wait before changing an item from "reshelving" status to "available".  Examples "1 day", "6 hours"'>
+<!ENTITY staff.server.admin.org_settings.circ.reshelving_complete.interval.desc 'Amount of time to wait before changing an item from "reshelving" status to "available".  Examples "1 day", "6 hours"'>
 
 
 
@@ -2501,12 +2504,14 @@
 <!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.phone_example "Example: 123-456-7890 or 123-456-7890 ex123">
 <!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.county.label "County">
 <!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">
@@ -2520,6 +2525,11 @@
 <!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">
+<!ENTITY ev.staff.patron.ue_xhtml.ue_addr_delete.label "Delete this Address">
+<!ENTITY ev.staff.patron.ue_xhtml.ue_addr_detach.label "Detach this Address">
+<!ENTITY ev.staff.patron.ue_xhtml.primary_ident_ssn_help.label "(XXX-YY-ZZZZ)">
+<!ENTITY ev.staff.patron.ue_xhtml.primary_ident_dl_help.label "(GA-123456789)">
+<!ENTITY ev.staff.patron.ue_xhtml.edit.label "Edit">
 <!-- 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">
diff --git a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
index acbb88581a..cbae0fb039 100644
--- a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
@@ -21,7 +21,7 @@
 
 <html xmlns='http://www.w3.org/1999/xhtml'>
     <head>
-        <title>Org Unit Settings</title>
+        <title>&staff.server.admin.org_unit_settings.title;</title>
         <link type='text/css' rel='stylesheet' href='admin.css'/>
         <script type="text/javascript" djConfig="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/dojo.js"></script>
         <script type="text/javascript" src='org_unit_settings.js'></script>
@@ -99,14 +99,14 @@
     <body class="tundra tall">
         <div dojoType="dijit.layout.LayoutContainer" orientation="vertical" class="tall">
             <div dojoType="dijit.layout.ContentPane" layoutAlign='top'>
-                <h1>Org Unit Settings</h1><br/>
-                <span>Context Location</span>
+                <h1>&staff.server.admin.org_unit_settings.title;</h1><br/>
+                <span>&staff.server.admin.org_unit_settings.context;</span>
                 <span>
                     <select dojoType="openils.widget.OrgUnitFilteringSelect" jsId='osContextSelector'
                         searchAttr="shortname" autocomplete="true" labelAttr='shortname' onchange='osChangeContext();'> 
                     </select>
                 </span>
-                <span> * Indicates the setting is not inherited from the parent at run time</span>
+                <span>&staff.server.admin.org_unit_settings.uninherited;</span>
             </div>
             <div dojoType="dijit.layout.ContentPane" layoutAlign='client' class='tall'>
                 <script>
@@ -126,7 +126,7 @@
         </div>
 
         <!-- edit dialog -->
-        <div dojoType="dijit.Dialog" jsId='osEditDialog' title="Edit Setting">
+        <div dojoType="dijit.Dialog" jsId='osEditDialog' title="&staff.server.admin.org_unit_settings.edit_setting;">
             <table class='form_table'>
                 <thead>
                     <tr><td colspan='2' align='center'><div id='os-edit-name'/></td></tr>
@@ -155,10 +155,10 @@
                     </tr>
                     <tr>
                         <td> 
-                            <button dojoType='dijit.form.Button' onclick='osEditSetting(true);'>Delete Setting</button>
+                            <button dojoType='dijit.form.Button' onclick='osEditSetting(true);'>&staff.server.admin.org_unit_settings.delete_setting;</button>
                         </td>
                         <td> 
-                            <button dojoType='dijit.form.Button' onclick='osEditSetting();'>Update Setting</button>
+                            <button dojoType='dijit.form.Button' onclick='osEditSetting();'>&staff.server.admin.org_unit_settings.update_setting;</button>
                         </td>
                     </tr>
                 </tbody>
diff --git a/Open-ILS/xul/staff_client/server/patron/ue.xhtml b/Open-ILS/xul/staff_client/server/patron/ue.xhtml
index 01ede09574..9c51906bd7 100644
--- a/Open-ILS/xul/staff_client/server/patron/ue.xhtml
+++ b/Open-ILS/xul/staff_client/server/patron/ue.xhtml
@@ -341,11 +341,11 @@
 												<input type='text' id='ue_primary_ident'/>
 												<span id='primary_ident_ssn_help' 
 													style='padding-left: 2px; font-size: 8pt;' class='hide_me'>
-													(XXX-YY-ZZZZ)
+													&ev.staff.patron.ue_xhtml.primary_ident_ssn_help.label;
 												</span>
 												<span id='primary_ident_dl_help' 
 													style='padding-left: 2px; font-size: 8pt;' class='hide_me'>
-													(GA-123456789)
+													&ev.staff.patron.ue_xhtml.primary_ident_dl_help.label;	
 												</span>
 											</div>
 										</td>
@@ -399,7 +399,7 @@
 										<td>
 											<div class='wide left'>
 												<input class='pad' type='text' id='ue_day_phone' size='18'/>
-												<span style='font-size: 9pt;'> Example: 123-456-7890 or 123-456-7890 ex123</span>
+												<span style='font-size: 9pt;'>&ev.staff.patron.ue_xhtml.phone_example;</span>
 											</div>
 										</td>
 									</tr>
@@ -457,7 +457,7 @@
 																&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>)
+																	(<a name='addr_owner' href='javascript:void(0);'>&ev.staff.patron.ue_xhtml.edit.label;</a>)
 																</span>
 															</div>
 														</td>
@@ -532,10 +532,10 @@
 														<td colspan='6'>
 															<div class='button_row'>
 																<input type='submit' name='ue_addr_delete' 
-																	value='Delete this Address'/>
+																	value='&ev.staff.patron.ue_xhtml.ue_addr_delete.label;'/>
 																<span style='padding-left: 10px;'> </span>
 																<input type='submit' name='ue_addr_detach' 
-																	value='Detach this Address' class='hide_me'/>
+																	value='&ev.staff.patron.ue_xhtml.ue_addr_detach.label;' class='hide_me'/>
 															</div>
 														</td>
 													</tr>
@@ -833,7 +833,7 @@
 				<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.daytime_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>
-- 
2.11.0