From 83e9a8e73b868e75f67575a61a6604ef43bbb06b Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Sun, 10 Aug 2014 21:10:12 -0300 Subject: [PATCH] Bug 8938: Transport cost matrix script and template contain untranslatable strings MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch fixes the problem reported. To test: 1) Apply the patch 2) Update translations for your preffered language, xx-YY 3) Check new entries egrep -Rn "Cost must be expressed as a decimal number|Invalid value for" misc/translator/xx-YY* 4) Check no regression on alert, go to Administration > Transport cost matrix Edit some value and put a negative value & save, alert must show up 5) On errors, part of the error string is now on TT file, no regressions expected here Verified that changes appear in translated language (de-CH) as appropriate. No regressions found by testing en en de-CH. Signed-off-by: Marc Véron Signed-off-by: Katrin Fischer Tested both, entering a numeric value < 0 and non-numeric values, no regressions found. Passes tests and QA script. Signed-off-by: Tomas Cohen Arazi --- admin/transport-cost-matrix.pl | 2 +- .../prog/en/modules/admin/transport-cost-matrix.tt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/transport-cost-matrix.pl b/admin/transport-cost-matrix.pl index 91f01d6108..db34c6f093 100755 --- a/admin/transport-cost-matrix.pl +++ b/admin/transport-cost-matrix.pl @@ -82,7 +82,7 @@ foreach my $branchfrom ( @branchloop ) { $from_to_input_def{disabled} = 1; } else { - push @errors, "Invalid value for $from_row{name} -> $from_to_input_def{name}" + push @errors, "$from_row{name} -> $from_to_input_def{name}" unless $value =~ /\d/o && $value >= 0.0; } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt index 4ec0710570..fb36d0ebdd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt @@ -9,7 +9,7 @@ function check_transport_cost(e) { if (val && val != '' && !isNaN(parseFloat(val)) && val >= 0.0) { return; } - alert("Cost must be expressed as a decimal number >= 0"); + alert(_("Cost must be expressed as a decimal number >= 0")); } function disable_transport_cost_chg(e, cost_id) { disable_transport_cost(cost_id, e.checked); @@ -69,7 +69,7 @@ function form_submit (f) {

There were problems with your submission

    [% FOR e IN errors %] -
  • [% e %]
  • +
  • Invalid value for [% e %]
  • [% END %]
[% END %] -- 2.39.5