From bded625db3fcfbbc8014a5cf0cf7e67da841a466 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Mon, 9 Jul 2012 22:23:27 +0200 Subject: [PATCH] Bug 6394: purchase order has French strings hard coded in MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit On the purchase order it said 'publié par' - instead of 'published by'. The layout files for PDF generation in basket groups contain lots of English strings, this change makes the template more consistent. Currently the files are not translatable. The only way is to add translated files to your installation. To test: Print a basket group as PDF. Verify string is ok for both possible settings of system preference OrderPdfFormat: - pdfformat::layout3pages - pdfformat::layout2pages Signed-off-by: Nicole C. Engard Signed-off-by: Paul Poulain Signed-off-by: Chris Cormack (cherry picked from commit fa238b185614df773d66fb74601b72aa0abaa568) Signed-off-by: Jared Camins-Esakov --- acqui/pdfformat/layout2pages.pm | 2 +- acqui/pdfformat/layout3pages.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acqui/pdfformat/layout2pages.pm b/acqui/pdfformat/layout2pages.pm index 148394a9c6..6d5925e538 100644 --- a/acqui/pdfformat/layout2pages.pm +++ b/acqui/pdfformat/layout2pages.pm @@ -93,7 +93,7 @@ sub printorders { $arrbasket = undef; push( @$arrbasket, $basket->{basketno}, - @$line[3]." / ".@$line[2].(@$line[0]?" ISBN : ".@$line[0]:'').(@$line[10]?" EN : ".@$line[10]:'').", ".@$line[1].(@$line[4]?' publié par '.@$line[4]:''), + @$line[3]." / ".@$line[2].(@$line[0]?" ISBN : ".@$line[0]:'').(@$line[10]?" EN : ".@$line[10]:'').", ".@$line[1].(@$line[4]?' published by '.@$line[4]:''), @$line[5], $num->format_price(@$line[6]), $num->format_price(@$line[8]).'%', diff --git a/acqui/pdfformat/layout3pages.pm b/acqui/pdfformat/layout3pages.pm index 7dab18fc39..324b88e85b 100644 --- a/acqui/pdfformat/layout3pages.pm +++ b/acqui/pdfformat/layout3pages.pm @@ -104,7 +104,7 @@ sub printorders { # @{$orders->{$basket->{basketno}}}); foreach my $line (@{$orders->{$basket->{basketno}}}) { $arrbasket = undef; - push(@$arrbasket, @$line[3]." / ".@$line[2].(@$line[0]?" ISBN : ".@$line[0]:'').(@$line[10]?" EN : ".@$line[10]:'').", ".@$line[1].(@$line[4]?' publié par '.@$line[4]:''), @$line[5],$num->format_price(@$line[6]),$num->format_price(@$line[8]).'%',$num->format_price(@$line[7]/(1+@$line[9]/100)),$num->format_price(@$line[9]).'%',$num->format_price($num->round(@$line[7])*@$line[5])); + push(@$arrbasket, @$line[3]." / ".@$line[2].(@$line[0]?" ISBN : ".@$line[0]:'').(@$line[10]?" EN : ".@$line[10]:'').", ".@$line[1].(@$line[4]?' published by '.@$line[4]:''), @$line[5],$num->format_price(@$line[6]),$num->format_price(@$line[8]).'%',$num->format_price(@$line[7]/(1+@$line[9]/100)),$num->format_price(@$line[9]).'%',$num->format_price($num->round(@$line[7])*@$line[5])); push(@$abaskets, $arrbasket); } -- 2.39.5