diff --git a/src/includes/class/class.LSlang.php b/src/includes/class/class.LSlang.php index bf56d8ac..fc4106b4 100644 --- a/src/includes/class/class.LSlang.php +++ b/src/includes/class/class.LSlang.php @@ -929,6 +929,9 @@ function cli_generate_lang_file($command_args) { _cli_add_str_to_translate_from_LSconfig("LSobjects.$obj.LSform.layout.*.label"); _cli_add_str_to_translate_from_LSconfig("LSobjects.$obj.LSform.dataEntryForm.*.label"); + // LSioFormat + _cli_add_str_to_translate_from_LSconfig("LSobjects.$obj.ioFormat.*.label"); + // LSsearch _cli_add_str_to_translate_from_LSconfig("LSobjects.$obj.LSsearch.predefinedFilters.*"); _cli_add_str_to_translate_from_LSconfig("LSobjects.$obj.LSsearch.extraDisplayedColumns.*.label"); diff --git a/src/includes/class/class.LSldapObject.php b/src/includes/class/class.LSldapObject.php index 68e522dd..8ad88246 100644 --- a/src/includes/class/class.LSldapObject.php +++ b/src/includes/class/class.LSldapObject.php @@ -2032,7 +2032,7 @@ class LSldapObject extends LSlog_staticLoggerClass { $ioFormats = $this -> getConfig('ioFormat'); if (is_array($ioFormats)) { foreach($ioFormats as $name => $conf) { - $ret[$name] = _((isset($conf['label'])?$conf['label']:$name)); + $ret[$name] = __((isset($conf['label'])?$conf['label']:$name)); } } return $ret; diff --git a/src/lang/fr_FR.UTF8/lang.php b/src/lang/fr_FR.UTF8/lang.php index af532f36..61e08b2f 100644 --- a/src/lang/fr_FR.UTF8/lang.php +++ b/src/lang/fr_FR.UTF8/lang.php @@ -109,6 +109,10 @@ $GLOBALS['LSlang'] = array ( "Company" => "Société", +# LSobjects.LSpeople.ioFormat.myfullcsv.label +"Complete CSV" => + "CSV Complet", + # LSobjects.LSpeople.attrs.pwdHistory.html_options.components.time.label # LSobjects.LSsysaccount.attrs.pwdHistory.html_options.components.time.label "Date added to history" => @@ -693,6 +697,10 @@ $GLOBALS['LSlang'] = array ( "Simple" => "Simple", +# LSobjects.LSpeople.ioFormat.mycsv.label +"Simple CSV" => + "CSV Simple", + # LSobjects.LSpeople.attrs.sambaKickoffTime.help_info "Specifies the time when the user will be locked down and cannot login any longer." => "Détermine la date à partir de laquelle l'utilisateur sera bloqué et ne pourra plus se connecter.",