diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 7742b7c42b2..5eba016e0b1 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -687,7 +687,7 @@ if ($step == 3 && $datatoimport) } else { - show_elem('','',$var,''); + show_elem('','',$var,'none'); } print "\n"; @@ -945,6 +945,9 @@ $db->close(); llxFooter('$Date$ - $Revision$'); +/* + * Function to put the movable box of a source field + */ function show_elem($fieldssource,$pos,$var,$key) { global $langs,$bc; @@ -954,7 +957,15 @@ function show_elem($fieldssource,$pos,$var,$key) print ''."\n"; print ''; - if (! empty($key)) + if (empty($key)) + { + print ''; + } + elseif ($key == 'none') + { + print ''; + } + else { //print ''; print ''; } - else print ''; print ''; print "
 '.$langs->trans("NoDiscardedFields").''.img_file('','').''; @@ -966,7 +977,6 @@ function show_elem($fieldssource,$pos,$var,$key) print $fieldssource[$key]['name'].' ('.$fieldssource[$key]['example1'].')'; print ' 
\n"; diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index 04598aa641c..15e69592f66 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -22,7 +22,8 @@ ImportModelSaved=Import profile saved under name %s. ImportableFields=Importable fields ImportedFields=Imported fields DatasetToExport=Dataset to export -DatasetToImport=Dataset to import +DatasetToImport=Import file into dataset +NoDiscardedFields=No fields in source file are discarded Dataset=Dataset ChooseFieldsOrdersAndTitle=Choose fields order... FieldsOrder=Fields order diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang index c88eda7f172..a52805fe7da 100644 --- a/htdocs/langs/fr_FR/exports.lang +++ b/htdocs/langs/fr_FR/exports.lang @@ -22,7 +22,8 @@ ImportModelSaved=Profil d'import sauvé sous le nom %s. ImportableFields=Champs importables ImportedFields=Champs à importer DatasetToExport=Lot de données à exporter -DatasetToImport=Lot de données à importer +DatasetToImport=Importer fichier dans la base de +NoDiscardedFields=Aucun champ du fichier source écarté Dataset=Lot de données ChooseFieldsOrdersAndTitle=Choisissez l'ordre des champs... FieldsOrder=Ordre des champs