Modified traslation keys to reflect expected translation

This commit is contained in:
Marcos García 2013-04-27 14:50:14 +02:00
parent 8e7b72d09e
commit bd2b363e40
6 changed files with 22 additions and 22 deletions

View File

@ -678,8 +678,8 @@ class Holiday extends CommonObject
if ($mode == 0)
{
if ($statut == 1) return $langs->trans('DraftCP');
if ($statut == 2) return $langs->trans('ToValidateCP');
if ($statut == 3) return $langs->trans('ValidateCP');
if ($statut == 2) return $langs->trans('ToReviewCP');
if ($statut == 3) return $langs->trans('ApprovedCP');
if ($statut == 4) return $langs->trans('CancelCP');
if ($statut == 5) return $langs->trans('RefuseCP');
}
@ -688,8 +688,8 @@ class Holiday extends CommonObject
$pictoapproved='statut6';
if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0').' '.$langs->trans('DraftCP'); // Draft
if ($statut == 2) return img_picto($langs->trans('ToValidateCP'),'statut1').' '.$langs->trans('ToValidateCP'); // Waiting approval
if ($statut == 3) return img_picto($langs->trans('ValidateCP'),$pictoapproved).' '.$langs->trans('ValidateCP');
if ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1').' '.$langs->trans('ToReviewCP'); // Waiting approval
if ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved).' '.$langs->trans('ApprovedCP');
if ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5').' '.$langs->trans('CancelCP');
if ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5').' '.$langs->trans('RefuseCP');
}
@ -698,8 +698,8 @@ class Holiday extends CommonObject
$pictoapproved='statut6';
if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0'); // Draft
if ($statut == 2) return $langs->trans('ToValidateCP').' '.img_picto($langs->trans('ToValidateCP'),'statut1'); // Waiting approval
if ($statut == 3) return $langs->trans('ValidateCP').' '.img_picto($langs->trans('ValidateCP'),$pictoapproved);
if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1'); // Waiting approval
if ($statut == 3) return $langs->trans('ApproveCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
}
@ -719,7 +719,7 @@ class Holiday extends CommonObject
global $langs;
// Liste des statuts
$name = array('DraftCP','ToValidateCP','ValidateCP','CancelCP','RefuseCP');
$name = array('DraftCP','ToReviewCP','ApproveCP','CancelCP','RefuseCP');
$nb = count($name)+1;
// Select HTML

View File

@ -703,7 +703,7 @@ if (empty($id) || $action == 'add' || $action == 'request')
print '</td>';
print '</tr>';
print '<tr>';
print '<td class="fieldrequired">'.$langs->trans("ValidateByCP").'</td>';
print '<td class="fieldrequired">'.$langs->trans("ReviewedByCP").'</td>';
// Liste des utiliseurs du groupes choisi dans la config
$idGroupValid = $cp->getConfCP('userGroup');
@ -956,12 +956,12 @@ else
if(!$edit) {
print '<tr>';
print '<td width="50%">'.$langs->trans('ValidateByCP').'</td>';
print '<td width="50%">'.$langs->trans('ReviewedByCP').'</td>';
print '<td>'.$valideur->getNomUrl(1).'</td>';
print '</tr>';
} else {
print '<tr>';
print '<td width="50%">'.$langs->trans('ValidateByCP').'</td>';
print '<td width="50%">'.$langs->trans('ReviewedByCP').'</td>';
// Liste des utiliseurs du groupes choisi dans la config
$idGroupValid = $cp->getConfCP('userGroup');

View File

@ -21,13 +21,13 @@ DateDebCP=Начална дата
DateFinCP=Крайна дата
DateCreateCP=Дата на създаване
DraftCP=Проект
ToValidateCP=Очаква одобрение
ValidateCP=Утвърден
ToApproveCP=Очаква одобрение
ApprovedCP=Утвърден
CancelCP=Отменен
RefuseCP=Отказ
ValidatorCP=Validator
ListeCP=Списък на празници
ValidateByCP=Ще бъдат утвърдени от
ReviewedByCP=Ще бъдат утвърдени от
DescCP=Описание
SendRequestCP=Създаване търсенето за празниците
DelayToRequestCP=Заявленията за почивка трябва да бъдат направени най-малко <b>дни %s (а),</b> преди да ги.

View File

@ -15,13 +15,13 @@ DateDebCP=Start date
DateFinCP=End date
DateCreateCP=Creation date
DraftCP=Draft
ToValidateCP=Awaiting approval
ValidateCP=Approved
ToApproveCP=Awaiting approval
ApprovedCP=Approved
CancelCP=Canceled
RefuseCP=Refused
ValidatorCP=Approbator
ListeCP=List of holidays
ValidateByCP=Will be reviewed by
ReviewedByCP=Will be reviewed by
DescCP=Description
SendRequestCP=Creating demand for holidays
DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.

View File

@ -15,13 +15,13 @@ DateDebCP=Fecha inicio
DateFinCP=Fecha fin
DateCreateCP=Fecha de creación
DraftCP=Borrador
ToValidateCP=En espera de aprobación
ValidateCP=Aprobada
ToApproveCP=En espera de aprobación
ApprovedCP=Aprobada
CancelCP=Anulada
RefuseCP=Rechazada
ValidatorCP=Validador
ListeCP=Lista de vacaciones
ValidateByCP=Será revisada por
ReviewedByCP=Será revisada por
DescCP=Descripción
SendRequestCP=Enviar la petición de vacaciones
DelayToRequestCP=Las peticiones de vacaciones deben realizarse al menos <b>%s días</b> antes.

View File

@ -15,13 +15,13 @@ DateDebCP=Date Début
DateFinCP=Date Fin
DateCreateCP=Date de création
DraftCP=Brouillon
ToValidateCP=En attente d'approbation
ValidateCP=Approuvé
ToApproveCP=En attente d'approbation
ApprovedCP=Approuvé
CancelCP=Annulée
RefuseCP=Refusée
ValidatorCP=Approbateur
ListeCP=Liste des congés
ValidateByCP=Sera approuvé par
ReviewedByCP=Sera approuvé par
DescCP=Description
SendRequestCP=Envoyer la demande de congés
DelayToRequestCP=Les demandes de congés doivent être faites au moins <b>%s jours</b> avant la date</b> de ceux-ci.