Missing paper formats unit translations

This commit is contained in:
Marcos García 2012-09-10 15:14:29 +02:00
parent b92f52cdf9
commit d7d1c8ac65
4 changed files with 16 additions and 1 deletions

View File

@ -969,6 +969,13 @@ if ($id)
else if ($fieldlist[$field]=='unicode') {
$valuetoshow = getCurrencySymbol($obj->code);
}
else if (($fieldlist[$field] == 'unit') && ($tabname[$_GET['id']] == MAIN_DB_PREFIX.'c_paper_format'))
{
$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
$valuetoshow = ($obj->code && ($key != 'SizeUnit'.strtolower($obj->unit))) ? $key : $obj->$fieldlist[$field];
}
if ($showfield) print '<td>'.$valuetoshow.'</td>';
}
}
@ -1159,7 +1166,12 @@ function fieldList($fieldlist,$obj='',$tabname='')
}
elseif ($fieldlist[$field]=='unit') {
print '<td>';
print $form->selectarray('unit',array('mm','cm','point','inch'),(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''),0,0,1);
print $form->selectarray('unit', array(
'mm' => $langs->trans('SizeUnitmm'),
'cm' => $langs->trans('SizeUnitcm'),
'point' => $langs->trans('SizeUnitpoint'),
'inch' => $langs->trans('SizeUnitinch')
), (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''), 0, 0, 0);
print '</td>';
}
else

View File

@ -123,6 +123,7 @@ SizeUnitcm=cm
SizeUnitmm=mm
SizeUnitinch=inch
SizeUnitfoot=foot
SizeUnitpoint=point
BugTracker=Bug tracker
SendNewPasswordDesc=This form allows you to request a new password. It will be send to your email address.<br>Change will be effective only after clicking on confirmation link inside this email.<br>Check your email reader software.
BackToLoginPage=Back to login page

View File

@ -119,6 +119,7 @@ SizeUnitcm=cm
SizeUnitmm=mm
SizeUnitinch=pulgada
SizeUnitfoot=pie
SizeUnitpoint=punto
BugTracker=Incidencias
SendNewPasswordDesc=Este formulario permite enviar una nueva contraseña. Se enviará al e-mail del usuario<br>La modificación de la contraseña no será efectiva hasta que el usuario haga clic en el link de confirmación incluido en este e-mail.<br>Supervise su correo.
BackToLoginPage=Volver a la página de conexión

View File

@ -122,6 +122,7 @@ SizeUnitcm=cm
SizeUnitmm=mm
SizeUnitinch=pouce
SizeUnitfoot=pied
SizeUnitpoint=point
BugTracker=Bug tracker
SendNewPasswordDesc=Ce formulaire permet d'envoyer un nouveau mot de passe. Il sera envoyé à l'adresse email de votre user.<br>La modification du mot de passe ne sera effective qu'après clic par le destinataire du lien de confirmation inclut dans ce mail.<br>Surveillez votre messagerie.
BackToLoginPage=Retour page de connexion