From: Kilian Saffran Date: Thu, 3 Dec 2020 17:12:19 +0000 (+0100) Subject: v20201203 X-Git-Tag: 1.0.27~4 X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=d24300f1f09d81f98e67414a994ca59d53d09801;p=pot_lu.git v20201203 --- diff --git a/app/lib/dksconfig.pm b/app/lib/dksconfig.pm index bc0e4a4d..2086bf98 100644 --- a/app/lib/dksconfig.pm +++ b/app/lib/dksconfig.pm @@ -11,8 +11,8 @@ our @EXPORT_OK = qw($sitecfg); our $sitecfg ={ cookiename => 'potlu', dbtype => 'PgPP', - #dsn => 'DBI:PgPP:dbname=potlu2_db;host=localhost', - dsn => 'DBI:PgPP:dbname=potlu2_db;host=sql12.your-server.de', + dsn => 'DBI:PgPP:dbname=potlu2_db;host=localhost', + #dsn => 'DBI:PgPP:dbname=potlu2_db;host=sql12.your-server.de', dbuser => 'potlu2_user', dbpassword => 'dMY8xGB6cBLzrDGE', page => 'index.tt', diff --git a/app/tmpl/block/dlg_replacestaffdayworkplan.tt b/app/tmpl/block/dlg_replacestaffdayworkplan.tt index 9f3768fa..9ebfdada 100644 --- a/app/tmpl/block/dlg_replacestaffdayworkplan.tt +++ b/app/tmpl/block/dlg_replacestaffdayworkplan.tt @@ -3,7 +3,7 @@
-

Selection du modèle

+

[% lbl.selecttemplate %]

@@ -16,7 +16,7 @@ - +
@@ -30,7 +30,7 @@
- Garder les heures du congé + [% lbl.keepvacancy %]
@@ -43,7 +43,7 @@
- Garder les heures de récuperation + [% lbl.keeprecuperation %]
@@ -54,8 +54,8 @@ diff --git a/app/tmpl/block/dlgdataload.tt b/app/tmpl/block/dlgdataload.tt index ad982a1c..3c342b1b 100644 --- a/app/tmpl/block/dlgdataload.tt +++ b/app/tmpl/block/dlgdataload.tt @@ -5,7 +5,7 @@

-
Attentez s.v.p.!
+
[% llang.waitmsg %]
diff --git a/app/tmpl/block/dlgmessage.tt b/app/tmpl/block/dlgmessage.tt index 84aae526..1e97b65f 100644 --- a/app/tmpl/block/dlgmessage.tt +++ b/app/tmpl/block/dlgmessage.tt @@ -10,7 +10,7 @@
diff --git a/app/tmpl/block/dlgperiodvalidation.tt b/app/tmpl/block/dlgperiodvalidation.tt index f7ad3732..fa89b7a5 100644 --- a/app/tmpl/block/dlgperiodvalidation.tt +++ b/app/tmpl/block/dlgperiodvalidation.tt @@ -3,71 +3,70 @@

- Décompte Final + [% lbl.finalstatement %]

-

- Periode du .. au .. -

+

- +
-
+
- +
-
+
-
+
- +
-
+
-
+
- +
-
+
-
+
@@ -75,10 +74,10 @@ diff --git a/app/tmpl/block/dlgstaffperioddays.tt b/app/tmpl/block/dlgstaffperioddays.tt index ae06d8f5..0f9072ce 100644 --- a/app/tmpl/block/dlgstaffperioddays.tt +++ b/app/tmpl/block/dlgstaffperioddays.tt @@ -3,7 +3,7 @@

- Editer Jour: dd, DD.MM.YYYY + [% lbl.editday %]: dd, DD.MM.YYYY

@@ -14,7 +14,7 @@
- heures de travail + [% lbl.workhours %]
@@ -23,7 +23,7 @@
- +
@@ -32,11 +32,11 @@
- +
- +
@@ -48,7 +48,7 @@
- +
@@ -57,17 +57,17 @@
- +
- +
- pauses + [% lbl.pauses %]
@@ -76,7 +76,7 @@
- +
@@ -85,11 +85,11 @@
- +
- +
@@ -101,7 +101,7 @@ - +
@@ -110,11 +110,11 @@
- +
- +
@@ -124,26 +124,26 @@
- pauses payées + [% lbl.payedpauses %]
- Info heures libres avant/après + [% lbl.infoouttimes %]
- +
+ "infofreetimeafter">[% lbl.freetimeafter %]
- congé + [% lbl.vacancy %]
- +
+
- récupération + [% lbl.recuperation %]
@@ -172,51 +172,51 @@
- +
+
- Info heures + [% lbl.infohours %]
+ "infomaxdayhours">[% lbl.maxtotal %]
+ "infomaxinterruptionhours">[% lbl.maxcutoff %]
+ "infomindailyrecuperation">[% lbl.mindailyfreehours %]
+ "infomaxweekhours">[% lbl.maxweekhours %]
- Totaux Jour + [% lbl.daytotal %]
+ "staffreportperioddays_workhours" style="font-weight: bold;"[% lbl.total %] travail
+ "staffreportperioddays_timepause">[% lbl.totalpause %]
- +
+ "staffreportperioddays_interruptionhours">[% lbl.cutoff %]
@@ -226,8 +226,8 @@
diff --git a/app/tmpl/block/dlgstaffpointages.tt b/app/tmpl/block/dlgstaffpointages.tt index 0fd7f729..b4742ea8 100644 --- a/app/tmpl/block/dlgstaffpointages.tt +++ b/app/tmpl/block/dlgstaffpointages.tt @@ -4,19 +4,19 @@
- Editer Pointage / - + [% lbl.edittimetracks %] / -
- - + +
diff --git a/app/tmpl/block/dlgusername.tt b/app/tmpl/block/dlgusername.tt index d49df63b..cee4aa65 100644 --- a/app/tmpl/block/dlgusername.tt +++ b/app/tmpl/block/dlgusername.tt @@ -4,21 +4,21 @@
-

Changement du Login

+

[% lbl.usernamechange %]

- +
diff --git a/app/tmpl/index.tt b/app/tmpl/index.tt index 46580d9b..e360d188 100644 --- a/app/tmpl/index.tt +++ b/app/tmpl/index.tt @@ -1,5 +1,6 @@ [% appversion='1.0.26' %] [% minify = '' %] +[% PROCESS "lang/${lang}.tt" %] diff --git a/app/tmpl/lang/de.tt b/app/tmpl/lang/de.tt new file mode 100644 index 00000000..e69de29b diff --git a/app/tmpl/lang/fr.tt b/app/tmpl/lang/fr.tt new file mode 100644 index 00000000..33c5632f --- /dev/null +++ b/app/tmpl/lang/fr.tt @@ -0,0 +1,179 @@ +[% lang = { + "pot_long" => "Plan d'organisation du travail", + "weeklytemplates" => "Modèles hebdomaires", + "template" => "Modèle", + "staff" => "Salariés", + "sectorconfig" => "Configuration Secteurs", + "sectorconfigpot" => "Configuration sectoriel POT", + "periodsconfig" => "Configuration Périodes", + "sectorhoursconfig" => "Configuration Heures Sectoriel" , + "back" => "retour", + "delete" => "supprimer", + "duplicate" => "dupliquer", + "add" => "ajouter", + "rename" => "renomer", + "edit" => "éditer", + "copy" => "copier", + "paste" => "coller", + "basedata" => "Données de base", + "periods" => "Périodes", + "refperiods" => "Périodes de Références", + "pdf" => "PDF", + "finalstatement" => "Décompte Final", + "finalstatementpot" => "Décompte
fin POT", + "statement" => "Décompte", + "companyunit" => "Entreprise / Unité", + "logout" => "Logout", + "modules" => "Modules", + "staffcount" => "Nbr. Salariés", + "config" => "Configuration", + "company" => "Entreprise", + "terms" => "Conditions Générales", + "administration" => "Administration", + "companies" => "Entreprises", + "sectors" => "Secteurs", + "sector" => "Secteur", + "vacancydays" => "jours feriés", + "vacancytypes" => "types de congés", + "vacancytype" => "type de congé", + "vacancy" => "congé", + "recuperationtype" => "type de repos", + "recuperation" => "récupération", + "hours" => "Heures", + "infohours" => "Info heures", + "acceptterms" => "J'ai lu et j'accepte les conditions générales", + "users" => "Utilisateurs", + "newpassword" => "nouveau mot de passe", + "changelogin" => "changer login", + "editday" => "Editer Jour", + "workhours" => "Heures de travail", + "start" => "début", + "startdate" => "date début", + "enddate" => "date fin", + "end" => "fin", + "total" => "Total", + "totalday" => "Total Jour", + "pausehours" => "Heures de pause", + "totalpause" => "Total pause", + "cancel" => "Annuler", + "save" => "Sauvegarder", + "commit" => "Valider et Finaliser", + "changetemplate" => "changer modèle", + "selecttemplate" => "Selection du modèle", + "pottemplate" => "POT (Modèle)", + "name" => "Nom", + "staffgroupname" => "Nom du département", + "prename" => "Prénom", + "companytype" => "dénom. Sociale", + "companyunitname" => "Nom de l'unité/entreprise", + "matricule" => "Matricule", + "birthdate" => "date de naissance", + "job" => "Job / Position", + "department" => "Département", + "departments" => "Départements", + "departmentaccess" => "Accès Département", + "timetracker" => "Pointeuse", + "no" => "Non", + "yes" => "Oui", + "address" => "adresse", + "zip" => "cp", + "city" => "ville", + "country" => "pays", + "phone" => "Téléphone", + "email" => "E-Mail", + "contractdata" => "Données contractuelles", + "renewperiods" => "actualiser périodes", + "weekhours" => "heures / semaine", + "weekhours_short" => "h/semaine", + "minmaxvalues" => "Valeurs Minimum/Maximum", + "maxdayhours" => "max heures/jour", + "maxweekhours" => "max heures/semaine", + "maxcutoff" => "max coupure", + "maxtotal" => "max total", + "mindailyfreehours" => "min heures libre quotidienne", + "mindailyouttime" => "min repos quotidien", + "daytotal" => "Totaux Jour", + "weekdays" => "jours / semaine", + "weekdays_short" => "j/semaine", + "addstaffmember" => "ajouter Salarié", + "timetracks" => "pointages", + "clean" => "vider", + "cutoff" => "coupure", + "loginlink" => "Se connecter", + "username" => "Login", + "password" => "Mot de passe", + "clientaccess" => "Accès Client", + "login" => "Connecter", + "forgotpassword" => "Mot de passe oublié", + "user" => "Utilisateur", + "sendpassword" => "Envoyer Mot de passe", + "rcs" => "No. RCS", + "vatnumber" => "No TVA Internationale", + "dbschema" => "Database-Schema", + "duration" => "Durée", + "unit" => "Unité", + "payedpauses" => "Pauses payées", + "pauses" => "pauses", + "type" => "Type", + "url" => "URL", + "lastsync" => "Dernière Synchronisation", + "accessblocked" => "compte blocké", + "useraccess" => "Accès du utilisateur", + "datasetaccess" => "Accès DataSet", + "staffgroupaccess" => "Accès Groupe", + "dataset" => "Dataset", + "usernamechange" => "Changement du Login", + "newusername" => "nouveau Login", + "edittimetracks" => "Editer Pointage", + "infoouttimes" => "Info heures libres avant/après", + "freetimebefore" => "heures libres avant", + "freetimeafter" => "heures libres après", + "statementbeforevalidation" => "Décompte avant validation", + "reopen" => "Reouvrir", + "transferhours" => "heures à reporter", + "transferhours1_5" => "heures à reporter (x1,5)", + "weeklyavg" => "moyenne hebd.", + "transferfreehours" => "heures à reporter
temps libre", + "plushourstopayplus40" => "heures supplémentaires
à payer avec +40%", + "hourstopayplus40" => "heures à rémunérer (+40%)", + "hourstopayonly40" => "heures supplémentaires
à payer (40%)", + "close" => "Fermer", + "ok" => "OK", + "waitmsg" => "Attentez s.v.p.!", + "keepvacancy" => "Garder les heures du congé", + "keeprecuperation" => "Garder les heures de récuperation", + "replace" => "Remplacer", + "qdeletecompany" => "Êtes vous sûre de supprimer l'entreprise sélectionnée?", + "ddeletestaffgroup" => "Êtes vous sûre de supprimer le département sélectionné?", + "qdeleteuser" => "Êtes vous sûre de supprimer l'utilisateur sélectionné?", + "qdeletehours" => "Êtes vous sûre de supprimer les heures sélectionné?", + "qdeletestaff" => "Êtes vous sûre de supprimer le salarié sélectionnée?", + "qdeletedata" => "Êtes vous sûre de supprimer les données sélectionnées?", + "qdeleteworkplan" => "Êtes vous sûre de supprimer ce plan de travail?" + "allfieldsrequired" => "tous les champs sont requis!", + "monday" => "lundi", + "tuesday" => "mardi", + "wednesday" => "mercredi", + "thursday" => "jeudi", + "friday" => "vendredi", + "saturday" => "samedi", + "sunday" => "dimanche", + "contractrequired" => "Tous les champs sauf sans requis (sauf 'date fin')!", + "contract" => "Contrat", + "work" => "Travail", + "recuperation_short" => "Récup", + "vacancyill2" => "Congé
maladie", + "statementtransfered2" => "décompte
reporté", + "supphourspayed2" => "h. suppl.
payés", + "supp44h2" => "suppl.
+44 h", + "suppsunwork" => "suppl.
trav dim.", + "avgweek_short" => "moy.
hebd.", + "validated" => "validé", + "diffcontract" => "diff
contrat", + "weekhours2" => "heures de
travail", + "worktotal2" => "total
travail", + "standard" => "Standard", + "pausehours2" => "heures de
pause", + "totalpause2" => "total
pause", + "day" => "jour", + } %] \ No newline at end of file diff --git a/app/tmpl/login.tt b/app/tmpl/login.tt index c7bc8102..c0df1dfc 100644 --- a/app/tmpl/login.tt +++ b/app/tmpl/login.tt @@ -7,7 +7,7 @@ - POT - Plan d'organisation du travail [% IF mode %][% " - ${mode}" %][% END %] + POT - [% lbl.pot_long %] [% IF mode %][% " - ${mode}" %][% END %] diff --git a/app/tmpl/module/admin.tt b/app/tmpl/module/admin.tt index 01f45174..b55537cd 100644 --- a/app/tmpl/module/admin.tt +++ b/app/tmpl/module/admin.tt @@ -1,15 +1,15 @@
- retour -
Entreprises
+ [% lbl.back %] +
[% lbl.companies %]
[% IF (session.usergroup == 'admin') %] - - + +
- - + +
[% END %]
@@ -25,26 +25,23 @@ [% INCLUDE module/admin/pnl_basedata.tt %]
diff --git a/app/tmpl/module/admin/dlg_worktimes.tt b/app/tmpl/module/admin/dlg_worktimes.tt index 8b186d14..75b9623a 100644 --- a/app/tmpl/module/admin/dlg_worktimes.tt +++ b/app/tmpl/module/admin/dlg_worktimes.tt @@ -2,8 +2,7 @@
-

- Configuration Heures Sectoriel +

[% lbl.sectorhoursconfig %]

@@ -12,38 +11,38 @@
- +
- +
- Valeurs Minimum/Maximum + [% lbl.minmaxvalues %]
+ "max-width: 60px; width: 60px;" type="text" value="">
+ "max-width: 60px; width: 60px;" type="text" value="">
+ "max-width: 60px; width: 60px;" type="text" value="">
+ "max-width: 60px; width: 60px;" type="text" value="">
+ "max-width: 60px; width: 60px;" type="text" value="">
@@ -51,8 +50,8 @@
- +
diff --git a/app/tmpl/module/admin/pnl_basedata.tt b/app/tmpl/module/admin/pnl_basedata.tt index 29b4522f..53eb3f43 100644 --- a/app/tmpl/module/admin/pnl_basedata.tt +++ b/app/tmpl/module/admin/pnl_basedata.tt @@ -1,7 +1,7 @@ @@ -79,35 +79,33 @@
-
- Configuration Périodes -
+
[% lbl.periodsconfig %]
- +
- +
- +
- +
- +
@@ -115,7 +113,7 @@
- POT Pointeuse + POT [% lbl.timetracker %]
@@ -124,25 +122,25 @@ - +
- +
- +
- +
- +
@@ -150,11 +148,11 @@
- Départements -
+ [% lbl.departments %] +
+ + +
diff --git a/app/tmpl/module/admin/schemadataset.js b/app/tmpl/module/admin/schemadataset.js index 4af0601b..03f5a846 100644 --- a/app/tmpl/module/admin/schemadataset.js +++ b/app/tmpl/module/admin/schemadataset.js @@ -33,7 +33,7 @@ let schemadataset= { flds["fn"] = "del_company"; flds["id"] = udata[0].id; flds["schemata"] = "public"; - showinfodlg("Supprimer","Êtes vous sûre de supprimer l'entreprise sélectionnée?",schemadataset.removedata,flds,"Supprimer","Annuler"); + showinfodlg("[% lbl.delete %]","[% lbl.qdeletecompany %]",schemadataset.removedata,flds,"[% lbl.delete %]","[% lbl.cancel %]"); } }, removedata: function(data){ @@ -59,12 +59,12 @@ let schemadataset= { //console.log("newdatasetdata",newdata); for (var n in newdata) { if ((n != "payedpauses") && ((newdata[n] == null) || (newdata[n] == "") )){ - document.getElementById("datasetmsg").innerHTML='
tous les champs sont requis!
'; + document.getElementById("datasetmsg").innerHTML='
[% lbl.allfieldsrequired %]
'; return false; } } document.getElementById('dlg_dataset').style.display='none'; - showdataloaddlg('','
Attendez s.v.p.!
'); + showdataloaddlg('','
[% lbl.waitmsg %]
'); postData("db.cgi",newdata).then(data => { companies.gettbldata(); closedataloaddlg(); diff --git a/app/tmpl/module/admin/sectors.js b/app/tmpl/module/admin/sectors.js index 9e4c1e41..b44fa18b 100644 --- a/app/tmpl/module/admin/sectors.js +++ b/app/tmpl/module/admin/sectors.js @@ -21,15 +21,15 @@ let sector ={ rowContext:function(e, row){ e.preventDefault(); }, columns: [ { title: "secteur", field: "sector",headerFilter:"input",headerSort: true}, - { title: "nbr. salariés", field: "periodtype",headerFilter:"input",headerSort: true}, - { title: "début", field: "startdate",headerFilter:"input",headerSort: true,sorter:"date", sorterParams:{format:"YYYY-MM-DD",alignEmptyValues:"bottom"},formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""}}, - { title: "fin", field: "enddate",headerFilter:"input",headerSort: true,sorter:"date", sorterParams:{format:"YYYY-MM-DD",alignEmptyValues:"bottom"},formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""}}, + { title: "[% lbl.staffcount %]", field: "periodtype",headerFilter:"input",headerSort: true}, + { title: "[% lbl.start %]", field: "startdate",headerFilter:"input",headerSort: true,sorter:"date", sorterParams:{format:"YYYY-MM-DD",alignEmptyValues:"bottom"},formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""}}, + { title: "[% lbl.end %]", field: "enddate",headerFilter:"input",headerSort: true,sorter:"date", sorterParams:{format:"YYYY-MM-DD",alignEmptyValues:"bottom"},formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""}}, { title: "max heures/jour", field: "maxdayhours",headerSort: false,formatter:timeFormatter}, { title: "H/Sem.", field: "defaultweekhours",headerSort: false,formatter:timeFormatter}, { title: "max heures/semaine", field: "maxweekhours",headerSort: false,formatter:timeFormatter}, { title: "max coupure", field: "maxinterruptionhours",headerSort: false,formatter:timeFormatter}, { title: "min h. libres
quotidienne", field: "mindailyrecuperation",headerSort: false,formatter:timeFormatter}, - { title: "standard", field: "isdefault",headerSort: false,formatter:"tickCross",hozAlign:"center", + { title: "[% lbl.standard %]", field: "isdefault",headerSort: false,formatter:"tickCross",hozAlign:"center", formatterParams:{allowEmpty:true,allowTruthy:true,tickElement:'✔'}}, { title: "Description", field:"description" ,headerSort: false}, ] diff --git a/app/tmpl/module/admin/staffgroups.js b/app/tmpl/module/admin/staffgroups.js index fd936d26..6eaf8eb6 100644 --- a/app/tmpl/module/admin/staffgroups.js +++ b/app/tmpl/module/admin/staffgroups.js @@ -8,7 +8,7 @@ let staffgroups = { layout: "fitDataStretch", selectable: 1, rowContext:function(e, row){ e.preventDefault(); }, - columns: [{ title: "Département", field: "groupname" },{ title: "salarié(s)", field: "staffmembers" }] + columns: [{ title: "[% lbl.department %]", field: "groupname" },{ title: "salarié(s)", field: "staffmembers" }] }); }, gettbldata: function(){ @@ -46,7 +46,7 @@ let staffgroups = { flds["fn"] = "del_staffgroup"; flds["id"] = udata[0].id; flds["schemata"] = companies.current_schemata; - showinfodlg("Supprimer","Êtes vous sûre de supprimer le département sélectionné?",staffgroups.removedata,flds,"Supprimer","Annuler"); + showinfodlg("[% lbl.delete %]","[% lbl.qdeletestaffgroup %]",staffgroups.removedata,flds,"[% lbl.delete %]","[% lbl.cancel %]"); } }, removedata: function(data){ diff --git a/app/tmpl/module/admin/users.js b/app/tmpl/module/admin/users.js index b2685c2e..e6518806 100644 --- a/app/tmpl/module/admin/users.js +++ b/app/tmpl/module/admin/users.js @@ -36,11 +36,11 @@ let users ={ selectable: 1, rowContext:function(e, row){ e.preventDefault();}, columns:[ - {title:"Nom", field:"surname"}, - {title:"Prénom", field:"prename"}, + {title:"[% lbl.name %]", field:"surname"}, + {title:"[% lbl.prename %]", field:"prename"}, {title:"Login", field:"username"}, {title:"Accès", field:"groupname"}, - {title:"Accès Département",field:"staffgroups"}, + {title:"[% lbl.departmentaccess %]",field:"staffgroups"}, {title:"Bloqué", field:"isblocked",formatter:"tickCross",hozAlign:"center", formatterParams:{allowEmpty:true,allowTruthy:true,tickElement:'✔'}}, ], @@ -95,7 +95,7 @@ let users ={ flds["fn"] = "del_user"; flds["id"] = udata[0].id; flds["schemata"] = "public"; - showinfodlg("Supprimer","Êtes vous sûre de supprimer l'utilisateur sélectionné?",users.removedata,flds,"Supprimer","Annuler"); + showinfodlg("[% lbl.delete %]","[% lbl.qdeleteuser %]",users.removedata,flds,"[% lbl.delete %]","[% lbl.cancel %]"); } }, @@ -107,7 +107,7 @@ let users ={ validateform: function(){ let idcompany = users.choices["id_company"].selected(); if (idcompany == ''){ - document.getElementById("usermsg").innerHTML= '
Entreprise ne doit pas être vide!
'; + document.getElementById("usermsg").innerHTML= '
[% lbl.company %] ne doit pas être vide!
'; return false; } let usergroups = users.choices["id_usergroup"].selected(); @@ -127,7 +127,7 @@ let users ={ /* @preserve [% IF session.usergroup == 'admin' %]*/ let sel =users.tbl.getSelectedData(); if (sel[0]){ - showinfodlg("Nouveau Mot de Passe","Êtes vous sûre changer le mot de passe?",users.setnewpassword,{},"Oui","Non"); + showinfodlg(">[% lbl.newpassword %]","Êtes vous sûre changer le [% lbl.password %]?",users.setnewpassword,{},"[% lbl.yes %]","[% lbl.no %]"); } /* @preserve [% END %]*/ }, @@ -139,9 +139,9 @@ let users ={ postData("db.cgi",fndata).then(data => { document.getElementById('dlg_users').style.display='none'; if (data && data.result.data.password){ - showmessagedlg("Nouveau mot de passe!",'
'); + showmessagedlg(">[% lbl.newpassword %]!",'
'); }else { - showmessagedlg("Erreur!","Une erreur c'est produite pour l'envoie d'un nouveau mot de passe!"); + showmessagedlg("Erreur!","Une erreur c'est produite pour l'envoie d'un >[% lbl.newpassword %]!"); } }); } diff --git a/app/tmpl/module/admin/vacancydays.js b/app/tmpl/module/admin/vacancydays.js index 9b23da33..66bb54b5 100644 --- a/app/tmpl/module/admin/vacancydays.js +++ b/app/tmpl/module/admin/vacancydays.js @@ -26,7 +26,7 @@ let vacancydays ={ rowContext:function(e, row){e.preventDefault();}, columns:[ {title:"Date",field:"daydate",headerFilter:"input",headerSort:"date",formatter:"datetime",resizable: false,formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""}}, - {title:"Nom",field:"vacancyname",headerFilter:"input"}, + {title:"[% lbl.name %]",field:"vacancyname",headerFilter:"input"}, ] }); vacancydays.gettbldata(); diff --git a/app/tmpl/module/admin/vacancytypes.js b/app/tmpl/module/admin/vacancytypes.js index 04b983f8..af9b5625 100644 --- a/app/tmpl/module/admin/vacancytypes.js +++ b/app/tmpl/module/admin/vacancytypes.js @@ -23,7 +23,7 @@ let vacancytypes ={ rowContext:function(e, row){e.preventDefault();}, columns:[ {title:"Type",field:"vacancytype",headerFilter:"input"}, - {title:"Nom",field:"vacancyname",headerFilter:"input"}, + {title:"[% lbl.name %]",field:"vacancyname",headerFilter:"input"}, {title:"Couleur",field:"color"}, {title:"Legende",field:"legend"} ] diff --git a/app/tmpl/module/admin/worktimes.js b/app/tmpl/module/admin/worktimes.js index 5a3fde00..58d51027 100644 --- a/app/tmpl/module/admin/worktimes.js +++ b/app/tmpl/module/admin/worktimes.js @@ -21,14 +21,14 @@ let worktimes = { selectable: 1, rowContext:function(e, row){ e.preventDefault(); }, columns: [ - { title: "début", field: "startdate",headerSort: true,formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""}}, - { title: "fin", field: "enddate",headerSort: true,formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""}}, + { title: "[% lbl.start %]", field: "startdate",headerSort: true,formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""}}, + { title: "[% lbl.end %]", field: "enddate",headerSort: true,formatter:"datetime",formatterParams:{inputFormat:"YYYY-MM-DD",outputFormat:"DD.MM.YYYY",invalidPlaceholder:""}}, { title: "max heures/jour", field: "maxdayhours",headerSort: false}, { title: "H/Sem.", field: "defaultweekhours",headerSort: false}, { title: "max heures/semaine", field: "maxweekhours",headerSort: false}, { title: "max coupure", field: "maxinterruptionhours",headerSort: false}, { title: "min h. libres
quotidienne", field: "mindailyrecuperation",headerSort: false}, - { title: "standard", field: "isdefault",headerSort: false,formatter:"tickCross",hozAlign:"center", + { title: "[% lbl.standard %]", field: "isdefault",headerSort: false,formatter:"tickCross",hozAlign:"center", formatterParams:{allowEmpty:true,allowTruthy:true,tickElement:'✔'}} ] }); @@ -73,7 +73,7 @@ let worktimes = { flds["fn"] = "del_worktimes"; flds["id"] = udata[0].id; flds["schemata"] = schemata; - showinfodlg("Supprimer","Êtes vous sûre de supprimer les heures sélectionné?",worktimes.removedata,flds,"Supprimer","Annuler"); + showinfodlg("[% lbl.delete %]","[% lbl.qdeletehours %]",worktimes.removedata,flds,"[% lbl.delete %]","[% lbl.cancel %]"); } }, removedata: function(data){ diff --git a/app/tmpl/module/adminvacancydays.tt b/app/tmpl/module/adminvacancydays.tt index 5f1e3927..1cf1400d 100644 --- a/app/tmpl/module/adminvacancydays.tt +++ b/app/tmpl/module/adminvacancydays.tt @@ -1,15 +1,15 @@
- retour -
Jours feriés
+ [% lbl.back %] +
[% lbl.vacancydays %]
[% IF (session.usergroup == 'admin') %] - [% END %]
@@ -17,12 +17,10 @@ [% IF (session.usergroup == 'admin') %]
-
- Jours feriés -
- +
[% lbl.vacancydays %]
+
diff --git a/app/tmpl/module/adminvacancytypes.tt b/app/tmpl/module/adminvacancytypes.tt index 6e206f3f..d49537cb 100644 --- a/app/tmpl/module/adminvacancytypes.tt +++ b/app/tmpl/module/adminvacancytypes.tt @@ -1,14 +1,14 @@
- retour -
Configuration Types de congés
+ [% lbl.back %] +
[% lbl.vacancytypes %]
[% IF (session.usergroup == 'admin') %] - [% END %]
@@ -16,12 +16,10 @@ [% IF (session.usergroup == 'admin') %]
-
- Types de congés -
- +
[% lbl.vacancytypes %]
+
diff --git a/app/tmpl/module/company.tt b/app/tmpl/module/company.tt index 7953ef10..16c7f362 100644 --- a/app/tmpl/module/company.tt +++ b/app/tmpl/module/company.tt @@ -1,9 +1,9 @@
- retour -
Entreprise
- - + [% lbl.back %] +
[% lbl.company %]
+ +
@@ -12,11 +12,9 @@ [% INCLUDE module/company/pnl_basedata.tt %]
\ No newline at end of file diff --git a/app/tmpl/module/company/dlg_users.tt b/app/tmpl/module/company/dlg_users.tt index 2e428232..1d0af7bb 100644 --- a/app/tmpl/module/company/dlg_users.tt +++ b/app/tmpl/module/company/dlg_users.tt @@ -2,9 +2,7 @@
-

- Utilisateur -

+

[% lbl.user %]

@@ -16,7 +14,7 @@
- +
@@ -35,7 +33,7 @@
- +
@@ -43,7 +41,7 @@
- +
@@ -52,9 +50,9 @@
- - - + + +
diff --git a/app/tmpl/module/company/pnl_basedata.tt b/app/tmpl/module/company/pnl_basedata.tt index da2dd2ea..a2da0369 100644 --- a/app/tmpl/module/company/pnl_basedata.tt +++ b/app/tmpl/module/company/pnl_basedata.tt @@ -1,8 +1,6 @@
-
- Données de base -
+
[% lbl.basedata %]
@@ -11,27 +9,27 @@
- +
- +
- +
- +
- +
@@ -46,27 +44,27 @@
- +
- +
- +
- +
- +
@@ -80,30 +78,30 @@
- +
- +
- +
- +
- Départements + [% lbl.department %]s
@@ -16,33 +16,33 @@
-

Modules

+

[% lbl.modules %]

- Périodes de références - Salariés + [% lbl.refperiods %] +
-

Configuration

+

[% lbl.configuration %]

- Entreprise - Modèles hebdomaires - Conditions générales + [% lbl.company %] + [% lbl.weeklytemplates %] + [% lbl.terms %]
[% IF (session.usergroup == 'admin') %]
-

Administration

+

[% lbl.administration %]

- Entreprises - Secteurs - jours feriés - types de congés + [% lbl.companies %] + [% lbl.sectors %] + [% lbl.vacancydays %] + [% lbl.vacancytypes %]
[% END %] @@ -52,7 +52,7 @@

- Conditions Générales + [% lbl.terms %]

@@ -60,7 +60,7 @@
+ "button actionbtn margin-right border" id="btn_acceptterms" onclick="index.acceptterms();return false;">[% lbl.acceptterms %]
diff --git a/app/tmpl/module/login/forgotpassword.tt b/app/tmpl/module/login/forgotpassword.tt index d944f6d3..22f8a33a 100644 --- a/app/tmpl/module/login/forgotpassword.tt +++ b/app/tmpl/module/login/forgotpassword.tt @@ -1,6 +1,6 @@
- - + +
- se Connecter + [% lbl.loginlink %]
\ No newline at end of file diff --git a/app/tmpl/module/login/login.tt b/app/tmpl/module/login/login.tt index 3ab88367..cbefa0df 100644 --- a/app/tmpl/module/login/login.tt +++ b/app/tmpl/module/login/login.tt @@ -1,20 +1,20 @@
-

Accès Client

+

[% lbl.clientaccess %]

- +
- +
- +
diff --git a/app/tmpl/module/login/message.tt b/app/tmpl/module/login/message.tt index e9d05ec4..90c0bb0e 100644 --- a/app/tmpl/module/login/message.tt +++ b/app/tmpl/module/login/message.tt @@ -1,7 +1,7 @@
[% message %]
- Se connecter + [% lbl.loginlink %]
- +
\ No newline at end of file diff --git a/app/tmpl/module/periods.tt b/app/tmpl/module/periods.tt index e8637668..13bff824 100644 --- a/app/tmpl/module/periods.tt +++ b/app/tmpl/module/periods.tt @@ -2,20 +2,20 @@
- retour -
Périodes de références
+ [% lbl.back %] +
[% lbl.refperiods %]
- - - + + + [% IF session.usergroup == 'admin' %] [% END %] [% IF session.usergroup != 'teamleader' %] - + [% END %] - +
@@ -33,7 +33,7 @@