diff --git a/htdocs/holiday/admin/holiday.php b/htdocs/holiday/admin/holiday.php index e3a20662f5d..174adbdf725 100644 --- a/htdocs/holiday/admin/holiday.php +++ b/htdocs/holiday/admin/holiday.php @@ -286,7 +286,7 @@ print ''."\n"; $var=!$var; print ''."\n"; print ''.$langs->trans('DelayForSubmitCP').''."\n"; -print ' '.$langs->trans('Jours').''."\n"; +print ' '.$langs->trans('DurationDays').''."\n"; print ''."\n"; $var=!$var; @@ -304,13 +304,13 @@ print ''."\n"; $var=!$var; print ''."\n"; print ''.$langs->trans('nbHolidayEveryMonthCP').''."\n"; -print ' '.$langs->trans('Jours').''."\n"; +print ' '.$langs->trans('DurationDays').''."\n"; print ''."\n"; $var=!$var; print ''."\n"; print ''.$langs->trans('nbHolidayDeductedCP').''."\n"; -print ' '.$langs->trans('Jours').''."\n"; +print ' '.$langs->trans('DurationDays').''."\n"; print ''."\n"; print ''."\n"; @@ -367,7 +367,7 @@ if($cp_events == 1) { print ''."\n"; print ''."\n"; - print ' '.$langs->trans('Jours').''."\n"; + print ' '.$langs->trans('DurationDays').''."\n"; print ''."\n"; print ''."\n"; print ''; @@ -400,7 +400,7 @@ print ''; print ''; print ''."\n"; -print ' '.$langs->trans('Jours').''."\n"; +print ' '.$langs->trans('DurationDays').''."\n"; print ''."\n"; print ''."\n"; diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 36e93d84271..82b8003a274 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -117,6 +117,7 @@ elseif($action == 'add_event') dol_htmloutput_mesg($message); } +$langs->load('users'); $var=true; $i = 0; diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index 8343a805081..4e85f261c3c 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -262,6 +262,7 @@ print_liste_field_titre($langs->trans("DateDebCP"),$_SERVER["PHP_SELF"],"cp.date print_liste_field_titre($langs->trans("DateFinCP"),$_SERVER["PHP_SELF"],"cp.date_fin","",'','align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Duration")); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cp.statut","",'','align="center"',$sortfield,$sortorder); +print ''; print "\n"; // FILTRES @@ -320,6 +321,9 @@ print ' '; // STATUT print ''; $holiday->selectStatutCP($search_statut); +print ''; +// ACTION +print ''; print ''; print "\n"; diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index f184cdc201e..fc984971908 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -105,6 +105,8 @@ if($num == '0') { } else { + $langs->load('users'); + while ($holiday = $db->fetch_array($result)) { $user = new User($db); diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index 29c58c4dec7..2ff389925d0 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -39,6 +39,8 @@ if(!$user->rights->holiday->view_log) accessforbidden(); * View */ +$langs->load('users'); + llxHeader(array(),$langs->trans('CPTitreMenu')); diff --git a/htdocs/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang index 614539960d5..f47b404400d 100644 --- a/htdocs/langs/bg_BG/holiday.lang +++ b/htdocs/langs/bg_BG/holiday.lang @@ -128,7 +128,6 @@ DeleteEventOptionCP=Изтриване UpdateEventOptionCP=Актуализация ErrorMailNotSend=Възникна грешка при изпращане на електронна поща: NoCPforMonth=Не оставяйте този месец. -Jours=ден nbJours=Брой дни TitleAdminCP=Конфигурация на празници Permission20001=/ Промяна на всички искания празници diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang index 60adaa8faf3..3c51daaa2ed 100644 --- a/htdocs/langs/ca_ES/holiday.lang +++ b/htdocs/langs/ca_ES/holiday.lang @@ -129,7 +129,6 @@ DeleteEventOptionCP=Eliminar UpdateEventOptionCP=Actualitzar ErrorMailNotSend=S'ha produït un error en l'enviament del correu electrònic: NoCPforMonth=Sense vacances aquest mes. -Jours=dies nbJours=Número de dies TitleAdminCP=Configuració de les vacances diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index 5453b2b88e6..dec1ca36aa8 100644 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -129,7 +129,6 @@ DeleteEventOptionCP=Delete UpdateEventOptionCP=Update ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. -Jours=days nbJours=Number days TitleAdminCP=Configuration of Holidays diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang index 5c234575d25..520fd4454ae 100644 --- a/htdocs/langs/es_ES/holiday.lang +++ b/htdocs/langs/es_ES/holiday.lang @@ -129,7 +129,6 @@ DeleteEventOptionCP=Eliminar UpdateEventOptionCP=Actualizar ErrorMailNotSend=Se ha producido un error en el envío del e-mail : NoCPforMonth=Sin vacaciones este mes. -Jours=días nbJours=Número de días TitleAdminCP=Configuración de las vacaciones diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang index 938ffaa155d..35a043504eb 100644 --- a/htdocs/langs/fr_FR/holiday.lang +++ b/htdocs/langs/fr_FR/holiday.lang @@ -127,7 +127,6 @@ DeleteEventOptionCP=Supprimer UpdateEventOptionCP=Mettre à jour ErrorMailNotSend=Une erreur est survenue lors de l'envoi du mail : NoCPforMonth=Aucun congé ce mois-ci. -Jours=jours nbJours=Nombre jours TitleAdminCP=Configuration des Congés diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang index d9291737449..b02bea2fe92 100644 --- a/htdocs/langs/tr_TR/holiday.lang +++ b/htdocs/langs/tr_TR/holiday.lang @@ -126,7 +126,6 @@ DeleteEventOptionCP=Sil UpdateEventOptionCP=Güncelle ErrorMailNotSend=Eposta gönderilirken bir hata oluştu: NoCPforMonth=Bu ay hiç izin yok. -Jours=gün nbJours=Gün sayısı TitleAdminCP=Tatillerin Yapılandırması Permission20001=Bütün tatil isteklerini Oku / Değiştir