diff --git a/src/includes/class/class.LSlang.php b/src/includes/class/class.LSlang.php index 85cf7807..7499204c 100644 --- a/src/includes/class/class.LSlang.php +++ b/src/includes/class/class.LSlang.php @@ -625,6 +625,9 @@ function cli_generate_lang_file($command_args) { // LSsearch addFromLSconfig("LSobjects.$obj.LSsearch.predefinedFilters.*"); addFromLSconfig("LSobjects.$obj.LSsearch.extraDisplayedColumns.*.label"); + addFromLSconfig("LSobjects.$obj.LSsearch.extraDisplayedColumns.*.LSformat"); + addFromLSconfig("LSobjects.$obj.LSsearch.extraDisplayedColumns.*.alternativeLSformats.*"); + addFromLSconfig("LSobjects.$obj.LSsearch.extraDisplayedColumns.*.formaterLSformat"); addFromLSconfig("LSobjects.$obj.LSsearch.customActions.*.label"); addFromLSconfig("LSobjects.$obj.LSsearch.customActions.*.question_format"); addFromLSconfig("LSobjects.$obj.LSsearch.customActions.*.onSuccessMsgFormat"); diff --git a/src/includes/class/class.LSsearchEntry.php b/src/includes/class/class.LSsearchEntry.php index 01b8c9c9..ba8a81b8 100644 --- a/src/includes/class/class.LSsearchEntry.php +++ b/src/includes/class/class.LSsearchEntry.php @@ -208,16 +208,16 @@ class LSsearchEntry extends LSlog_staticLoggerClass { $ret=call_user_func_array($this->LSsearch->extraDisplayedColumns[$key]['generateFunction'],array(&$this)); } else { - $ret=$this -> getFData($this->LSsearch->extraDisplayedColumns[$key]['LSformat']); + $ret=$this -> getFData(__($this->LSsearch->extraDisplayedColumns[$key]['LSformat'])); if (empty($ret) && is_array($this->LSsearch->extraDisplayedColumns[$key]['alternativeLSformats'])) { foreach($this->LSsearch->extraDisplayedColumns[$key]['alternativeLSformats'] as $format) { - $ret=$this -> getFData($format); + $ret=$this -> getFData(__($format)); if (!empty($ret)) break; } } if (!empty($ret) && isset($this->LSsearch->extraDisplayedColumns[$key]['formaterLSformat'])) { $this -> registerOtherValue('val',$ret); - $ret=$this -> getFData($this->LSsearch->extraDisplayedColumns[$key]['formaterLSformat']); + $ret=$this -> getFData(__($this->LSsearch->extraDisplayedColumns[$key]['formaterLSformat'])); } if (!empty($ret) && isset($this->LSsearch->extraDisplayedColumns[$key]['formaterFunction'])) { if (is_callable($this->LSsearch->extraDisplayedColumns[$key]['formaterFunction'])) {