Attachment 42517 Details for Bug 14655 – Bug 14655: Fix wording

[patch] Bug 14655: Fix wording

Bug-14655-Fix-wording.patch (text/plain), 3.33 KB, created by Jonathan Druart on 2015-09-14 12:22:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-09-14 12:22:36 UTC

Size: 3.33 KB

patch

obsolete

>From 899ebd27fea62b83e7d733f936ff5864f7cb39b1 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>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 <span class="ex">[% message %]</span>
> <div class="yui-g">
> 
> [% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
>-    <div class="dialog alert"><strong>Error:</strong> This patron has requested a privacy on returning item but the AnonymousPatron pref is not set correctly.</div>
>+    <div class="dialog alert"><strong>Error:</strong>This patron has requested their circulation history be anonymized on check-in, but the AnonymousPatron system preference is empty or incorrect.</div>
> [% 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 () {
> <div class="yui-g">
> 
> [% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
>-    <div class="dialog alert"><strong>Error:</strong> This patron has requested a privacy on returning item but the AnonymousPatron pref is not set correctly.</div>
>+    <div class="dialog alert"><strong>Error:</strong>This patron has requested their circulation history be anonymized on check-in, but the AnonymousPatron system preference is empty or incorrect.</div>
> [% ELSIF NOT Koha.Preference('AnonymousPatron') AND Koha.Preference('OPACPrivacy') %]
>     <div class="dialog alert"><strong>Error:</strong> The system preference OPACPrivacy is set but AnonymousPatron is not! Please correct this before continuing circulation.</div>
> [% END %]
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 14655: 41630 | 41631 | 42048 | 42049 | 42517 | 42540 | 42541 | 42542