From 2fdc45063d866ea5c66f05ed844ae84eb7ae7595 Mon Sep 17 00:00:00 2001
From: Aleksey Lazar <aleksey.lazar@gmail.com>
Date: Fri, 20 Feb 2015 14:57:52 -0500
Subject: [PATCH] LP#1068646: Relabel addresses as Billing instead of Physical

The patron summary uses different terminology than the patron editor
form, specifically relating to types of addresses. This commit changes
all instances of "Physical Address" to "Billing Address", since those
terms always mean the same thing in Evergreen.

Signed-off-by: Remington Steed <rjs7@calvin.edu>
---
 Open-ILS/examples/fm_IDL.xml              |  2 +-
 Open-ILS/web/opac/locale/en-US/conify.dtd |  2 +-
 Open-ILS/web/opac/locale/en-US/lang.dtd   | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 41177320a0..b95d7786af 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -3098,7 +3098,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<field reporter:label="Active" name="active" reporter:datatype="bool"/>
 			<field reporter:label="Alert Message" name="alert_message"  reporter:datatype="text"/>
 			<field reporter:label="Barred" name="barred" reporter:datatype="bool"/>
-			<field reporter:label="Physical Address" name="billing_address" reporter:datatype="link"/>
+			<field reporter:label="Billing Address" name="billing_address" reporter:datatype="link"/>
 			<field reporter:label="Current Library Card" name="card" reporter:datatype="link"/>
 			<field reporter:label="Claims-returned Count" name="claims_returned_count" reporter:datatype="int" />
 			<field reporter:label="Claims Never Checked Out Count" name="claims_never_checked_out_count" reporter:datatype="int" />
diff --git a/Open-ILS/web/opac/locale/en-US/conify.dtd b/Open-ILS/web/opac/locale/en-US/conify.dtd
index c0cf5a7992..6b88ef42d0 100644
--- a/Open-ILS/web/opac/locale/en-US/conify.dtd
+++ b/Open-ILS/web/opac/locale/en-US/conify.dtd
@@ -47,7 +47,7 @@
 <!ENTITY conify.org_unit.hoo_pane.sunday "Sunday">
 <!-- Addresses --> 
 <!ENTITY conify.org_unit.addresses_pane.title "Addresses">
-<!ENTITY conify.org_unit.addresses_pane.physical.title "Physical Address">
+<!ENTITY conify.org_unit.addresses_pane.physical.title "Billing Address">
 <!ENTITY conify.org_unit.addresses_pane.holds.title "Holds Address">
 <!ENTITY conify.org_unit.addresses_pane.mailing.title "Mailing Address">
 <!ENTITY conify.org_unit.addresses_pane.ill.title "ILL Address">
diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 2da48ef065..a5f3f3e1a1 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -1568,12 +1568,12 @@
 <!ENTITY staff.patron_display.radio.physical_address.accesskey ''>
 <!ENTITY staff.patron_display.name.label 'Patron Name'>
 <!ENTITY staff.patron_display.other_phone.label 'Other Phone:'>
-<!ENTITY staff.patron_display.physical.city.label 'Physical City:'>
-<!ENTITY staff.patron_display.physical.post_code.label 'Physical ZIP:'>
-<!ENTITY staff.patron_display.physical.state.label 'Physical State:'>
-<!ENTITY staff.patron_display.physical.street1.label 'Physical Address 1:'>
-<!ENTITY staff.patron_display.physical.street2.label 'Physical Address 2:'>
-<!ENTITY staff.patron_display.physical_address 'Physical Address'>
+<!ENTITY staff.patron_display.physical.city.label 'Billing City:'>
+<!ENTITY staff.patron_display.physical.post_code.label 'Billing ZIP:'>
+<!ENTITY staff.patron_display.physical.state.label 'Billing State:'>
+<!ENTITY staff.patron_display.physical.street1.label 'Billing Address 1:'>
+<!ENTITY staff.patron_display.physical.street2.label 'Billing Address 2:'>
+<!ENTITY staff.patron_display.physical_address 'Billing Address'>
 <!ENTITY staff.patron_display.profile.label 'Profile:'>
 <!ENTITY staff.patron_display.second_given_name.label 'Middle Name:'>
 <!ENTITY staff.patron_display.standing.label 'Standing:'>
@@ -3596,7 +3596,7 @@
 <!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.physical_address.label "Billing 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">
-- 
2.11.0