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

Modified traslation keys to reflect expected translation

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/holiday/class/holiday.class.php
View File

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

6
htdocs/holiday/fiche.php
View File

@ -703,7 +703,7 @@ if (empty($id) || $action == 'add' || $action == 'request')
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
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 // Liste des utiliseurs du groupes choisi dans la config
$idGroupValid = $cp->getConfCP('userGroup'); $idGroupValid = $cp->getConfCP('userGroup');
@ -956,12 +956,12 @@ else
if(!$edit) { if(!$edit) {
print '<tr>'; 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 '<td>'.$valideur->getNomUrl(1).'</td>';
print '</tr>'; print '</tr>';
} else { } else {
print '<tr>'; 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 // Liste des utiliseurs du groupes choisi dans la config
$idGroupValid = $cp->getConfCP('userGroup'); $idGroupValid = $cp->getConfCP('userGroup');

6
htdocs/langs/bg_BG/holiday.lang
View File

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

6
htdocs/langs/en_US/holiday.lang
View File

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

6
htdocs/langs/es_ES/holiday.lang
View File

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

6
htdocs/langs/fr_FR/holiday.lang
View File

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