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/Controleur/ControleurCreeradherent.php b/Controleur/ControleurCreeradherent.php
index 2b3a257..a69fc2d 100644
--- a/Controleur/ControleurCreeradherent.php
+++ b/Controleur/ControleurCreeradherent.php
@@ -46,6 +46,8 @@ class ControleurCreeradherent extends Controleur {
$this->pays = new Pays();
$this->groupesanguin = (new Groupesanguin())->getListe();
$this->tarif = new Tarif();
+
+
$this->college = (new Collegepolice())->getListe($_SESSION['idPolice_C']);
$this->avenant = (new Avenant())->getListeEnCours($_SESSION['idPolice_C']);
$this->ouinonprorata = (new Ouinon())->getListe();
@@ -58,8 +60,10 @@ class ControleurCreeradherent extends Controleur {
public function index()
{
$idClient = $_SESSION['idClient_C'];
+
$client = $this->client->getClientId($idClient);
+
$codeSociete = $_SESSION['codeSociete'];
$codePays = $client['codePays'];
$codeVille = $client['codeVille'];
diff --git a/Controleur/ControleurImportassure.php b/Controleur/ControleurImportassure.php
index c4068d6..3485ea2 100644
--- a/Controleur/ControleurImportassure.php
+++ b/Controleur/ControleurImportassure.php
@@ -42,7 +42,10 @@ class ControleurImportassure extends Controleur {
{
if( !mkdir(TARGET, 0755) )
{
- $message = 'Erreur : le répertoire cible ne peut-être créé ! Vérifiez que vous diposiez des droits suffisants pour le faire ou créez le manuellement !';
+
+ $message = est_anglophone()
+ ? 'Error: the target directory cannot be created! Please check that you have sufficient rights to do so or create it manually!'
+ : 'Erreur : le répertoire cible ne peut-être créé ! Vérifiez que vous disposiez des droits suffisants pour le faire ou créez le manuellement !';
}
}
@@ -74,7 +77,9 @@ class ControleurImportassure extends Controleur {
if(move_uploaded_file($_FILES['fichier_upload']['tmp_name'], TARGET.$nouveau_fichier))
{
// $message = 'Chargé avec succès / Uploaded successfully';
- $message = _('Chargé avec succès');
+ $message = est_anglophone()
+ ? 'Loaded successfully'
+ : 'Chargé avec succès';
// on va envoyer dans la base de données
@@ -83,30 +88,42 @@ class ControleurImportassure extends Controleur {
else
{
// Sinon on affiche une erreur systeme
- $message = 'Problème lors du chargement !';
+ $message = est_anglophone()
+ ? 'Problem while loading!'
+ : 'Problème lors du chargement !';
}
}
else
{
- $message = 'Une erreur interne a empêché le chargement';
+ $message = 'Une erreur interne a empêché le chargement';$message = est_anglophone()
+ ? 'An internal error prevented loading'
+ : 'Une erreur interne a empêché le chargement';
}
}
else
{
- $message .= $_FILES['fichier_upload']['size']." Erreur dans les dimensions du fichier !";
+ $message .= $_FILES['fichier_upload']['size'] . (
+ est_anglophone()
+ ? ' File dimension error!'
+ : ' Erreur dans les dimensions du fichier !'
+ );
// $message = 'Erreur dans les dimensions du fichier !';
}
}
else
{
// Sinon on affiche une erreur pour l'extension
- $message = 'Extension du fichier est incorrecte !';
+ $message = est_anglophone()
+ ? 'File extension is incorrect!'
+ : 'Extension du fichier est incorrecte !';
}
}
else
{
// Sinon on affiche une erreur pour le champ vide
- $message = 'Veuillez sélectionner un fichier SVP! / Please select a file!';
+ $message = est_anglophone()
+ ? 'Please select a file!'
+ : 'Veuillez sélectionner un fichier SVP!';
}
// fin upload
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 d23298d..4c8df70 100755
--- a/Framework/Functions.php
+++ b/Framework/Functions.php
@@ -168,8 +168,8 @@ function dateLang($d, $lang=null)
{
if (isset($lang) && $lang=="en_US")
{
- // return dateEng($d);
- return dateFr($d);
+ return dateEng($d);
+
}
else
{
@@ -193,8 +193,7 @@ function dateheureLang($d, $lang=null)
{
if (isset($lang) && $lang=="en_US")
{
- // return dateheureEng($d);
- return dateheureFr($d);
+ return dateheureEng($d);
}
else
{
@@ -211,8 +210,8 @@ function heureCouranteLang($lang=null)
{
if (isset($lang) && $lang=="en_US")
{
- // return heureCouranteEng();
- return heureCouranteFr();
+ return heureCouranteEng();
+
}
else
{
@@ -234,8 +233,8 @@ function dateCouranteLang($lang=null)
{
if (isset($lang) && $lang=="en_US")
{
- // return dateCouranteEng();
- return dateCouranteFr();
+ return dateCouranteEng();
+
}
else
{
diff --git a/Js/fonctions.js b/Js/fonctions.js
index c97b5b5..e7ef695 100755
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -69,7 +69,7 @@ function raffraichier_gabarit()
{
$("#div_ajaxgabarit").html(data);
- codeSociete = $("#codeSociete").val();
+ codeSociete = $("#codeSociete_C").val();
vue = $("#vue").val();
if((codeSociete == undefined || codeSociete <= " ") && vue !="Connexion"){
@@ -708,6 +708,8 @@ function est_ce_police_famille()
function creer_adherents()
{
+ debugger;
+
// 06/11/2020
if(est_ce_police_famille())
{
diff --git a/Modele/Avenant.php b/Modele/Avenant.php
index e49a1f0..cf300c1 100644
--- a/Modele/Avenant.php
+++ b/Modele/Avenant.php
@@ -67,11 +67,12 @@ class Avenant extends Modele {
{
if (est_anglophone())
{
- $sql = 'SELECT A.id AS `code`, CONCAT(B.libelleEng, " of ",DATE_FORMAT(A.dateEffet, "%d/%m/%Y")) AS libelle
+ $sql = 'SELECT A.id AS `code`, CONCAT(B.libelleEng, " du ",DATE_FORMAT(A.dateEffet, "%d/%m/%Y"), " => ", A.motifavenant) AS libelle
FROM avenant A
JOIN typeavenant B ON (B.codeTypeAvenant=A.codeTypeAvenant)
JOIN police P ON (P.id=A.idPolice)
-
+ WHERE (A.idPolice=?) AND (B.ajoutAliment="1")
+ AND (A.codeTypeAvenant IN ("AFN","INC","RET"))
AND (A.dateEffet>=P.dateEffet)
AND (A.ajoutClient="1")
ORDER BY A.numeroAvenant DESC;';
diff --git a/Modele/Typeavenant.php b/Modele/Typeavenant.php
index f7a3b9e..1955fee 100644
--- a/Modele/Typeavenant.php
+++ b/Modele/Typeavenant.php
@@ -23,9 +23,9 @@ class Typeavenant extends Modele
{
if (est_anglophone())
{
- $sql = 'SELECT A.codeTypeAvenant as `code`, A.libelleEng as libelle FROM typeavenant A
+ $sql = 'SELECT A.codeTypeAvenant as `code`, A.libelleEng AS libelle FROM typeavenant A
join suiteavenant B on (B.codeTypeAvenant=A.codeTypeAvenant)
- where (B.oldCodeTypeAvenant=?) and A.order by A.libelle';
+ where (B.oldCodeTypeAvenant=?) and A.extranetClient="1" order by A.libelle';
}
else
{
diff --git a/Vue/Ajaxavenant/getdateavenant.php b/Vue/Ajaxavenant/getdateavenant.php
index cb80605..78e06f9 100644
--- a/Vue/Ajaxavenant/getdateavenant.php
+++ b/Vue/Ajaxavenant/getdateavenant.php
@@ -1,2 +1,2 @@
-
diff --git a/Vue/Ajaxavenant/getdateavenantbeneficiaire.php b/Vue/Ajaxavenant/getdateavenantbeneficiaire.php
index 4410af7..94a8e4a 100644
--- a/Vue/Ajaxavenant/getdateavenantbeneficiaire.php
+++ b/Vue/Ajaxavenant/getdateavenantbeneficiaire.php
@@ -1,2 +1,2 @@
-
diff --git a/Vue/Ajaxbeneficiaireprimeadherent/index.php b/Vue/Ajaxbeneficiaireprimeadherent/index.php
index 272dbb7..e3237df 100644
--- a/Vue/Ajaxbeneficiaireprimeadherent/index.php
+++ b/Vue/Ajaxbeneficiaireprimeadherent/index.php
@@ -32,7 +32,7 @@
|
- = dateLang($this->nettoyer($beneficiaire['dateEffet'])) ?>
+ = dateLang($this->nettoyer($beneficiaire['dateEffet']), $_SESSION['lang']) ?>
|
= $this->nettoyer($beneficiaire['codeLienParente']) ?>
diff --git a/Vue/Ajaxdetailretrait/index.php b/Vue/Ajaxdetailretrait/index.php
index 6ecddf3..124e125 100644
--- a/Vue/Ajaxdetailretrait/index.php
+++ b/Vue/Ajaxdetailretrait/index.php
@@ -94,7 +94,7 @@ KANE LAZENi
| = $this->nettoyer($beneficiaire_sel['nomBeneficiaire']) ?> |
= $this->nettoyer($beneficiaire_sel['codeLienParente']) ?> |
= $this->nettoyer($beneficiaire_sel['numeroBeneficiaire']) ?> |
- = dateLang($this->nettoyer($beneficiaire_sel['dateEntree'])) ?> |
+ = dateLang($this->nettoyer($beneficiaire_sel['dateEntree']), $_SESSION['lang']) ?> |
= $this->nettoyer($beneficiaire_sel['duree']) ?> |
= $this->nettoyer($beneficiaire_sel['duree_non_acquise']) ?> |
= $this->nettoyer($beneficiaire_sel['ratioNonAcquise']) ?> |
diff --git a/Vue/Ajaxfactureconspop/feuillemaladie.php b/Vue/Ajaxfactureconspop/feuillemaladie.php
index 7faa8cd..130e1df 100644
--- a/Vue/Ajaxfactureconspop/feuillemaladie.php
+++ b/Vue/Ajaxfactureconspop/feuillemaladie.php
@@ -31,7 +31,7 @@
-
= dateLang($this->nettoyer($feuillemaladie['dateConsultation'])) ?>
+
= dateLang($this->nettoyer($feuillemaladie['dateConsultation']), $_SESSION['lang']) ?>
diff --git a/Vue/Ajaxfactureconspop/geds.php b/Vue/Ajaxfactureconspop/geds.php
index ef98615..831a3eb 100644
--- a/Vue/Ajaxfactureconspop/geds.php
+++ b/Vue/Ajaxfactureconspop/geds.php
@@ -38,7 +38,7 @@
?>
|
- = dateLang($this->nettoyer($ged['dateSysteme'])) ?>
+ = dateLang($this->nettoyer($ged['dateSysteme']), $_SESSION['lang']) ?>
|
diff --git a/Vue/Ajaxfactureconspop/index.php b/Vue/Ajaxfactureconspop/index.php
index 6696ba5..bb8b093 100644
--- a/Vue/Ajaxfactureconspop/index.php
+++ b/Vue/Ajaxfactureconspop/index.php
@@ -124,11 +124,11 @@
= _("Date Décompte") ?> :
- = dateLang($this->nettoyer($facture['dateDecompte'])) ?>
+ = dateLang($this->nettoyer($facture['dateDecompte']), $_SESSION['lang']) ?>
= _("Règlement") ?> :
- = dateheureLang($this->nettoyer($facture['heureReglement'])) ?>
+ = dateheureLang($this->nettoyer($facture['heureReglement']), $_SESSION['lang']) ?>
diff --git a/Vue/Ajaxfactureconspop/verres.php b/Vue/Ajaxfactureconspop/verres.php
index 3488484..fafce34 100644
--- a/Vue/Ajaxfactureconspop/verres.php
+++ b/Vue/Ajaxfactureconspop/verres.php
@@ -40,7 +40,7 @@
?>
|
|
- = dateLang($this->nettoyer($verre['dateSysteme'])) ?>
+ = dateLang($this->nettoyer($verre['dateSysteme']), $_SESSION['lang']) ?>
|
diff --git a/Vue/Ajaxgabarit/index.php b/Vue/Ajaxgabarit/index.php
index ec57c2d..8e86e21 100644
--- a/Vue/Ajaxgabarit/index.php
+++ b/Vue/Ajaxgabarit/index.php
@@ -43,7 +43,7 @@
-
+
diff --git a/Vue/Ajaximporterlisteassure/initimportermodele.php b/Vue/Ajaximporterlisteassure/initimportermodele.php
index e57d61e..fed04f8 100644
--- a/Vue/Ajaximporterlisteassure/initimportermodele.php
+++ b/Vue/Ajaximporterlisteassure/initimportermodele.php
@@ -28,7 +28,7 @@
|
- = dateLang($this->nettoyer($avenant['dateEffet'])) ?>
+ = dateLang($this->nettoyer($avenant['dateEffet']), $_SESSION['lang']) ?>
|
diff --git a/Vue/Ajaxlisteadherent/index.php b/Vue/Ajaxlisteadherent/index.php
index acdd260..fac1cc2 100644
--- a/Vue/Ajaxlisteadherent/index.php
+++ b/Vue/Ajaxlisteadherent/index.php
@@ -92,9 +92,9 @@
|
- = dateLang($this->nettoyer($adherent['dateEntree'])) ?>
+ = dateLang($this->nettoyer($adherent['dateEntree']), $_SESSION['lang']) ?>
- = $adherent['dateSortie'] ? dateLang($this->nettoyer($adherent['dateSortie'])) : '--' ?>
+ = $adherent['dateSortie'] ? dateLang($this->nettoyer($adherent['dateSortie']), $_SESSION['lang']) : '--' ?>
|
diff --git a/Vue/Ajaxselectionretrait/index.php b/Vue/Ajaxselectionretrait/index.php
index c6581c2..35b6f9e 100644
--- a/Vue/Ajaxselectionretrait/index.php
+++ b/Vue/Ajaxselectionretrait/index.php
@@ -27,7 +27,7 @@
| = $this->nettoyer($beneficiaire['nomBeneficiaire']) ?> |
= $this->nettoyer($beneficiaire['codeLienParente']) ?> |
= $this->nettoyer($beneficiaire['numeroBeneficiaire']) ?> |
- = dateLang($this->nettoyer($beneficiaire['dateEntree'])) ?> |
+ = dateLang($this->nettoyer($beneficiaire['dateEntree']), $_SESSION['lang']) ?> |
= $this->nettoyer($beneficiaire['duree']) ?> |
= $this->nettoyer($beneficiaire['duree_non_acquise']) ?> |
= $this->nettoyer($beneficiaire['ratioNonAcquise']) ?> |
diff --git a/Vue/Beneficiaireprimeadherent/index.php b/Vue/Beneficiaireprimeadherent/index.php
index 6ed6941..5aceffc 100644
--- a/Vue/Beneficiaireprimeadherent/index.php
+++ b/Vue/Beneficiaireprimeadherent/index.php
@@ -26,7 +26,7 @@
-
+
@@ -34,7 +34,7 @@
-
+
diff --git a/Vue/Changeretatadherent/index.php b/Vue/Changeretatadherent/index.php
index 19559cc..0932581 100644
--- a/Vue/Changeretatadherent/index.php
+++ b/Vue/Changeretatadherent/index.php
@@ -35,7 +35,7 @@
| = _("Entrée") ?> |
- |
+ |
= _("Etat") ?> |
|
diff --git a/Vue/Changeretatbeneficiaire/index.php b/Vue/Changeretatbeneficiaire/index.php
index fad2d36..5ef2b23 100644
--- a/Vue/Changeretatbeneficiaire/index.php
+++ b/Vue/Changeretatbeneficiaire/index.php
@@ -35,7 +35,7 @@
| = _("Entrée") ?> |
- |
+ |
= _("Etat") ?> |
|
diff --git a/Vue/Creeradherent/index.php b/Vue/Creeradherent/index.php
index aac92ec..c57e1e3 100644
--- a/Vue/Creeradherent/index.php
+++ b/Vue/Creeradherent/index.php
@@ -164,7 +164,7 @@
+ value="= dateLang($_SESSION['dateAvenant_C'], $_SESSION['lang']) ?>" required onChange="prorater_prime_adherent();">
@@ -41,7 +41,7 @@
diff --git a/Vue/Ficheadherent/index.php b/Vue/Ficheadherent/index.php
index ed81361..b10185c 100644
--- a/Vue/Ficheadherent/index.php
+++ b/Vue/Ficheadherent/index.php
@@ -68,7 +68,7 @@
-
= _("Adhérent sorti le") . " : " . dateLang($dateSortieAdherent) ?>
+ = _("Adhérent sorti le") . " : " . dateLang($dateSortieAdherent, $_SESSION['lang']) ?>
@@ -561,7 +561,7 @@
data: {
labels: dataConso.garanties,
datasets: [{
- label: 'Dépenses',
+ label: '= _('Dépenses')?>',
data: dataConso.depenses,
backgroundColor: 'rgba(54, 162, 235, 0.7)',
borderColor: 'rgba(54, 162, 235, 1)',
@@ -584,7 +584,7 @@
borderWidth: 2,
borderDash: [6, 6],
label: {
- content: `Plafond: ${formatMoney(plafond)}`,
+ content: `= _('Plafond').': '?> ${formatMoney(plafond)}`,
enabled: true,
position: 'right'
}
@@ -598,13 +598,13 @@
callbacks: {
label: function(context) {
const plafond = dataConso.plafonds[context.dataIndex];
- let tooltip = `Dépenses: ${formatMoney(context.parsed.y)}`;
+ let tooltip = `= _('Dépenses').':'?> ${formatMoney(context.parsed.y)}`;
if (plafond !== null) {
const pourcentage = Math.min(100, Math.round((context.parsed.y / plafond) * 100));
- tooltip += ` (${pourcentage}% du plafond)`;
+ tooltip += ` (${pourcentage}% = _('du plafond')?>)`;
} else {
- tooltip += ' (plafond illimité)';
+ tooltip += ' = _('(plafond illimité)')?>';
}
return tooltip;
@@ -617,7 +617,7 @@
beginAtZero: true,
title: {
display: true,
- text: `Montant des dépenses`,
+ text: '= _("Montant des dépenses") ?>',
font: {
weight: 'bold'
}
@@ -632,7 +632,7 @@
x: {
title: {
display: true,
- text: 'Garanties',
+ text: '= _('Garanties')?>',
font: {
weight: 'bold'
}
diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php
index 51f1fae..8073039 100644
--- a/Vue/Fichebeneficiaire/index.php
+++ b/Vue/Fichebeneficiaire/index.php
@@ -94,7 +94,7 @@
= _("Bénéficiaire") ?> : = $beneficiaire['numeroBeneficiaire'] ?>
- = _("Date Effet") ?> : = dateLang($this->nettoyer($beneficiaire['dateEffet'])) ?>
+ = _("Date Effet") ?> : = dateLang($this->nettoyer($beneficiaire['dateEffet']), $_SESSION['lang']) ?>
@@ -134,7 +134,7 @@
-
+
@@ -196,7 +196,7 @@
-
= _("Sortie le") ?> : = dateLang($dateSortieBeneficiaire) ?>
+
= _("Sortie le") ?> : = dateLang($dateSortieBeneficiaire, $_SESSION['lang']) ?>
= $motifsortie ?>
@@ -546,7 +546,7 @@
data: {
labels: dataConso.garanties,
datasets: [{
- label: 'Dépenses',
+ label: '= _('Dépenses')?>',
data: dataConso.depenses,
backgroundColor: 'rgba(54, 162, 235, 0.7)',
borderColor: 'rgba(54, 162, 235, 1)',
@@ -569,7 +569,7 @@
borderWidth: 2,
borderDash: [6, 6],
label: {
- content: `Plafond: ${formatMoney(plafond)}`,
+ content: `= _('Plafond')?>: ${formatMoney(plafond)}`,
enabled: true,
position: 'right'
}
@@ -583,13 +583,13 @@
callbacks: {
label: function(context) {
const plafond = dataConso.plafonds[context.dataIndex];
- let tooltip = `Dépenses: ${formatMoney(context.parsed.y)}`;
+ let tooltip = `= _('Dépenses')?>: ${formatMoney(context.parsed.y)}`;
if (plafond !== null) {
const pourcentage = Math.min(100, Math.round((context.parsed.y / plafond) * 100));
tooltip += ` (${pourcentage}% du plafond)`;
} else {
- tooltip += ' (plafond illimité)';
+ tooltip += ' = _('(plafond illimité)')?>';
}
return tooltip;
@@ -602,7 +602,7 @@
beginAtZero: true,
title: {
display: true,
- text: `Montant des dépenses`,
+ text: '= _("Montant des dépenses") ?>',
font: {
weight: 'bold'
}
@@ -617,7 +617,7 @@
x: {
title: {
display: true,
- text: 'Garanties',
+ text: '= _('Garanties')?>',
font: {
weight: 'bold'
}
diff --git a/Vue/Fichepolice/index.php b/Vue/Fichepolice/index.php
index 3668111..2f6ad2f 100644
--- a/Vue/Fichepolice/index.php
+++ b/Vue/Fichepolice/index.php
@@ -14,6 +14,20 @@
$etatPolice = $isAnglophone ? $police['etatPoliceEng'] : $police['etatPolice'];
$prestationPossible = $this->nettoyer($police['prestationPossible']);
+
+
+
+ var_dump(array(
+ '0: ' => $_SESSION['lang'],
+ '1: ' => dateLang($this->nettoyer($police['dateEffet']), $_SESSION['lang']),
+ '2: ' => dateLang("2025-01-11", $_SESSION['lang']),
+ '3: ' => dateLang("2025-01-11", "en_US"),
+ '4: ' => dateLang("2025-01-11", "fr_FR"),
+ '5: ' => $this->nettoyer($police['dateEffet']),
+ '6: ' => dateEng("2025-01-11"),
+ '7: ' => dateFr("2025-01-11"),
+ '8: ' => strtotime("2025-01-11")
+ ));
?>
@@ -171,7 +185,7 @@
- | = dateheureLang($this->nettoyer($ged['dateSysteme'])) ?> |
+ = dateheureLang($this->nettoyer($ged['dateSysteme']), $_SESSION['lang']) ?> |
= $this->nettoyer($ged['nomOrigine']) ?>
@@ -196,7 +210,7 @@
= _("Quittances du") ?>
-
+
= _("au") ?>
diff --git a/Vue/Ficheretrait/index.php b/Vue/Ficheretrait/index.php
index ec8553b..4c4f893 100644
--- a/Vue/Ficheretrait/index.php
+++ b/Vue/Ficheretrait/index.php
@@ -27,12 +27,12 @@
- | = dateLang($this->nettoyer($emission['dateEffet'])) ?> |
- = dateLang($this->nettoyer($emission['dateEcheance'])) ?> |
+ = dateLang($this->nettoyer($emission['dateEffet']), $_SESSION['lang']) ?> |
+ = dateLang($this->nettoyer($emission['dateEcheance']), $_SESSION['lang']) ?> |
= $this->nettoyer($emission['dureePolice']) ?> |
- = dateLang($this->nettoyer($avenant['dateEffet'])) ?> |
- = dateLang($this->nettoyer($avenant['dateEcheance'])) ?> |
+ = dateLang($this->nettoyer($avenant['dateEffet']), $_SESSION['lang']) ?> |
+ = dateLang($this->nettoyer($avenant['dateEcheance']), $_SESSION['lang']) ?> |
= $this->nettoyer($avenant['dureeAvenant']) ?> |
diff --git a/Vue/Importassure/index.php b/Vue/Importassure/index.php
index 5d30041..21ba084 100644
--- a/Vue/Importassure/index.php
+++ b/Vue/Importassure/index.php
@@ -1,7 +1,11 @@
nettoyer($police['etatPolice']);
+ $etatPolice =
+ $etatPolice = est_anglophone()
+ ? $this->nettoyer($police['etatPoliceEng'])
+ : $this->nettoyer($police['etatPolice']);
+
$codeEtat = $this->nettoyer($police['codeEtatPolice']);
-
+ //
?>
@@ -32,8 +36,8 @@
= _("Période") ?>
- Du = dateLang($this->nettoyer($police['dateEffet'])) ?>
- Au = dateLang($this->nettoyer($police['dateEcheance'])) ?>
+ = _('Du').' '.dateLang($this->nettoyer($police['dateEffet']),$_SESSION['lang']) ?>
+ = _('Au').' '.dateLang($this->nettoyer($police['dateEcheance']),$_SESSION['lang'])?>
diff --git a/Vue/Listeavenant/index.php b/Vue/Listeavenant/index.php
index 30bdf03..9a6c38c 100644
--- a/Vue/Listeavenant/index.php
+++ b/Vue/Listeavenant/index.php
@@ -39,7 +39,7 @@
= $libelleAvenant ?>
- = dateheureLang($this->nettoyer($avenant['dateSysteme'])) ?>
+ = dateheureLang($this->nettoyer($avenant['dateSysteme']), $_SESSION['lang']) ?>
|
diff --git a/Vue/Listeimportassure/index.php b/Vue/Listeimportassure/index.php
index 61fb278..767a47f 100644
--- a/Vue/Listeimportassure/index.php
+++ b/Vue/Listeimportassure/index.php
@@ -115,8 +115,8 @@
= $this->nettoyer($beneficiaire['sexe']) ?>
|
- = _("Né le") ?> = dateLang($this->nettoyer($beneficiaire['dateNaissance'])) ?>
- = _("Effet") ?> = dateLang($this->nettoyer($beneficiaire['dateEffet'])) ?>
+ = _("Né le") ?> = dateLang($this->nettoyer($beneficiaire['dateNaissance']), $_SESSION['lang']) ?>
+ = _("Effet") ?> = dateLang($this->nettoyer($beneficiaire['dateEffet']), $_SESSION['lang']) ?>
|
= format_N($this->nettoyer($beneficiaire['primeHt'])) ?> |
= format_N($this->nettoyer($beneficiaire['primeTtc'])) ?> |
diff --git a/Vue/Nonfacturepolice/index.php b/Vue/Nonfacturepolice/index.php
index 1c685e2..90a1f90 100644
--- a/Vue/Nonfacturepolice/index.php
+++ b/Vue/Nonfacturepolice/index.php
@@ -63,7 +63,7 @@
|
- = dateLang($this->nettoyer($nonfacture['dateEffet'])) ?>
+ = dateLang($this->nettoyer($nonfacture['dateEffet']), $_SESSION['lang']) ?>
|
= format_N($nonfacture['nbLignes']) ?>
diff --git a/Vue/Nonfacturepolicecons/index.php b/Vue/Nonfacturepolicecons/index.php
index 9ae2d81..518ae3b 100644
--- a/Vue/Nonfacturepolicecons/index.php
+++ b/Vue/Nonfacturepolicecons/index.php
@@ -47,7 +47,7 @@
|
- | = dateLang($this->nettoyer($nonfacture['dateEffet'])) ?> |
+ = dateLang($this->nettoyer($nonfacture['dateEffet']), $_SESSION['lang']) ?> |
= format_N($this->nettoyer($nonfacture['nbLignes'])) ?> |
= format_N($this->nettoyer($nonfacture['primeHt'])) ?> |
= format_N($this->nettoyer($nonfacture['taxe'])) ?> |
diff --git a/Vue/Rechercherassure/index.php b/Vue/Rechercherassure/index.php
index 0237e42..f8a173a 100644
--- a/Vue/Rechercherassure/index.php
+++ b/Vue/Rechercherassure/index.php
@@ -83,7 +83,7 @@
= $this->nettoyer($beneficiaire['codeLienParente']) ?>
= $this->nettoyer($beneficiaire['sexe']) ?>
- = dateLang($this->nettoyer($beneficiaire['dateNaissance'])) ?> |
+ = dateLang($this->nettoyer($beneficiaire['dateNaissance']), $_SESSION['lang']) ?> |
= $this->nettoyer($beneficiaire['telephonePortable']) ?: '--' ?>
|
diff --git a/Vue/Spadherent/index.php b/Vue/Spadherent/index.php
index a077f6a..68d2b60 100644
--- a/Vue/Spadherent/index.php
+++ b/Vue/Spadherent/index.php
@@ -36,7 +36,7 @@
= _("Membre sorti le") ?>
- = dateLang($dateSortieAdherent) ?>
+ = dateLang($dateSortieAdherent, $_SESSION['lang']) ?>
@@ -89,9 +89,9 @@
| = _("Effet / Échéance") ?> |
- = dateLang($this->nettoyer($spadherent['dateEffet'])) ?>
+ = dateLang($this->nettoyer($spadherent['dateEffet']), $_SESSION['lang']) ?>
- = dateLang($this->nettoyer($spadherent['dateEcheance'])) ?>
+ = dateLang($this->nettoyer($spadherent['dateEcheance']), $_SESSION['lang']) ?>
|
@@ -124,7 +124,7 @@
| = _("Effet Famille") ?> |
- = dateLang($this->nettoyer($spadherent['dateEffetAdherent'])) ?>
+ = dateLang($this->nettoyer($spadherent['dateEffetAdherent']), $_SESSION['lang']) ?>
|
diff --git a/Vue/Sppolice/index.php b/Vue/Sppolice/index.php
index 83a63fa..9b43da4 100644
--- a/Vue/Sppolice/index.php
+++ b/Vue/Sppolice/index.php
@@ -22,12 +22,12 @@
= _("Effet") ?>
- = dateLang($this->nettoyer($sppoliceentete['dateEffet'])) ?>
+ = dateLang($this->nettoyer($sppoliceentete['dateEffet']), $_SESSION['lang']) ?>
= _("Échéance") ?>
- = dateLang($this->nettoyer($sppoliceentete['dateEcheance'])) ?>
+ = dateLang($this->nettoyer($sppoliceentete['dateEcheance']), $_SESSION['lang']) ?>
diff --git a/Vue/Syntheseconsopolice/index.php b/Vue/Syntheseconsopolice/index.php
index 3d14e3c..fbc510f 100644
--- a/Vue/Syntheseconsopolice/index.php
+++ b/Vue/Syntheseconsopolice/index.php
@@ -14,12 +14,12 @@
= _("Effet") ?>
- = dateLang($this->nettoyer($sppoliceentete['dateEffet'])) ?>
+ = dateLang($this->nettoyer($sppoliceentete['dateEffet']), $_SESSION['lang']) ?>
= _("Échéance") ?>
- = dateLang($this->nettoyer($sppoliceentete['dateEcheance'])) ?>
+ = dateLang($this->nettoyer($sppoliceentete['dateEcheance']), $_SESSION['lang']) ?>
diff --git a/Vue/gabarit.php b/Vue/gabarit.php
index 4e8a84d..6d93165 100755
--- a/Vue/gabarit.php
+++ b/Vue/gabarit.php
@@ -527,12 +527,12 @@ $photoAssureCrypte = $_SESSION['photoAssureCrypte'];
= _('Actions rapides') ?>
-
+
|