lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX translation in select unit form

Browse Source
This commit is contained in:
John BOTELLA 2018-10-24 10:23:27 +02:00
parent f0dc2df526
commit fccea99e23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/html.form.class.php
View File

@ -3388,13 +3388,19 @@ class Form
while($res = $this->db->fetch_object($resql)) while($res = $this->db->fetch_object($resql))
{ {
$unitLabel = $res->label;
if (! empty($langs->tab_translate['unit'.$res->code])) // check if Translation is available before
{
$unitLabel = $langs->trans('unit'.$res->code)!=$res->label?$langs->trans('unit'.$res->code):$res->label;
}
if ($selected == $res->rowid) if ($selected == $res->rowid)
{ {
$return.='<option value="'.$res->rowid.'" selected>'.($langs->trans('unit'.$res->code)!=$res->label?$langs->trans('unit'.$res->code):$res->label).'</option>'; $return.='<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';
} }
else else
{ {
$return.='<option value="'.$res->rowid.'">'.($langs->trans('unit'.$res->code)!=$res->label?$langs->trans('unit'.$res->code):$res->label).'</option>'; $return.='<option value="'.$res->rowid.'">'.$unitLabel.'</option>';
} }
} }
$return.='</select>'; $return.='</select>';