diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index a861496cb72..b62bdefe258 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -876,7 +876,7 @@ class Holiday extends CommonObject */ function updateSoldeCP($userID='',$nbHoliday='') { - global $user; + global $user, $langs; if (empty($userID) && empty($nbHoliday)) { @@ -914,7 +914,7 @@ class Holiday extends CommonObject $new_solde = $now_holiday + $this->getConfCP('nbHolidayEveryMonth'); // On ajoute la modification dans le LOG - $this->addLogCP($user->id,$users[$i]['rowid'],'Event : Mise à jour mensuelle',$new_solde); + $this->addLogCP($user->id,$users[$i]['rowid'], $langs->trans('Event').': '.$langs->trans('HolidaysMonthlyAssignment'),$new_solde); $i++; } diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 29957dc3982..940c8b9a8be 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -67,7 +67,7 @@ if ($action == 'update' && isset($_POST['update_cp'])) } // On ajoute la modification dans le LOG - $holiday->addLogCP($user->id,$userID,'Event : Manual update',$userValue); + $holiday->addLogCP($user->id,$userID, $langs->trans('Event').': '.$langs->trans('ManualUpdate'),$userValue); // Mise à jour des congés de l'utilisateur $holiday->updateSoldeCP($userID,$userValue); @@ -107,7 +107,7 @@ elseif($action == 'add_event') $new_holiday = $nb_holiday + $add_holiday; // On ajoute la modification dans le LOG - $holiday->addLogCP($user->id,$userCP,'Event : '.$holiday->getNameEventCp($event),$new_holiday); + $holiday->addLogCP($user->id,$userCP, $langs->trans('Event').': '.$holiday->getNameEventCp($event),$new_holiday); $holiday->updateSoldeCP($userCP,$new_holiday); @@ -165,7 +165,7 @@ foreach($listUsers as $users) print ''; print ''; print ''; - print ' jours'."\n"; + print ' '.$langs->trans('days').''."\n"; print ''."\n"; print ''; diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php index 2280fe8b970..c4c7b11ef9d 100644 --- a/htdocs/holiday/fiche.php +++ b/htdocs/holiday/fiche.php @@ -373,7 +373,7 @@ if($action == 'confirm_valid') $newSolde = $soldeActuel - ($nbJour*$cp->getConfCP('nbHolidayDeducted')); // On ajoute la modification dans le LOG - $cp->addLogCP($user->id, $cp->fk_user, 'Event : '.$langs->transnoentitiesnoconv("Holiday"), $newSolde); + $cp->addLogCP($userID,$cp->fk_user, $langs->trans('Event').': '.$langs->transnoentitiesnoconv("Holidays"),$newSolde); // Mise à jour du solde $cp->updateSoldeCP($cp->fk_user,$newSolde); diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index 9c4c2dc0187..24926ae5e53 100644 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -1,6 +1,7 @@ # Dolibarr language file - en_US - holiday CHARSET= UTF-8 +Holidays=Holidays CPTitreMenu=Holidays MenuReportMonth=Monthly statement MenuAddCP=Apply for holidays @@ -86,6 +87,8 @@ UserName=Name Employee=Employee FirstDayOfHoliday=First day of holiday LastDayOfHoliday=Last day of holiday +HolidaysMonthlyUpdate=Monthly update +ManualUpdate=Manual update ## Configuration du Module ## ConfCP=Configuration of holidays module diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang index 55e56fb9d0a..ebf1a0457d9 100644 --- a/htdocs/langs/es_ES/holiday.lang +++ b/htdocs/langs/es_ES/holiday.lang @@ -1,6 +1,7 @@ # Dolibarr language file - es_ES - holiday CHARSET= UTF-8 +Holidays=Vacaciones CPTitreMenu=Vacaciones MenuReportMonth=Estado mensual MenuAddCP=Nueva petición @@ -88,6 +89,8 @@ FirstDayOfHoliday=Primer día libre LastDayOfHoliday=Último día libre Morning=Mañana Afternoon=Tarde +HolidaysMonthlyUpdate=Actualización mensual +ManualUpdate=Actualización manual ## Configuration du Module ## ConfCP=Configuración del módulo Vacaciones @@ -99,7 +102,7 @@ LastUpdateCP=Última actualización automática de vacaciones UpdateConfCPOK=Actualización efectuada correctamente. ErrorUpdateConfCP=Se ha producido un error durante la actualización, vuélvalo a intentar. AddCPforUsers=Añada los saldos de vacaciones de los usuarios haciendo clic aquí. -DelayForSubmitCP=La fecha límite para solicitar vacaciones +DelayForSubmitCP=Antelación mínima para solicitar vacaciones AlertValidatorDelayCP=Advertir al usuario validador si la petición no respeta el límite previsto AlertValidorSoldeCP=Advertir al usuario validador si el usuario pide vacaciones superiores a su saldo nbUserCP=Número de usuarios tomados en cuenta en el módulo vacaciones diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang index 58bbfb1337b..e6c0d33ad98 100644 --- a/htdocs/langs/fr_FR/holiday.lang +++ b/htdocs/langs/fr_FR/holiday.lang @@ -1,6 +1,7 @@ # Dolibarr language file - fr_FR - holiday CHARSET= UTF-8 +Holidays=Congés CPTitreMenu=Congés MenuReportMonth=Etat mensuel MenuAddCP=Nouvelle demande @@ -84,8 +85,10 @@ NewSoldeCP=Nouveau Solde alreadyCPexist=Une demande de congés à déjà été effectuée sur cette période. UserName=Nom Prénom Employee=Salarié -FirstDayOfHoliday=Premier jour de congés -LastDayOfHoliday=Dernier jour de congés +FirstDayOfHoliday=Premier jour de congès +LastDayOfHoliday=Dernier jour de congès +HolidaysMonthlyUpdate=Mise à jour mensuelle +ManualUpdate=Mise à jour manuelle ## Configuration du Module ## ConfCP=Configuration du module Congés