From cd64f884d0c85196d023e4392aed81997740d7a6 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Sun, 25 Nov 2012 20:30:57 -0500 Subject: [PATCH] Bug 9141 - Untranslatable strings on "pay an amount..." page Moving text of an error message from the script into the template. To test, submit an amount which is greater than the amount due. You should see an error message displayed correctly with a properly-formatted currency amount. Signed-off-by: Marc Veron Patch behaves as expected. Signed-off-by: Jonathan Druart Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack Signed-off-by: Liz Rea --- koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt | 4 ++-- members/paycollect.pl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt index b38fc01638..8935597397 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -84,9 +84,9 @@ function moneyFormat(textObj) {
-[% IF ( error ) %] +[% IF ( error_over ) %]
- [% error %] + You must pay a value less than or equal to [% total_due | format('%.2f') %].
[% END %] diff --git a/members/paycollect.pl b/members/paycollect.pl index 3037b37cca..dcabdf842e 100755 --- a/members/paycollect.pl +++ b/members/paycollect.pl @@ -95,8 +95,8 @@ if ( $individual || $writeoff ) { if ( $total_paid and $total_paid ne '0.00' ) { if ( $total_paid < 0 or $total_paid > $total_due ) { $template->param( - error => sprintf( 'You must pay a value less than or equal to %f.2', - $total_due ) + error_over => 1, + total_due => $total_due ); } else { if ($individual) {