From 4f4a3905993f4b3e1f8a2b2603b674ec9b987cc2 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
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 <veron@veron.ch>

Patch behaves as expected.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
---
 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 c558b08..5b3b2ca 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) {
     </li>
 </ul>
 <div class="tabs-container">
-[% IF ( error ) %]
+[% IF ( error_over ) %]
     <div id="error_message" class="dialog alert">
-    [% error %]
+    You must pay a value less than or equal to [% total_due | format('%.2f') %].
     </div>
 [% END %]
 
diff --git a/members/paycollect.pl b/members/paycollect.pl
index 5a732a9..d66702e 100755
--- a/members/paycollect.pl
+++ b/members/paycollect.pl
@@ -97,8 +97,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) {
-- 
1.7.10.4