diff --git a/Controleur/ControleurAjaxexporterunequittanceclient.php b/Controleur/ControleurAjaxexporterunequittanceclient.php index a7cd6d3..38453a7 100644 --- a/Controleur/ControleurAjaxexporterunequittanceclient.php +++ b/Controleur/ControleurAjaxexporterunequittanceclient.php @@ -71,13 +71,13 @@ class ControleurAjaxexporterunequittanceclient extends Controleurrequete // 2eme ligne $pdf->Cell(25,$ht,convertirc(_('Effet')),0,0,'L',false); - $pdf->Cell(35,$ht,convertirc(" : ".dateLang($quittance['dateEffet'])),0,0,'L',false); + $pdf->Cell(35,$ht,convertirc(" : ".dateLang($quittance['dateEffet']), $_SESSION['lang']),0,0,'L',false); $pdf->Cell(25,$ht,convertirc(_('Echéance')),0,0,'L',false); - $pdf->Cell(35,$ht,convertirc(" : ".dateLang($quittance['dateEcheance'])),0,0,'L',false); + $pdf->Cell(35,$ht,convertirc(" : ".dateLang($quittance['dateEcheance']), $_SESSION['lang']),0,0,'L',false); $pdf->Cell(25,$ht,convertirc(_('Edition')),0,0,'L',false); - $pdf->Cell(0,$ht,convertirc(' : '.heureCouranteLang($_SESSION['lang'])),0,1,'L',false); + $pdf->Cell(0,$ht,convertirc(' : '.heureCouranteLang($_SESSION['lang']), $_SESSION['lang']),0,1,'L',false); // 3eme ligne $pdf->Cell(25,$ht,convertirc(_("P Nette Com")),0,0,'L',false); @@ -119,7 +119,7 @@ class ControleurAjaxexporterunequittanceclient extends Controleurrequete $pdf->Cell(35,$ht,convertirc(" : ".format_N($quittance['nbAliment'])),0,0,'L',false); $pdf->Cell(25,$ht,convertirc(_("A Payer avant")),0,0,'L',false); - $pdf->Cell(35,$ht,convertirc(" : ".dateLang($quittance['datePaiement'])),0,1,'L',false); + $pdf->Cell(35,$ht,convertirc(" : ".dateLang($quittance['datePaiement']), $_SESSION['lang']),0,1,'L',false); // 7eme ligne diff --git a/Cron/Functions.php b/Cron/Functions.php index abec987..bb30681 100755 --- a/Cron/Functions.php +++ b/Cron/Functions.php @@ -41,7 +41,7 @@ function dateLang($d, $lang=null) if (isset($lang) && $lang=="en_US") { // return dateEng($d); - return dateFr($d); + return dateEng($d); } else { diff --git a/Framework/Functions.php b/Framework/Functions.php index 7442abc..3aebef5 100755 --- a/Framework/Functions.php +++ b/Framework/Functions.php @@ -169,7 +169,7 @@ function dateLang($d, $lang=null) if (isset($lang) && $lang=="en_US") { // return dateEng($d); - return dateFr($d); + return dateEng($d); } else { @@ -194,7 +194,7 @@ function dateheureLang($d, $lang=null) if (isset($lang) && $lang=="en_US") { // return dateheureEng($d); - return dateheureFr($d); + return dateheureEng($d); } else { @@ -212,7 +212,7 @@ function heureCouranteLang($lang=null) if (isset($lang) && $lang=="en_US") { // return heureCouranteEng(); - return heureCouranteFr(); + return heureCouranteEng(); } else { @@ -235,7 +235,7 @@ function dateCouranteLang($lang=null) if (isset($lang) && $lang=="en_US") { // return dateCouranteEng(); - return dateCouranteFr(); + return dateCouranteEng(); } else { diff --git a/Vue/Importassure/index.php b/Vue/Importassure/index.php index 7196d2d..21ba084 100644 --- a/Vue/Importassure/index.php +++ b/Vue/Importassure/index.php @@ -36,8 +36,8 @@
-
Du nettoyer($police['dateEffet']),$_SESSION['lang']) ?>
-
Au nettoyer($police['dateEcheance']),$_SESSION['lang']) ?>
+
nettoyer($police['dateEffet']),$_SESSION['lang']) ?>
+
nettoyer($police['dateEcheance']),$_SESSION['lang'])?>