From 8e7b72d09ee07edd3f793fd45db12d3d6a91c11a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 27 Apr 2013 14:42:37 +0200 Subject: [PATCH 1/3] Fixed incorrect translations in holidays module --- htdocs/langs/en_US/holiday.lang | 2 +- htdocs/langs/es_ES/holiday.lang | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index 8a5a55f6e01..aa036c74ea8 100755 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -21,7 +21,7 @@ CancelCP=Canceled RefuseCP=Refused ValidatorCP=Approbator ListeCP=List of holidays -ValidateByCP=Will be approved by +ValidateByCP=Will be reviewed by DescCP=Description SendRequestCP=Creating demand for holidays DelayToRequestCP=Applications for holidays must be made at least %s day(s) before them. diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang index 93387f29525..282f8dc1e45 100644 --- a/htdocs/langs/es_ES/holiday.lang +++ b/htdocs/langs/es_ES/holiday.lang @@ -15,13 +15,13 @@ DateDebCP=Fecha inicio DateFinCP=Fecha fin DateCreateCP=Fecha de creación DraftCP=Borrador -ToValidateCP=En espera de validación -ValidateCP=Validada +ToValidateCP=En espera de aprobación +ValidateCP=Aprobada CancelCP=Anulada RefuseCP=Rechazada ValidatorCP=Validador ListeCP=Lista de vacaciones -ValidateByCP=Será validada por +ValidateByCP=Será revisada por DescCP=Descripción SendRequestCP=Enviar la petición de vacaciones DelayToRequestCP=Las peticiones de vacaciones deben realizarse al menos %s días antes. From bd2b363e4023a61cf2bbc2dce12dd955757a0322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 27 Apr 2013 14:50:14 +0200 Subject: [PATCH 2/3] Modified traslation keys to reflect expected translation --- htdocs/holiday/class/holiday.class.php | 14 +++++++------- htdocs/holiday/fiche.php | 6 +++--- htdocs/langs/bg_BG/holiday.lang | 6 +++--- htdocs/langs/en_US/holiday.lang | 6 +++--- htdocs/langs/es_ES/holiday.lang | 6 +++--- htdocs/langs/fr_FR/holiday.lang | 6 +++--- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index b5e3fc4f393..fd6452f8571 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -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 diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php index e7626506dde..f50c77e4fe6 100644 --- a/htdocs/holiday/fiche.php +++ b/htdocs/holiday/fiche.php @@ -703,7 +703,7 @@ if (empty($id) || $action == 'add' || $action == 'request') print ''; print ''; print ''; - print ''.$langs->trans("ValidateByCP").''; + print ''.$langs->trans("ReviewedByCP").''; // Liste des utiliseurs du groupes choisi dans la config $idGroupValid = $cp->getConfCP('userGroup'); @@ -956,12 +956,12 @@ else if(!$edit) { print ''; - print ''.$langs->trans('ValidateByCP').''; + print ''.$langs->trans('ReviewedByCP').''; print ''.$valideur->getNomUrl(1).''; print ''; } else { print ''; - print ''.$langs->trans('ValidateByCP').''; + print ''.$langs->trans('ReviewedByCP').''; // Liste des utiliseurs du groupes choisi dans la config $idGroupValid = $cp->getConfCP('userGroup'); diff --git a/htdocs/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang index 5f0e1065749..250872e523e 100644 --- a/htdocs/langs/bg_BG/holiday.lang +++ b/htdocs/langs/bg_BG/holiday.lang @@ -21,13 +21,13 @@ DateDebCP=Начална дата DateFinCP=Крайна дата DateCreateCP=Дата на създаване DraftCP=Проект -ToValidateCP=Очаква одобрение -ValidateCP=Утвърден +ToApproveCP=Очаква одобрение +ApprovedCP=Утвърден CancelCP=Отменен RefuseCP=Отказ ValidatorCP=Validator ListeCP=Списък на празници -ValidateByCP=Ще бъдат утвърдени от +ReviewedByCP=Ще бъдат утвърдени от DescCP=Описание SendRequestCP=Създаване търсенето за празниците DelayToRequestCP=Заявленията за почивка трябва да бъдат направени най-малко дни %s (а), преди да ги. diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index aa036c74ea8..bf96666c8f5 100755 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -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 %s day(s) before them. diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang index 282f8dc1e45..75621b274bd 100644 --- a/htdocs/langs/es_ES/holiday.lang +++ b/htdocs/langs/es_ES/holiday.lang @@ -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 %s días antes. diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang index e09d0de2cbd..52c6ac37d9b 100644 --- a/htdocs/langs/fr_FR/holiday.lang +++ b/htdocs/langs/fr_FR/holiday.lang @@ -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 %s jours avant la date de ceux-ci. From 0672d10a3f9f04dbec5dc9e6d25680850e65ef3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 27 Apr 2013 14:54:03 +0200 Subject: [PATCH 3/3] Fixed typos --- htdocs/holiday/class/holiday.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index fd6452f8571..060a78fd718 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -699,7 +699,7 @@ class Holiday extends CommonObject 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('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1'); // Waiting approval - if ($statut == 3) return $langs->trans('ApproveCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved); + if ($statut == 3) return $langs->trans('ApprovedCP').' '.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','ToReviewCP','ApproveCP','CancelCP','RefuseCP'); + $name = array('DraftCP','ToReviewCP','ApprovedCP','CancelCP','RefuseCP'); $nb = count($name)+1; // Select HTML