This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit b85f2a901558c3fbf852d5eeadfd1599d8b17cf2 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Jan 14 17:26:31 2016 +0100 Corrections d'affichage --- coselmar-ui/src/main/webapp/i18n/en.js | 2 +- coselmar-ui/src/main/webapp/i18n/fr.js | 2 +- coselmar-ui/src/main/webapp/views/users/edituser.html | 2 +- coselmar-ui/src/main/webapp/views/users/searchPart.html | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 896f386..af389cc 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -265,7 +265,7 @@ var translateEN = { "user.message.enterMail" : "Please enter your email", "user.message.unknownMail" : "This email does not exist.", "user.message.newPasswordSent" : "A new password has been sent.", -"user.message.wannaSimpleLogin" : "Use simple login, not a mail (Warning : no password could be sent)", +"user.message.wannaSimpleLogin" : "I want to use a simple login, not a mail (Warning : no password could be sent)", "user.message.invalidLogin" : "Login is mandatory.", "user.message.created" : "User well created.", "user.message.updated" : "User well modified.", diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index a8bd20a..7c06f61 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -265,7 +265,7 @@ var translateFR = { "user.message.enterMail" : "Veuillez entrer votre courriel", "user.message.unknownMail" : "Ce courriel est inconnu.", "user.message.newPasswordSent" : "Un nouveau mot de passe a été envoyé.", -"user.message.wannaSimpleLogin" : "Utiliser un simple identifiant et non un courriel (Attention : aucun mot de passe ne pourra être envoyé.)", +"user.message.wannaSimpleLogin" : "Je souhaite utiliser un simple identifiant et non un courriel (Attention : aucun mot de passe ne pourra être envoyé.)", "user.message.invalidLogin" : "L'identifiant est obligatoire.", "user.message.created" : "Utilisateur créé.", "user.message.updated" : "Utilisateur modifié.", diff --git a/coselmar-ui/src/main/webapp/views/users/edituser.html b/coselmar-ui/src/main/webapp/views/users/edituser.html index 2d0ee19..d18fd3d 100644 --- a/coselmar-ui/src/main/webapp/views/users/edituser.html +++ b/coselmar-ui/src/main/webapp/views/users/edituser.html @@ -93,7 +93,7 @@ ng-if="simpleLogin" /> <p ng-show="context.currentUser && (context.currentUser.role == 'ADMIN' || context.currentUser.role == 'SUPERVISOR') && context.currentUser.userId != user.id"> - <input type="checkbox" ng-model="simpleLogin">{{ 'user.message.wannaSimpleLogin' | translate }} + <input type="checkbox" ng-model="simpleLogin">{{ 'user.message.wannaSimpleLogin' | translate }}</input> </p> <p ng-show="userForm.mail.$invalid && !userForm.mail.$pristine" class="help-block" ng-if="!simpleLogin">{{ 'user.message.invalidMail' | translate }}</p> <p ng-show="userForm.mail.$invalid && !userForm.mail.$pristine" class="help-block" ng-if="simpleLogin">{{ 'user.message.invalidLogin' | translate }}</p> diff --git a/coselmar-ui/src/main/webapp/views/users/searchPart.html b/coselmar-ui/src/main/webapp/views/users/searchPart.html index dd5d238..0b8b8e9 100644 --- a/coselmar-ui/src/main/webapp/views/users/searchPart.html +++ b/coselmar-ui/src/main/webapp/views/users/searchPart.html @@ -97,12 +97,12 @@ <label class="col-md-1 control-label">{{ 'user.metadata.organization' | translate }}</label> <div class="col-md-2"> - <input class="form-control" type="search" class="form-control" placeholder="MI-6" ng-model="example.organization" /> + <input class="form-control" type="search" class="form-control" placeholder="Ifremer" ng-model="example.organization" /> </div> <label class="col-md-1 control-label">{{ 'user.metadata.qualification' | translate }}</label> <div class="col-md-2"> - <input class="form-control" type="search" class="form-control" placeholder="007" ng-model="example.qualification" /> + <input class="form-control" type="search" class="form-control" placeholder="Ingénieur" ng-model="example.qualification" /> </div> <label class="col-md-1 control-label">{{ 'user.metadata.status' | translate }}</label> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.