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

Merge pull request #381 from marcosgdf/minor

Browse Source 
Translation improvements
This commit is contained in:
Regis Houssin 2012-09-10 07:56:37 -07:00
commit de54481129
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/admin/dict.php
View File

@ -883,7 +883,7 @@ if ($id)
$valuetoshow=($key != "Country".strtoupper($obj->pays_code))?$obj->pays_code." - ".$key:$obj->pays; $valuetoshow=($key != "Country".strtoupper($obj->pays_code))?$obj->pays_code." - ".$key:$obj->pays;
} }
} }
else if ($fieldlist[$field]=='recuperableonly' || $fieldlist[$field]=='fdm') { else if ($fieldlist[$field]=='recuperableonly' || $fieldlist[$field]=='fdm' || $fieldlist[$field] == 'deductible') {
$valuetoshow=yn($valuetoshow); $valuetoshow=yn($valuetoshow);
} }
else if ($fieldlist[$field]=='price' || preg_match('/^amount/i',$fieldlist[$field])) { else if ($fieldlist[$field]=='price' || preg_match('/^amount/i',$fieldlist[$field])) {
@ -969,6 +969,13 @@ if ($id)
else if ($fieldlist[$field]=='unicode') { else if ($fieldlist[$field]=='unicode') {
$valuetoshow = getCurrencySymbol($obj->code); $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>'; if ($showfield) print '<td>'.$valuetoshow.'</td>';
} }
} }
@ -1140,7 +1147,7 @@ function fieldList($fieldlist,$obj='',$tabname='')
print 'user<input type="hidden" name="type" value="user">'; print 'user<input type="hidden" name="type" value="user">';
print '</td>'; print '</td>';
} }
elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'fdm') { elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'fdm' || $fieldlist[$field] == 'deductible') {
print '<td>'; print '<td>';
print $form->selectyesno($fieldlist[$field],(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''),1); print $form->selectyesno($fieldlist[$field],(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:''),1);
print '</td>'; print '</td>';
@ -1159,7 +1166,12 @@ function fieldList($fieldlist,$obj='',$tabname='')
} }
elseif ($fieldlist[$field]=='unit') { elseif ($fieldlist[$field]=='unit') {
print '<td>'; 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>'; print '</td>';
} }
else else

1
htdocs/langs/en_US/other.lang
View File

@ -123,6 +123,7 @@ SizeUnitcm=cm
SizeUnitmm=mm SizeUnitmm=mm
SizeUnitinch=inch SizeUnitinch=inch
SizeUnitfoot=foot SizeUnitfoot=foot
SizeUnitpoint=point
BugTracker=Bug tracker 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. 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 BackToLoginPage=Back to login page

1
htdocs/langs/es_ES/other.lang
View File

@ -119,6 +119,7 @@ SizeUnitcm=cm
SizeUnitmm=mm SizeUnitmm=mm
SizeUnitinch=pulgada SizeUnitinch=pulgada
SizeUnitfoot=pie SizeUnitfoot=pie
SizeUnitpoint=punto
BugTracker=Incidencias 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. 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 BackToLoginPage=Volver a la página de conexión

1
htdocs/langs/fr_FR/other.lang
View File

@ -122,6 +122,7 @@ SizeUnitcm=cm
SizeUnitmm=mm SizeUnitmm=mm
SizeUnitinch=pouce SizeUnitinch=pouce
SizeUnitfoot=pied SizeUnitfoot=pied
SizeUnitpoint=point
BugTracker=Bug tracker 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. 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 BackToLoginPage=Retour page de connexion