From a388ce4f361887ae8a7252f7eda23379886fef6f Mon Sep 17 00:00:00 2001
From: Jane Sandberg <sandbej@linnbenton.edu>
Date: Tue, 20 Aug 2019 14:27:31 -0700
Subject: [PATCH] LP1816475: Change "Pickup Library" terminology to
 "Reservation Location"

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 .../src/app/staff/booking/create-reservation-dialog.component.html   | 5 +++--
 .../src/eg2/src/app/staff/booking/manage-reservations.component.html | 2 +-
 .../src/eg2/src/app/staff/booking/reservations-grid.component.html   | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html
index 243e4bf739..f5beb368f1 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html
@@ -41,17 +41,18 @@
     </div>
     <div class="form-group row">
       <label class="col-lg-4 text-right font-weight-bold"
-        i18n for="create-pickup-library">Pickup library</label>
+        i18n for="create-pickup-library">Reservation location</label>
       <eg-org-select domId="create-pickup-library" [applyDefault]="true"
         [disableOrgs]="disableOrgs()" [hideOrgs]="disableOrgs()"
         (onChange)="handlePickupLibChange($event)">
       </eg-org-select>
+      <eg-help-popover helpText="The library where the resource is picked up or used" i18n-helpText></eg-help-popover>
     </div>
     <div *ngIf="pickupLibraryUsesDifferentTz"
       role="alert"
       class="alert alert-info">
       <span class="material-icons" aria-hidden="true">access_time</span>
-      <span i18n>Pickup Library is in the {{timezone}} timezone</span>
+      <span i18n>Reservation location is in the {{timezone}} timezone</span>
     </div>
     <div class="form-group row">
       <label class="col-lg-4 text-right font-weight-bold"
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html b/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html
index b625672a1b..8fb6071fb5 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html
@@ -4,7 +4,7 @@
 
 <form [formGroup]="filters" class="row">
   <div class="col-sm-3">
-    <eg-org-family-select [hideAncestorSelector]="true" labelText="Pickup library" i18n-labelText formControlName="pickupLibraries">
+    <eg-org-family-select [hideAncestorSelector]="true" labelText="Reservation location" i18n-labelText formControlName="pickupLibraries">
     </eg-org-family-select>
   </div>
   <div class="col-sm-6 offset-sm-3">
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.html b/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.html
index ab8d923668..378e15bf41 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.html
@@ -37,8 +37,8 @@
   <eg-grid-column i18n-label label="Resource Type" path="target_resource_type.name"></eg-grid-column>
   <eg-grid-column label="Reservation length" i18n-label  path="length"></eg-grid-column>
   <eg-grid-column label="Request library" i18n-label  path="request_lib.name"></eg-grid-column>
-  <eg-grid-column label="Pickup library" i18n-label path="pickup_lib.name"></eg-grid-column>
-  <eg-grid-column label="Pickup library timezone" i18n-label path="timezone"></eg-grid-column>
+  <eg-grid-column label="Reservation location" i18n-label path="pickup_lib.name"></eg-grid-column>
+  <eg-grid-column label="Reservation location timezone" i18n-label path="timezone"></eg-grid-column>
 
 </eg-grid>
 
-- 
2.11.0