From 309dd22cea9d3a161d55c242ab179da02133b9c5 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sat, 8 Sep 2007 18:50:17 +0000 Subject: [PATCH] Fix: traduction --- htdocs/exports/export.php | 2 +- .../includes/modules/export/export_excel.modules.php | 9 ++++++--- .../php_writeexcel/class.writeexcel_workbook.inc.php | 12 ++++++++++++ htdocs/langs/en_US/exports.lang | 1 + htdocs/langs/fr_FR/exports.lang | 1 + 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index eefc8c7ce39..c26c5b570b4 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -620,7 +620,7 @@ if ($step == 4 && $datatoexport) print ''; // test d'affichage du tableau excel - /* + /* print '
'; viewExcelFileContent($conf->export->dir_temp.'/1/export_commande_1.xls'); print '
'; diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php index 61a06cabcfc..2814a9f1f75 100644 --- a/htdocs/includes/modules/export/export_excel.modules.php +++ b/htdocs/includes/modules/export/export_excel.modules.php @@ -23,7 +23,7 @@ /** \file htdocs/includes/modules/export/export_excel.modules.php \ingroup export - \brief Fichier de la classe permettant de générer les export au format CSV + \brief Fichier de la classe permettant de générer les export au format Excel \author Laurent Destailleur \version $Revision$ */ @@ -34,8 +34,8 @@ require_once(PHP_WRITEEXCEL_PATH."/class.writeexcel_worksheet.inc.php"); /** - \class ExportCsv - \brief Classe permettant de générer les factures au modèle Crabe + \class ExportExcel + \brief Classe permettant de générer les export au format Excel */ class ExportExcel extends ModeleExports @@ -109,8 +109,11 @@ class ExportExcel extends ModeleExports function open_file($file) { + global $langs; + $langs->load("exports"); dolibarr_syslog("ExportExcel::open_file file=$file"); $this->workbook = &new writeexcel_workbookbig($file); + $this->workbook->set_sheetname($langs->trans("Sheet")); $this->worksheet = &$this->workbook->addworksheet(); // $this->worksheet->set_column(0, 50, 18); diff --git a/htdocs/includes/php_writeexcel/class.writeexcel_workbook.inc.php b/htdocs/includes/php_writeexcel/class.writeexcel_workbook.inc.php index 184c76116f6..76f5da919b9 100644 --- a/htdocs/includes/php_writeexcel/class.writeexcel_workbook.inc.php +++ b/htdocs/includes/php_writeexcel/class.writeexcel_workbook.inc.php @@ -430,6 +430,18 @@ function set_codepage($cp) { $this->_codepage = $codepage; } +############################################################################### +# +# set_sheetname() +# +# Set the sheetname +# +function set_sheetname($sheetname) { + + if($sheetname) + $this->_sheetname = $sheetname; +} + ############################################################################### # diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index 8d8aac55a77..adad260cf75 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -24,3 +24,4 @@ FormatedExport=Export assistant FormatedExportDesc1=This area allows to export personalized data using an assistant to help in process without technical knowledge. FormatedExportDesc2=First step is to choose a predefined dataset, then to choose which fields you want in your result files, and which order. FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to. +Sheet=Sheet \ No newline at end of file diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang index 755dbd63b7e..22965070212 100644 --- a/htdocs/langs/fr_FR/exports.lang +++ b/htdocs/langs/fr_FR/exports.lang @@ -24,3 +24,4 @@ FormatedExport=Assistant export FormatedExportDesc1=Cet espace permet de réaliser des exports personalisés des données via un assistant qui évite d'avoir des connaissances techniques de Dolibarr. FormatedExportDesc2=La première étape est de choisir un des lots de données prédéfinis, ensuite de choisir les champs que vous voulez dans votre fichier résultat, et dans quel ordre. FormatedExportDesc3=Une fois les données sélectionnées, il est possible de choisir le format du fichier export généré. +Sheet=Feuille \ No newline at end of file