[open-ils-commits] [GIT] Evergreen ILS branch master updated. 564ba9f18ebace573dc2ec4ef7c09a085adffe99

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  564ba9f18ebace573dc2ec4ef7c09a085adffe99 (commit)
      from  8a1a43b57baf4036fe5ccf485caa0ed29e2fe2a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 564ba9f18ebace573dc2ec4ef7c09a085adffe99
Author: Remington Steed <rjs7 at calvin.edu>
Date:   Mon Apr 30 23:34:30 2018 -0400

    LP#1774724: Fix copy-pasto's in Library Settings
    
    Two long-overdue org unit settings made reference to "lost", being
    apparently copied from the similar settings about lost items. This fixes
    the wording, both in the settings database table and in the docs.
    
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>

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 6503dfe..949021b 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -16151,7 +16151,7 @@ INSERT INTO config.org_unit_setting_type
     oils_i18n_gettext(
         'circ.longoverdue.xact_open_on_zero',
         'Leave transaction open when long-overdue balance equals zero.  ' ||
-            'This leaves the lost copy on the patron record when it is paid',
+            'This leaves the long-overdue copy on the patron record when it is paid',
         'coust',
         'description'
     )
@@ -17597,9 +17597,9 @@ INSERT INTO config.org_unit_setting_type
          oils_i18n_gettext('circ.copy_alerts.forgive_fines_on_long_overdue_checkin',
             'Forgive fines when checking out a long-overdue item and copy alert is suppressed?',
             'coust', 'label'),
-         oils_i18n_gettext('circ.copy_alerts.forgive_fines_on_lost_checkin',
+         oils_i18n_gettext('circ.copy_alerts.forgive_fines_on_long_overdue_checkin',
             'Controls whether fines are automatically forgiven when checking out an '||
-            'item that has been marked as lost, and the corresponding copy alert has been '||
+            'item that has been marked as long-overdue, and the corresponding copy alert has been '||
             'suppressed.',
             'coust', 'description'),
         'bool');
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.yaous_longoverdue_descrip_typos.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.yaous_longoverdue_descrip_typos.sql
new file mode 100644
index 0000000..babcbed
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.yaous_longoverdue_descrip_typos.sql
@@ -0,0 +1,26 @@
+BEGIN;
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+-- fix two typo/pasto's in setting descriptions
+UPDATE config.org_unit_setting_type
+SET description = oils_i18n_gettext(
+	'circ.copy_alerts.forgive_fines_on_long_overdue_checkin',
+	'Controls whether fines are automatically forgiven when checking out an '||
+	'item that has been marked as long-overdue, and the corresponding copy alert has been '||
+	'suppressed.',
+	'coust', 'description'
+)
+WHERE NAME = 'circ.copy_alerts.forgive_fines_on_long_overdue_checkin';
+
+UPDATE config.org_unit_setting_type
+SET description = oils_i18n_gettext(
+	'circ.longoverdue.xact_open_on_zero',
+	'Leave transaction open when long-overdue balance equals zero.  ' ||
+	'This leaves the long-overdue copy on the patron record when it is paid',
+	'coust', 'description'
+)
+WHERE NAME = 'circ.longoverdue.xact_open_on_zero';
+
+COMMIT;
diff --git a/docs/admin/librarysettings.adoc b/docs/admin/librarysettings.adoc
index 2a7c861..4935ce3 100644
--- a/docs/admin/librarysettings.adoc
+++ b/docs/admin/librarysettings.adoc
@@ -230,7 +230,7 @@ values.
 |Charge processing fee for damaged items|Optional processing fee billed to last patron who checked out the damaged item. Staff receive an alert with patron information and must confirm the billing.|Number(Dollar)| Disabled when set to 0
 |Default item price|Replacement charge for lost items if price is unset in the *Copy Editor*. Does not apply if item price is set to $0|Number(dollars)|
 |Disable Patron Credit|Do not allow patrons to accrue credit or pay fines/fees with accrued credit|True/False|
-|Leave transaction open when long overdue balance equals zero|Leave transaction open when long-overdue balance equals zero. This leaves the lost copy on the patron record when it is paid|True/False|
+|Leave transaction open when long overdue balance equals zero|Leave transaction open when long-overdue balance equals zero. This leaves the long-overdue copy on the patron record when it is paid|True/False|
 |Leave transaction open when lost balance equals zero|Leave transaction open when lost balance equals zero. This leaves the lost copy on the patron record when it is paid|True/False|
 |Long-Overdue Materials Processing Fee|The amount charged in addition to item price when an item is marked Long-Overdue|Number|Currency
 |Lost materials processing fee|The amount charged in addition to item price when an item is marked lost.| Number|Currency

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |    6 ++--
 .../XXXX.data.yaous_longoverdue_descrip_typos.sql  |   26 ++++++++++++++++++++
 docs/admin/librarysettings.adoc                    |    2 +-
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.yaous_longoverdue_descrip_typos.sql


hooks/post-receive
-- 
Evergreen ILS