diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php index 5e6653e3054..02f4a9d7c2d 100644 --- a/htdocs/includes/modules/export/export_csv.modules.php +++ b/htdocs/includes/modules/export/export_csv.modules.php @@ -53,7 +53,7 @@ class ExportCsv extends ModeleExports */ function ExportCsv($db) { - global $conf; + global $conf,$langs; $this->db = $db; $this->separator=','; @@ -63,7 +63,7 @@ class ExportCsv extends ModeleExports $this->id='csv'; // Same value then xxx in file name export_xxx.modules.php $this->label='Csv'; // Label of driver - $this->desc='Comma Separated Value file format (.csv).
This is a text file format where fields are separated by separator [ '.$this->separator.' ]. If separator is found inside a field content, field is rounded by round character [ '.$this->enclosure.' ]. Escape character to escape round character is [ '.$this->escape.' ].'; + $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto $ver=explode(' ','$Revision$'); diff --git a/htdocs/includes/modules/import/import_csv.modules.php b/htdocs/includes/modules/import/import_csv.modules.php index d19e007baa3..fe45b2f90d6 100644 --- a/htdocs/includes/modules/import/import_csv.modules.php +++ b/htdocs/includes/modules/import/import_csv.modules.php @@ -57,7 +57,7 @@ class ImportCsv extends ModeleImports */ function ImportCsv($db) { - global $conf; + global $conf,$langs; $this->db = $db; $this->separator=','; @@ -67,7 +67,8 @@ class ImportCsv extends ModeleImports $this->id='csv'; // Same value then xxx in file name export_xxx.modules.php $this->label='Csv'; // Label of driver - $this->desc='Comma Separated Value file format (.csv).
This is a text file format where fields are separated by separator [ '.$this->separator.' ]. If separator is found inside a field content, field is rounded by round character [ '.$this->enclosure.' ]. Escape character to escape round character is [ '.$this->escape.' ].'; + $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape); + //$this->desc='Comma Separated Value file format (.csv).
This is a text file format where fields are separated by separator [ '.$this->separator.' ]. If separator is found inside a field content, field is rounded by round character [ '.$this->enclosure.' ]. Escape character to escape round character is [ '.$this->escape.' ].'; $this->extension='csv'; // Extension for generated file by this driver $this->picto='mime/other'; // Picto $ver=explode(' ','$Revision$'); diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index ae4aa035ff9..25bb3b518fe 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -105,4 +105,5 @@ DataComeFromIdFoundFromRef=Value that comes from field number %s of sourc DataIsInsertedInto=Data coming from source file will be inserted into the following field: DataIDSourceIsInsertedInto=The id of parent object found using the data in source file, will be inserted into the following field: SourceRequired=Data value is mandatory -SourceExample=Example of possible data value \ No newline at end of file +SourceExample=Example of possible data value +CSVFormatDesc=Comma Separated Value file format (.csv).
This is a text file format where fields are separated by separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ]. \ No newline at end of file diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang index 4de8917af92..d5c741ecbea 100644 --- a/htdocs/langs/fr_FR/exports.lang +++ b/htdocs/langs/fr_FR/exports.lang @@ -106,4 +106,5 @@ DataComeFromIdFoundFromRef=La valeur issue du champ numéro %s du fichier DataIsInsertedInto=La donnée issue du fichier source sera insérée dans le champ suivant: DataIDSourceIsInsertedInto=L'id de l'objet père retrouvé à partir de la donnée source, sera insérée dans le champ suivant: SourceRequired=Donnée source obligatoire -SourceExample=Exemple de donnée source possible \ No newline at end of file +SourceExample=Exemple de donnée source possible +CSVFormatDesc=Fichier au format Comma Separated Value (.csv).
C'est un fichier au format texte dans lequel les champs sont séparés par le caractère [ %s ]. Si le séparateur est trouvé dans le contenu d'un champ, le champ doit être entouré du caractère [ %s ]. Le caractère d'échappement pour inclure un caractère de contour dans une donnée est [ %s ].