From 17514959011434f9d868b8f7f553104228718789 Mon Sep 17 00:00:00 2001 From: Lari Taskula 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit 7163fcfeea382e1e042a47a76d384155e8c69bc0) Signed-off-by: Frédéric Demians (cherry picked from commit 326616d2bce77b245e0d38eb3df659e821130645) Signed-off-by: Julian Maurice --- 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 6ed1543917..e5973a171a 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -1083,7 +1083,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 09b5c677fb..f921ff6b40 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -90,6 +90,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 6d3427dc6e..ee57b27843 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 316c5bd691..1b07fedf83 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt @@ -63,6 +63,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 -- 2.39.5