Attachment 51589 Details for Bug 16200 – Bug 16200: Make 'Hold waiting too long' translatable and give it an unique accounttype

[patch] Bug 16200: Make 'Hold waiting too long' translatable and give it an unique accounttype

Bug-16200-Make-Hold-waiting-too-long-translatable-.patch (text/plain), 3.98 KB, created by Olli-Antti Kivilahti on 2016-05-18 09:09:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli-Antti Kivilahti

Created: 2016-05-18 09:09:32 UTC

Size: 3.98 KB

patch

obsolete

>From be1bb069946b1a3fbf76e2d9f4373ab45827d293 Mon Sep 17 00:00:00 2001
>From: Lari Taskula <larit@student.uef.fi>
>Date: Tue, 17 May 2016 14:33:57 +0300
>Subject: [PATCH] Bug 16200: Make 'Hold waiting too long' translatable and give
> it an unique accounttype
>
>Holds that have expired have been untranslatable in Patron's Fines-tab. Also, they are
>mixed with other type of fines with accounttype "F". This patch gives expired holds an
>own accounttype "HE" (Hold Expired) and modifies the boraccount to recognize this new
>accounttype in order to make it translatable.
>
>To test:
>1. Make a hold and let it expire
>2. Go to Patron's Fines tab
>3. Change Koha's language to some other than English
>4. Observe that there is a "Hold waiting too long" fine described in English
>5. Apply patch
>6. Make another hold and let it expire
>7. Update translations
>8. Find "Hold waiting too long" from your .po file
>9. Translate it and install translations
>10. Go back to Fines tab and observe that the new expired hold is translated
>
>Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti@jns.fi>
>---
> C4/Reserves.pm                                                | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt        | 1 +
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt      | 1 +
> 4 files changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/C4/Reserves.pm b/C4/Reserves.pm
>index 58cfdbf..b83f8e1 100644
>--- a/C4/Reserves.pm
>+++ b/C4/Reserves.pm
>@@ -1101,7 +1101,7 @@ sub CancelReserve {
>         # and, if desired, charge a cancel fee
>         my $charge = C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
>         if ( $charge && $params->{'charge_cancel_fee'} ) {
>-            manualinvoice($reserve->{'borrowernumber'}, $reserve->{'itemnumber'}, 'Hold waiting too long', 'F', $charge);
>+            manualinvoice($reserve->{'borrowernumber'}, $reserve->{'itemnumber'}, '', 'HE', $charge);
>         }
>     }
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>index 43a6702..5eb3c40 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>@@ -92,6 +92,7 @@ $(document).ready(function() {
>           [% CASE 'L' %]Lost item
>           [% CASE 'W' %]Writeoff
>           [% CASE 'FU' %]Accruing fine
>+          [% CASE 'HE' %]Hold waiting too long
>           [% CASE 'Rent' %]Rental fee
>           [% CASE 'FOR' %]Forgiven
>           [% CASE 'LR' %]Lost item fee refund
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>index 6d3427d..ee57b27 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>@@ -127,6 +127,7 @@ function enableCheckboxActions(){
>           [% CASE 'L' %]Lost item
>           [% CASE 'W' %]Writeoff
>           [% CASE 'FU' %]Accruing fine
>+          [% CASE 'HE' %]Hold waiting too long
>           [% CASE 'Rent' %]Rental fee
>           [% CASE 'FOR' %]Forgiven
>           [% CASE 'LR' %]Lost item fee refund
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
>index 4be46b7..c0ae133 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
>@@ -114,6 +114,7 @@
>                                             [% CASE 'L' %]Lost item
>                                             [% CASE 'W' %]Writeoff
>                                             [% CASE 'FU' %]Accruing fine
>+                                            [% CASE 'HE' %]Hold waiting too long
>                                             [% CASE 'Rent' %]Rental fee
>                                             [% CASE 'FOR' %]Forgiven
>                                             [% CASE 'LR' %]Lost item fee refund
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 16200: 51571 | 51572 | 51574 | 51589 | 51590 | 51605 | 51631 | 51632