bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-12-18 14:33:49 +01:00
Code Issues Projects Releases Wiki Activity

search: handle translation of LSformat, alternativeLSformats and formaterLSformat

Browse source
This commit is contained in:
Benjamin Renard 2022-09-30 10:37:55 +02:00
parent 466dec4a64
commit a0ceb1dbdc
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/includes/class/class.LSlang.php
View file

@ -625,6 +625,9 @@ function cli_generate_lang_file($command_args) {
// LSsearch // LSsearch
addFromLSconfig("LSobjects.$obj.LSsearch.predefinedFilters.*"); addFromLSconfig("LSobjects.$obj.LSsearch.predefinedFilters.*");
addFromLSconfig("LSobjects.$obj.LSsearch.extraDisplayedColumns.*.label"); 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.*.label");
addFromLSconfig("LSobjects.$obj.LSsearch.customActions.*.question_format"); addFromLSconfig("LSobjects.$obj.LSsearch.customActions.*.question_format");
addFromLSconfig("LSobjects.$obj.LSsearch.customActions.*.onSuccessMsgFormat"); addFromLSconfig("LSobjects.$obj.LSsearch.customActions.*.onSuccessMsgFormat");

6
src/includes/class/class.LSsearchEntry.php
View file

@ -208,16 +208,16 @@ class LSsearchEntry extends LSlog_staticLoggerClass {
$ret=call_user_func_array($this->LSsearch->extraDisplayedColumns[$key]['generateFunction'],array(&$this)); $ret=call_user_func_array($this->LSsearch->extraDisplayedColumns[$key]['generateFunction'],array(&$this));
} }
else { 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'])) { if (empty($ret) && is_array($this->LSsearch->extraDisplayedColumns[$key]['alternativeLSformats'])) {
foreach($this->LSsearch->extraDisplayedColumns[$key]['alternativeLSformats'] as $format) { foreach($this->LSsearch->extraDisplayedColumns[$key]['alternativeLSformats'] as $format) {
$ret=$this -> getFData($format); $ret=$this -> getFData(__($format));
if (!empty($ret)) break; if (!empty($ret)) break;
} }
} }
if (!empty($ret) && isset($this->LSsearch->extraDisplayedColumns[$key]['formaterLSformat'])) { if (!empty($ret) && isset($this->LSsearch->extraDisplayedColumns[$key]['formaterLSformat'])) {
$this -> registerOtherValue('val',$ret); $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 (!empty($ret) && isset($this->LSsearch->extraDisplayedColumns[$key]['formaterFunction'])) {
if (is_callable($this->LSsearch->extraDisplayedColumns[$key]['formaterFunction'])) { if (is_callable($this->LSsearch->extraDisplayedColumns[$key]['formaterFunction'])) {