LP#1612752 - s/abort/cancel/ in user interfaces.

Replacing the technical term "abort" with the more
end-user-understandable "cancel". In client-visible
language.  The underlying code has retained "abort".

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/Open-ILS/src/extras/ils_events.xml b/Open-ILS/src/extras/ils_events.xml
index 1a17505..fcc2f50 100644 (file)
--- a/Open-ILS/src/extras/ils_events.xml
+++ b/Open-ILS/src/extras/ils_events.xml
@@ -130,7 +130,7 @@
                <desc xml:lang="en-US">The patron's account has expired</desc>
        </event>
        <event code='1225' textcode='TRANSIT_ABORT_NOT_ALLOWED'>
-               <desc xml:lang="en-US">The transit on this item may not be aborted due to the state the item is in</desc>
+               <desc xml:lang="en-US">The transit on this item may not be canceled due to the state the item is in</desc>
        </event>
 
        <event code='1226' textcode='REFUND_EXCEEDS_DESK_PAYMENTS'>

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 9e0517f..2ec447a 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -714,9 +714,9 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
  ( 105, 'COPY_STATUS_MISSING.override', oils_i18n_gettext( 105, 
     'Allow a user to change the missing status on a copy', 'ppl', 'description' )),
  ( 106, 'ABORT_TRANSIT', oils_i18n_gettext( 106, 
-    'Allow a user to abort a copy transit if the user is at the transit destination or source', 'ppl', 'description' )),
+    'Allow a user to cancel a copy transit if the user is at the transit destination or source', 'ppl', 'description' )),
  ( 107, 'ABORT_REMOTE_TRANSIT', oils_i18n_gettext( 107, 
-    'Allow a user to abort a copy transit if the user is not at the transit source or dest', 'ppl', 'description' )),
+    'Allow a user to cancel a copy transit if the user is not at the transit source or dest', 'ppl', 'description' )),
  ( 108, 'VIEW_ZIP_DATA', oils_i18n_gettext( 108, 
     'Allow a user to query the ZIP code data method', 'ppl', 'description' )),
  ( 109, 'CANCEL_HOLDS', oils_i18n_gettext( 109, 
@@ -1512,9 +1512,9 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
  ( 506, 'VIEW_USER_SETTING_TYPE', oils_i18n_gettext(506,
     'Allows viewing of configurable user setting types.', 'ppl', 'description')),
  ( 507, 'ABORT_TRANSIT_ON_LOST', oils_i18n_gettext(507,
-    'Allows a user to abort a transit on a copy with status of LOST', 'ppl', 'description')),
+    'Allows a user to cancel a transit on a copy with status of LOST', 'ppl', 'description')),
  ( 508, 'ABORT_TRANSIT_ON_MISSING', oils_i18n_gettext(508,
-    'Allows a user to abort a transit on a copy with status of MISSING', 'ppl', 'description')),
+    'Allows a user to cancel a transit on a copy with status of MISSING', 'ppl', 'description')),
  ( 509, 'TRANSIT_CHECKIN_INTERVAL_BLOCK.override', oils_i18n_gettext(509,
     'Allows a user to override the TRANSIT_CHECKIN_INTERVAL_BLOCK event', 'ppl', 'description')),
  ( 510, 'UPDATE_PATRON_COLLECTIONS_EXEMPT', oils_i18n_gettext(510,

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX-create-transit-cancel-time-column.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX-create-transit-cancel-time-column.sql
index e5cb0b1..a2709f6 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX-create-transit-cancel-time-column.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX-create-transit-cancel-time-column.sql
@@ -5,4 +5,10 @@ SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
 ALTER TABLE action.transit_copy
        ADD COLUMN cancel_time TIMESTAMPTZ;
 
+-- change "abort" to "cancel" in perm descriptions
+UPDATE permission.perm_list SET description = 'Allow a user to cancel a copy transit if the user is at the transit destination or source' WHERE code = 'ABORT_TRANSIT';
+UPDATE permission.perm_list SET description = 'Allow a user to cancel a copy transit if the user is not at the transit source or dest' WHERE code = 'ABORT_REMOTE_TRANSIT'; 
+UPDATE permission.perm_list SET description = 'Allows a user to cancel a transit on a copy with status of LOST' WHERE code = 'ABORT_TRANSIT_ON_LOST';
+UPDATE permission.perm_list SET description = 'Allows a user to cancel a transit on a copy with status of MISSING' WHERE code = 'ABORT_TRANSIT_ON_MISSING';
+
 COMMIT;

diff --git a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
index c79561f..2dadf6f 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
+++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
@@ -22,7 +22,7 @@
   </eg-grid-action>
   <eg-grid-action 
     handler="abortTransit"
-    label="[% l('Abort Transits') %]">
+    label="[% l('Cancel Transits') %]">
   </eg-grid-action>
 
   <eg-grid-field label="[% l('Alert Msg') %]"   

diff --git a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2
index 6e7d36e..d3debaa 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2
+++ b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2
@@ -63,7 +63,7 @@
   <eg-grid-action divider="true"></eg-grid-action>
   <eg-grid-action 
     handler="abortTransit"
-    label="[% l('Abort Transits') %]">
+    label="[% l('Cancel Transits') %]">
   </eg-grid-action>
 
 

diff --git a/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2 b/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2
index 4f9c917..6ad5c78 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2
@@ -27,7 +27,7 @@ s.LOCATION_ALERT_MSG =
     "{{copy.barcode()}}","{{copy.location().name()}}") %]';
 s.MARK_DAMAGED_CONFIRM = '[% l("Mark {{num_items}} items as DAMAGED?") %]';
 s.MARK_MISSING_CONFIRM = '[% l("Mark {{num_items}} items as MISSING?") %]';
-s.ABORT_TRANSIT_CONFIRM = '[% l("Abort {{num_transits}} transits?") %]';
+s.ABORT_TRANSIT_CONFIRM = '[% l("Cancel {{num_transits}} transits?") %]';
 s.ROUTE_TO_HOLDS_SHELF = '[% l("Holds Shelf") %]';
 s.ROUTE_TO_CATALOGING = '[% l("Cataloging") %]';
 s.COPY_IN_TRANSIT = '[% l("Copy is In-Transit") %]';

diff --git a/Open-ILS/src/templates/staff/circ/share/t_copy_in_transit_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_copy_in_transit_dialog.tt2
index 4d38922..022c4cf 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/share/t_copy_in_transit_dialog.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_copy_in_transit_dialog.tt2
@@ -25,7 +25,7 @@
   </div>
   <div class="modal-footer">
     <input type="submit" class="btn btn-primary" ng-click="ok()"
-        value="[% l('Abort Transit then Checkout') %]"/>
+        value="[% l('Cancel Transit then Checkout') %]"/>
     <button class="btn btn-warning" 
         ng-click="cancel()">[% l('Cancel') %]</button>
   </div>

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index fdbec28..098d075 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -2139,7 +2139,7 @@
 <!ENTITY staff.server.admin.transit.list.circs.accesskey "L">
 <!ENTITY staff.server.admin.transit.list.edit.label "Edit Item Attributes">
 <!ENTITY staff.server.admin.transit.list.edit.accesskey "E">
-<!ENTITY staff.server.admin.transit.list.abort.label "Abort Transits">
+<!ENTITY staff.server.admin.transit.list.abort.label "Cancel Transits">
 <!ENTITY staff.server.admin.transit.list.save.label "Save Columns">
 <!ENTITY staff.server.admin.cash.title "Evergreen: Cash Reports">
 <!ENTITY staff.server.admin.cash.welcome "Welcome ">
@@ -2457,7 +2457,7 @@
 <!ENTITY staff.circ.checkin_overlay.sel_mark_items_damaged.accesskey "D">
 <!ENTITY staff.circ.checkin_overlay.sel_mark_missing_pieces.label "Mark Item as Missing Pieces">
 <!ENTITY staff.circ.checkin_overlay.sel_mark_missing_pieces.accesskey "M">
-<!ENTITY staff.circ.checkin_overlay.sel_transit_abort.label "Abort Transit">
+<!ENTITY staff.circ.checkin_overlay.sel_transit_abort.label "Cancel Transit">
 <!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">
@@ -2511,7 +2511,7 @@
 <!ENTITY staff.circ.renew_overlay.sel_edit.accesskey "E">
 <!ENTITY staff.circ.renew_overlay.sel_mark_items_damaged.label "Mark Item Damaged">
 <!ENTITY staff.circ.renew_overlay.sel_mark_items_damaged.accesskey "D">
-<!ENTITY staff.circ.renew_overlay.sel_transit_abort.label "Abort Transit">
+<!ENTITY staff.circ.renew_overlay.sel_transit_abort.label "Cancel Transit">
 <!ENTITY staff.circ.renew_overlay.sel_spine.label "Print Spine Label">
 <!ENTITY staff.circ.renew_overlay.sel_spine.accesskey "P">
 <!ENTITY staff.circ.renew_overlay.save_columns.label "Save Columns">
@@ -2590,7 +2590,7 @@
 <!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 "M">
-<!ENTITY staff.circ.copy_status_overlay.sel_transit_abort.label "Abort Transits">
+<!ENTITY staff.circ.copy_status_overlay.sel_transit_abort.label "Cancel Transits">
 <!ENTITY staff.circ.copy_status_overlay.sel_checkin.label "Check In Items">
 <!ENTITY staff.circ.copy_status_overlay.sel_checkin.accesskey "N">
 <!ENTITY staff.circ.copy_status_overlay.sel_renew.label "Renew Items">

diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
index 7f3798c..0f1d0c9 100644 (file)
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -63,7 +63,7 @@ staff.circ.checkout.account.expired=This account has expired and may not circula
 staff.circ.checkout.item_due=This item was due on %1$s.
 staff.circ.checkout.normal_checkin_then_checkout=Normal Checkin then Checkout
 staff.circ.checkout.forgiving_checkin_then_checkout=Forgiving Checkin then Checkout
-staff.circ.checkout.abort_transit_then_checkout=Abort Transit then Checkout
+staff.circ.checkout.abort_transit_then_checkout=Cancel Transit then Checkout
 staff.circ.checkout.offer_renewal=Renew Item
 staff.circ.checkout.network_failure=There was a network failure.
 staff.circ.checkout.copy_status=Copy status = %1$s
@@ -222,13 +222,13 @@ staff.circ.print_list_template.import_results=Imported these templates: %1$s
 staff.circ.print_list_template.reload=Please reload this interface.
 staff.circ.print_list_template.import.error=Error exporting templates
 staff.circ.print_list_template.tab_name=Receipt Template Editor
-staff.circ.utils.abort_transits.confirm=Are you sure you would like to abort transits for copies: %1$s?
-staff.circ.utils.abort_transits.title=Aborting Transits
+staff.circ.utils.abort_transits.confirm=Are you sure you would like to cancel transits for copies: %1$s?
+staff.circ.utils.abort_transits.title=Canceling Transits
 staff.circ.utils.yes=Yes
 staff.circ.utils.no=No
 staff.circ.utils.abort_transits.not_allowed=Copy ID = %1$s
-staff.circ.utils.abort_transits.not_found=This item was no longer in transit at the time of the abort.  Perhaps this happened from a stale display?
-staff.circ.utils.abort_transits.unexpected_error=Transit not likely aborted.
+staff.circ.utils.abort_transits.not_found=This item was no longer in transit at the time of the cancellation.  Perhaps this happened from a stale display?
+staff.circ.utils.abort_transits.unexpected_error=Transit not likely canceled.
 staff.circ.utils.retrieve_patron.failure=Problem retrieving patron.
 staff.circ.utils.retrieve_copy.failure=Problem retrieving copy details.
 staff.circ.utils.retrieve_circs.failure=Problem retrieving circulations.