From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Mon, 9 Jul 2012 20:23:27 +0000 (+0200)
Subject: Bug 6394: purchase order has French strings hard coded in
X-Git-Tag: v3.10.01~740
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=19ac74f3877d8801684bffefe36dde79ba0d8bb3;hp=3b2db76402af8b828202c80f4e852f189314baee;p=koha_ffzg

Bug 6394: purchase order has French strings hard coded in

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 <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
---

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);
         }