Merge pull request #19419 from FHenry/dev_new_enhance_trad_select_dictionnary

NEW : for developpers allow translation label in select_dictionnary
This commit is contained in:
Laurent Destailleur 2021-11-30 12:38:18 +01:00 committed by GitHub
commit 40491ca04e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1381,12 +1381,13 @@ class FormOther
while ($i < $num) { while ($i < $num) {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
if ($selected == $obj->rowid || $selected == $obj->$keyfield) { if ($selected == $obj->rowid || $selected == $obj->{$keyfield}) {
print '<option value="'.$obj->$keyfield.'" selected>'; print '<option value="'.$obj->{$keyfield}.'" selected>';
} else { } else {
print '<option value="'.$obj->$keyfield.'">'; print '<option value="'.$obj->{$keyfield}.'">';
} }
print $obj->$labelfield; $label = ($langs->trans($dictionarytable.$obj->{$keyfield}) != ($dictionarytable.$obj->{$labelfield}) ? $langs->trans($dictionarytable.$obj->{$keyfield}) : $obj->{$labelfield});
print $label;
print '</option>'; print '</option>';
$i++; $i++;
} }