From 899ebd27fea62b83e7d733f936ff5864f7cb39b1 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 14 Sep 2015 13:22:21 +0100 Subject: [PATCH] Bug 14655: Fix wording --- C4/Circulation.pm | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 4ddd75f..db70a95 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -2088,7 +2088,7 @@ sub MarkIssueReturned { # We need to check if the anonymous patron exist, Koha will fail loudly if it does not # Note that a warning should appear on the about page (System information tab). $anonymouspatron = C4::Context->preference('AnonymousPatron'); - die "Fatal error: the patron ($borrowernumber) has requested a privacy on returning item but the AnonymousPatron pref is not set correctly" + die "Fatal error: the patron ($borrowernumber) has requested their circulation history be anonymized on check-in, but the AnonymousPatron system preference is empty or not set correctly." unless C4::Members::GetMember( borrowernumber => $anonymouspatron ); } my $dbh = C4::Context->dbh; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index bde0116..f6e172a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -590,7 +590,7 @@ No patron matched [% message %]
[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %] -
Error: This patron has requested a privacy on returning item but the AnonymousPatron pref is not set correctly.
+
Error:This patron has requested their circulation history be anonymized on check-in, but the AnonymousPatron system preference is empty or incorrect.
[% END %] [% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 40a3663..2de333a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -119,7 +119,7 @@ $(document).ready(function () {
[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %] -
Error: This patron has requested a privacy on returning item but the AnonymousPatron pref is not set correctly.
+
Error:This patron has requested their circulation history be anonymized on check-in, but the AnonymousPatron system preference is empty or incorrect.
[% ELSIF NOT Koha.Preference('AnonymousPatron') AND Koha.Preference('OPACPrivacy') %]
Error: The system preference OPACPrivacy is set but AnonymousPatron is not! Please correct this before continuing circulation.
[% END %] -- 2.1.0