This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git commit 9aca394bc6319948994497b66a61d638e6c044b9 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Feb 11 15:17:27 2016 +0100 fixes #7976 i18n for placeholders --- coselmar-ui/src/main/webapp/i18n/en.js | 34 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 34 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/index.html | 4 +-- .../main/webapp/views/documents/editDocument.html | 22 +++++++------- .../webapp/views/documents/modalDocumentEdit.html | 18 ++++++------ .../views/documents/modalDocumentSearch.html | 2 +- .../main/webapp/views/documents/newdocument.html | 20 ++++++------- .../src/main/webapp/views/documents/toolsPart.html | 18 ++++++------ .../src/main/webapp/views/links/modalLinkEdit.html | 4 +-- .../main/webapp/views/questions/editquestion.html | 16 +++++----- .../views/questions/modalQuestionSearch.html | 2 +- .../src/main/webapp/views/questions/toolsPart.html | 12 ++++---- .../main/webapp/views/referential/referential.html | 2 +- .../src/main/webapp/views/users/edituser.html | 20 ++++++------- .../src/main/webapp/views/users/newPassword.html | 2 +- .../src/main/webapp/views/users/searchPart.html | 12 ++++---- 16 files changed, 145 insertions(+), 77 deletions(-) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 7746165..1b4f6e3 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -371,4 +371,38 @@ var translateEN = { "pagination.results.page" : "Page", "pagination.results.of" : "of", +"placeholder.mail" : "Mail", +"placeholder.password" : "Password", +"placeholder.name" : "Name", +"placeholder.keywords" : "keyword1,keyword2,...", +"placeholder.addKeyword" : "Add a keyword", +"placeholder.title" : "Title", +"placeholder.nameOrFirstname" : "Name and/or firstname", +"placeholder.fullname" : "Fullname", +"placeholder.date" : "dd/mm/yyyy", +"placeholder.website" : "www.website.com", + +"placeholder.document.name" : "Document name", +"placeholder.document.copyright" : "Copyright owner", +"placeholder.document.license" : "Document License", +"placeholder.document.language" : "en,fr,...", +"placeholder.document.summary" : "Tape the document summary, it will help to retrieve document", + +"placeholder.project.title" : "Project name", +"placeholder.project.summary" : "This summary can also be used to retrieve the project", +"placeholder.project.addTag" : "Add a tag", +"placeholder.project.externalexperts" : "Expert1,Expert2,...", + +"placeholder.user.firstname" : "Firstname", +"placeholder.user.name" : "Name", +"placeholder.user.mail" : "example@provider.mail", +"placeholder.user.login" : "Login", +"placeholder.user.phone" : "+33912345678", +"placeholder.user.organization" : "Organization", +"placeholder.user.qualification" : "Qualification", +"placeholder.user.currentPassword" : "Current password", +"placeholder.user.newPassword" : "New password", +"placeholder.user.confirmPassword" : "Confirm password", +"placeholder.user.search" : "Search an user", + } \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index 9a148d0..4be7333 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -373,4 +373,38 @@ var translateFR = { "pagination.results.page" : "Page", "pagination.results.of" : "sur", +"placeholder.mail" : "Courriel", +"placeholder.password" : "Mot de passe", +"placeholder.name" : "Nom", +"placeholder.keywords" : "mot-clef1,mot-clef2,...", +"placeholder.addKeyword" : "Ajoutez un mot-clef", +"placeholder.title" : "Titre", +"placeholder.nameOrFirstname" : "Nom et/ou Prénom", +"placeholder.fullname" : "Prénom Nom", +"placeholder.date" : "jj/mm/aaaa", +"placeholder.website" : "www.siteinternet.com", + +"placeholder.document.name" : "Nom du document", +"placeholder.document.copyright" : "Porteur du copyright", +"placeholder.document.license" : "Licence du document", +"placeholder.document.language" : "en,fr,...", +"placeholder.document.summary" : "Saisissez le résumé du document, cela aidera à le retrouver", + +"placeholder.project.title" : "Nom du projet", +"placeholder.project.summary" : "Ce résumé sera également utilisé pour retrouver le projet", +"placeholder.project.addTag" : "Ajoutez un tag", +"placeholder.project.externalexperts" : "Expert1,Expert2,...", + +"placeholder.user.firstname" : "Prénom", +"placeholder.user.name" : "Nom", +"placeholder.user.mail" : "example@provider.mail", +"placeholder.user.login" : "Idenfitifiant", +"placeholder.user.phone" : "+33912345678", +"placeholder.user.organization" : "Organisation", +"placeholder.user.qualification" : "Profession", +"placeholder.user.currentPassword" : "Mot de passe actuel", +"placeholder.user.newPassword" : "Nouveau mot de passe", +"placeholder.user.confirmPassword" : "Confirmez le mot de passe", +"placeholder.user.search" : "Recherche d'un utilisateur", + } \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index 3eff44d..e0063f8 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -152,10 +152,10 @@ {{ 'user.message.login' | translate}} (<a href="#/users/forgotPassword">{{ 'user.message.forgotPassword' | translate }}</a> ) </div> <div class="form-group"> - <input type="text" placeholder="Mail" class="form-control mail" ng-model="loginMail"> + <input type="text" placeholder="{{ 'placeholder.mail' | translate }}" class="form-control mail" ng-model="loginMail"> </div> <div class="form-group"> - <input type="password" placeholder="Password" class="form-control" ng-model="loginPassword"> + <input type="password" placeholder="{{ 'placeholder.password' | translate }}" class="form-control" ng-model="loginPassword"> </div> <button type="submit" class="btn btn-action" ng-click="login(loginMail, loginPassword)">{{ 'menu.button.login' | translate}}</button> </form> diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index 074a5d0..85e57c1 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -44,7 +44,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="name" - placeholder="Document Name" + placeholder="{{ 'placeholder.document.name' | translate }}" ng-model="document.name" required/> <p ng-show="documentForm.name.$invalid && !documentForm.name.$pristine" @@ -57,7 +57,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="authors" - placeholder="Name FirstName" + placeholder="{{ 'placeholder.fullname' | translate }}" ng-model="document.authors" required/> <p ng-show="documentForm.authors.$invalid && !documentForm.authors.$pristine" @@ -119,7 +119,7 @@ theme="bootstrap" reset-search-input="true" ng-disabled="disabled" class="form-control"> - <ui-select-match placeholder="John Doe"> + <ui-select-match placeholder="{{ 'placeholder.fullname' | translate }}"> {{$item.firstName}} {{$item.name}} ({{$item.organization}}) </ui-select-match> @@ -173,7 +173,7 @@ <div class="input-group"> <span class="input-group-addon">http://</span> <input type="input" class="form-control" name="externalUrl" - placeholder="www.website.com" + placeholder="{{ 'placeholder.website' | translate }}" ng-model="document.externalUrl" /> </div> @@ -201,7 +201,7 @@ </button> </span> <input type="text" class="form-control" name="keywords" - placeholder="Add a keyword" + placeholder="{{ 'placeholder.addKeyword' | translate }}" ng-model="toAddKeyword" list="existingKeywords" /> <button type="button" class="btn btn-primary tag-input-add" value="{{ 'common.button.add' | translate}}" ng-click="addKeyword(toAddKeyword); toAddKeyword=''"><span class="fa fa-plus"></span></button> @@ -226,7 +226,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="copyright" - placeholder="Copyright owner" + placeholder="{{ 'placeholder.document.copyright' | translate }}" ng-model="document.copyright" required/> <p ng-show="documentForm.copyright.$invalid && !documentForm.copyright.$pristine" @@ -237,8 +237,8 @@ <label class="col-md-2 control-label">{{ 'document.metadata.licence' | translate }}</label> <div class="col-md-4"> - <input type="text" class="form-control" name="licence" - placeholder="License of document" + <input type="text" class="form-control" name="license" + placeholder="{{ 'placeholder.document.license' | translate }}" ng-model="document.licence"/> </div> </div> @@ -252,7 +252,7 @@ <div class="col-md-4"> <div class="input-group"> <input type="text" class="form-control" name="publicationDate" - placeholder="dd/MM/yyyy" + placeholder="{{ 'placeholder.date' | translate }}" ng-model="document.publicationDate" uib-datepicker-popup="dd/MM/yyyy" is-open="publicationDateOpened" ng-click="publicationDateOpened = true"/> @@ -266,7 +266,7 @@ <div class="col-md-1"> <input type="text" class="form-control" name="language" - placeholder="en,fr,..." + placeholder="{{ 'placeholder.document.language' | translate }}" ng-model="document.language"/> </div> </div> @@ -279,7 +279,7 @@ <div class="col-md-10"> <textarea type="text" class="form-control" name="summary" rows="5" - placeholder="Tape the document summary, it will help to retrieve document" + placeholder="{{ 'placeholder.document.summary' | translate }}" ng-model="document.summary" required/> <p ng-show="documentForm.summary.$invalid && !documentForm.summary.$pristine" diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html index 0e5e190..0194fef 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html @@ -48,7 +48,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="name" - placeholder="Document Name" + placeholder="{{ 'placeholder.document.name' | translate }}" ng-model="document.name" required /> <p ng-show="documentForm.name.$invalid && !documentForm.name.$pristine" @@ -62,7 +62,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="authors" - placeholder="Name Firstname" + placeholder="{{ 'placeholder.fullname' | translate }}" ng-model="document.authors" required/> <p ng-show="documentForm.authors.$invalid && !documentForm.authors.$pristine" @@ -144,7 +144,7 @@ <div class="input-group"> <span class="input-group-addon">http://</span> <input type="input" class="form-control" name="externalUrl" - placeholder="www.website.com" + placeholder="{{ 'placeholder.website' | translate }}" ng-model="document.externalUrl" ng-minlength="6"/> </div> </div> @@ -173,7 +173,7 @@ </button> </span> <input type="text" class="form-control" name="keywords" - placeholder="Add a keyword" + placeholder="{{ 'placeholder.addKeyword' | translate }}" data-ng-model="modalToAddKeyword" list="modalExistingKeywords"/> <button class="btn btn-primary tag-input-add" value="add" ng-click="addKeyword(modalToAddKeyword); modalToAddKeyword=''"><span class="fa fa-plus"></span></button> @@ -196,7 +196,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="copyright" - placeholder="Copyright owner" + placeholder="{{ 'placeholder.document.copyright' | translate }}" ng-model="document.copyright" required/> <p ng-show="documentForm.copyright.$invalid && !documentForm.copyright.$pristine" @@ -209,7 +209,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="licence" - placeholder="License of document" + placeholder="{{ 'placeholder.document.license' | translate }}" ng-model="document.licence"/> </div> </div> @@ -224,7 +224,7 @@ <div class="col-md-4"> <div class="input-group"> <input type="text" class="form-control" name="publicationDate" - placeholder="dd/MM/yyyy" + placeholder="{{ 'placeholder.date' | translate }}" ng-model="document.publicationDate" uib-datepicker-popup="dd/MM/yyyy" is-open="publicationDateOpened" @@ -241,7 +241,7 @@ <div class="col-md-3"> <input type="text" class="form-control" name="language" - placeholder="en,fr,..." + placeholder="{{ 'placeholder.document.language' | translate }}" ng-model="document.language"/> </div> </div> @@ -256,7 +256,7 @@ <div class="col-md-10"> <textarea type="text" class="form-control" name="summary" rows="5" - placeholder="Tape the document summary, it will help to retrieve document" + placeholder="{{ 'placeholder.document.summary' | translate }}" ng-model="document.summary" required/> <p ng-show="documentForm.summary.$invalid && !documentForm.summary.$pristine" diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html index 255f7c4..c3ed963 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html @@ -36,7 +36,7 @@ <div class="form-group"> <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'common.message.info.searchKeywords' | translate }}"></span> <div class="input-group"> - <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchKeywords" ng-list /> + <input type="search" class="form-control" placeholder="{{ 'placeholder.keywords' | translate }}" ng-model="searchKeywords" ng-list /> <span class="input-group-btn"> <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button> </span> diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index 6de000f..e10f668 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -52,7 +52,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="name" - placeholder="Document Name" + placeholder="{{ 'placeholder.document.name' | translate }}" ng-model="document.name" required/> <p ng-show="documentForm.name.$invalid && !documentForm.name.$pristine" @@ -66,7 +66,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="authors" - placeholder="Name Firstname" + placeholder="{{ 'placeholder.fullname' | translate }}" ng-model="document.authors" required/> <p ng-show="documentForm.authors.$invalid && !documentForm.authors.$pristine" @@ -128,7 +128,7 @@ theme="bootstrap" reset-search-input="true" ng-disabled="disabled" class="form-control"> - <ui-select-match placeholder="John Doe"> + <ui-select-match placeholder="{{ 'placeholder.fullname' | translate }}"> {{$item.firstName}} {{$item.name}} ({{$item.organization}}) </ui-select-match> @@ -165,7 +165,7 @@ <div class="input-group"> <span class="input-group-addon">http://</span> <input type="input" class="form-control" name="externalUrl" - placeholder="www.website.com" + placeholder="{{ 'placeholder.website' | translate }}" ng-model="document.externalUrl" /> </div> @@ -194,7 +194,7 @@ </span> <input type="text" class="form-control" name="keywords" - placeholder="Add a keyword" + placeholder="{{ 'placeholder.addKeyword' | translate }}" ng-model="toAddKeyword" list="existingKeywords" /> <button type="button" class="btn btn-primary tag-input-add" ng-click="addKeyword(toAddKeyword); toAddKeyword='';"><span class="fa fa-plus"></span></button> @@ -219,7 +219,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="copyright" - placeholder="Copyright owner" + placeholder="{{ 'placeholder.document.copyright' | translate }}" ng-model="document.copyright" required/> <p ng-show="documentForm.copyright.$invalid && !documentForm.copyright.$pristine" @@ -231,7 +231,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="licence" - placeholder="License of document" + placeholder="{{ 'placeholder.document.license' | translate }}" ng-model="document.licence"/> </div> </div> @@ -245,7 +245,7 @@ <div class="col-md-4"> <div class="input-group"> <input type="text" class="form-control" name="publicationDate" - placeholder="dd/MM/yyyy" + placeholder="{{ 'placeholder.date' | translate }}" ng-model="document.publicationDate" uib-datepicker-popup="dd/MM/yyyy" is-open="publicationDateOpened" ng-click="publicationDateOpened = true"/> @@ -259,7 +259,7 @@ <div class="col-md-1"> <input type="text" class="form-control" name="language" - placeholder="en,fr,..." + placeholder="{{ 'placeholder.document.language' | translate }}" ng-model="document.language"/> </div> </div> @@ -272,7 +272,7 @@ <div class="col-md-10"> <textarea type="text" class="form-control" name="summary" rows="5" - placeholder="Tape the document summary, it will help to retrieve document" + placeholder="{{ 'placeholder.document.summary' | translate }}" ng-model="document.summary" required/> <p ng-show="documentForm.summary.$invalid && !documentForm.summary.$pristine" diff --git a/coselmar-ui/src/main/webapp/views/documents/toolsPart.html b/coselmar-ui/src/main/webapp/views/documents/toolsPart.html index bf1b457..96b6fb4 100644 --- a/coselmar-ui/src/main/webapp/views/documents/toolsPart.html +++ b/coselmar-ui/src/main/webapp/views/documents/toolsPart.html @@ -37,7 +37,7 @@ <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'common.message.info.searchKeywords' | translate }}"></span> <div class="input-group"> - <input type="text" class="form-control" placeholder="keyword1,keyword2,..." ng-model="example.fullTextSearch" ng-list /> + <input type="text" class="form-control" placeholder="{{ 'placeholder.keywords' | translate }}" ng-model="example.fullTextSearch" ng-list /> <span class="input-group-btn"> <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i></button> </span> @@ -68,12 +68,12 @@ <label class="col-md-2 control-label">{{ 'document.metadata.keywords' | translate }}</label> <div class="col-md-4"> - <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="example.keywords" ng-list /> + <input type="search" class="form-control" placeholder="{{ 'placeholder.keywords' | translate }}" ng-model="example.keywords" ng-list /> </div> <label class="col-md-2 control-label">{{ 'document.metadata.name' | translate }}</label> <div class="col-md-4"> - <input class="form-control" type="search" class="form-control" placeholder="Titre" ng-model="example.name" /> + <input class="form-control" type="search" class="form-control" placeholder="{{ 'placeholder.title' | translate }}" ng-model="example.name" /> </div> </div> @@ -81,7 +81,7 @@ <label class="col-md-2 control-label">{{ 'document.metadata.authors' | translate }}</label> <div class="col-md-4"> - <input class="form-control" type="search" class="form-control" placeholder="Nom et/ou Prénom" ng-model="example.authors" /> + <input class="form-control" type="search" class="form-control" placeholder="{{ 'placeholder.nameOrFirstname' | translate }}" ng-model="example.authors" /> </div> <label class="col-md-2 control-label">{{ 'document.metadata.privacy' | translate }}</label> @@ -99,7 +99,7 @@ <div class="form-group row"> <label class="col-md-2 control-label">{{ 'document.metadata.depositor' | translate }}</label> <div class="col-md-4"> - <input type="search" class="form-control" placeholder="Prénom Nom" ng-model="example.ownerName" /> + <input type="search" class="form-control" placeholder="{{ 'placeholder.fullname' | translate }}" ng-model="example.ownerName" /> </div> @@ -131,7 +131,7 @@ <div class="col-md-4"> <div class="input-group"> <input type="text" class="form-control" name="depositAfterDate" - placeholder="dd/MM/yyyy" + placeholder="{{ 'placeholder.date' | translate }}" ng-model="example.depositAfterDate" uib-datepicker-popup="dd/MM/yyyy" is-open="depositAfterDateOpened" ng-click="depositAfterDateOpened = true"/> @@ -145,7 +145,7 @@ <div class="col-md-4"> <div class="input-group"> <input type="text" class="form-control" name="depositBeforeDate" - placeholder="dd/MM/yyyy" + placeholder="{{ 'placeholder.date' | translate }}" ng-model="example.depositBeforeDate" uib-datepicker-popup="dd/MM/yyyy" is-open="depositBeforeDateOpened" ng-click="depositBeforeDateOpened = true"/> @@ -163,7 +163,7 @@ <div class="col-md-4"> <div class="input-group"> <input type="text" class="form-control" name="publicationAfterDate" - placeholder="dd/MM/yyyy" + placeholder="{{ 'placeholder.date' | translate }}" ng-model="example.publicationAfterDate" datepicker-popup="dd/MM/yyyy" is-open="publicationAfterDateOpened" ng-click="publicationAfterDateOpened = true"/> @@ -175,7 +175,7 @@ <div class="col-md-4"> <div class="input-group"> <input type="text" class="form-control" name="publicationBeforeDate" - placeholder="dd/MM/yyyy" + placeholder="{{ 'placeholder.date' | translate }}" ng-model="example.publicationBeforeDate" datepicker-popup="dd/MM/yyyy" is-open="publicationBeforeDateOpened" ng-click="publicationBeforeDateOpened = true"/> diff --git a/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html b/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html index 00d3e03..c12541e 100644 --- a/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html +++ b/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html @@ -50,7 +50,7 @@ <div class="input-group"> <span class="input-group-addon">http://</span> <input type="text" class="form-control" id="linkUrl" - placeholder="Link Name" + placeholder="{{ 'placeholder.website' | translate }}" ng-model="link.url" required /> </div> @@ -68,7 +68,7 @@ <div class="col-md-8"> <input type="text" class="form-control" id="name" - placeholder="Name" + placeholder="{{ 'placeholder.name' | translate }}" ng-model="link.name"/> </div> </div> diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 14a0618..f89b1fa 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -33,7 +33,7 @@ <div class="col-md-10"> <input type="text" class="form-control" name="title" ng-minlength="10" - placeholder="Project Title" + placeholder="{{ 'placeholder.project.title' | translate }}" ng-model="question.title" required/> <p ng-show="questionForm.title.$invalid && !questionForm.title.$pristine" class="help-block">{{ 'question.message.requiredTitle' | translate }}</p> </div> @@ -86,7 +86,7 @@ <div class="col-md-2"> <input type="text" class="form-control" name="deadline" - placeholder="dd/MM/yyyy" + placeholder="{{ 'placeholder.date' | translate }}" ng-model="question.deadline" uib-datepicker-popup="dd/MM/yyyy" is-open="deadlineDateOpened" ng-click="deadlineDateOpened = true" /> @@ -105,7 +105,7 @@ <div class="col-md-10"> <textarea type="text" class="form-control" name="summary" rows="8" - placeholder="This summary can also be used to retrieve the project" + placeholder="{{ 'placeholder.project.summary' | translate }}" ng-model="question.summary" required/> <p ng-show="questionForm.summary.$invalid && !questionForm.summary.$pristine" @@ -136,7 +136,7 @@ </span> <input type="text" class="form-control" name="themes" - placeholder="Add a tag" + placeholder="{{ 'placeholder.project.addTag' | translate }}" data-ng-model="toAddTheme" list="existingThemes" /> <button type="button" class="btn btn-primary tag-input-add" value="add" ng-click="addTheme(toAddTheme); toAddTheme=''"><span class="fa fa-plus"></span></button> @@ -265,7 +265,7 @@ theme="bootstrap" reset-search-input="true" ng-disabled="disabled" class="form-control"> - <ui-select-match placeholder="Select expert..."> + <ui-select-match placeholder="{{ 'placeholder.fullname' | translate }}"> {{$item.firstName}} {{$item.name}}<span ng-if="$item.organization"> ({{$item.organization}})</span> </ui-select-match> @@ -290,7 +290,7 @@ theme="bootstrap" reset-search-input="true" ng-disabled="disabled" class="form-control"> - <ui-select-match placeholder="Select client..."> + <ui-select-match placeholder="{{ 'placeholder.fullname' | translate }}"> {{$item.firstName}} {{$item.name}}<span ng-if="$item.organization"> ({{$item.organization}})</span> </ui-select-match> @@ -324,7 +324,7 @@ <input type="text" ng-model="question.externalExperts" class="form-control" name="externalExperts" - placeholder="expert1, expert2, ..." ng-list > + placeholder="{{ 'placeholder.project.externalExperts' | translate }}" ng-list > </div> </div> @@ -338,7 +338,7 @@ theme="bootstrap" reset-search-input="true" ng-disabled="disabled" class="form-control"> - <ui-select-match placeholder="Select supervisor..."> + <ui-select-match placeholder="{{ 'placeholder.fullname' | translate }}"> {{$item.firstName}} {{$item.name}}<span ng-if="$item.organization"> ({{$item.organization}})</span> </ui-select-match> diff --git a/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html b/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html index 765b43f..4bef282 100644 --- a/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html +++ b/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html @@ -35,7 +35,7 @@ <div class="form-group"> <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'common.message.info.searchKeywords' | translate }}"></span> <div class="input-group"> - <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchKeywords" ng-list /> + <input type="search" class="form-control" placeholder="{{ 'placeholder.keywords' | translate }}" ng-model="searchKeywords" ng-list /> <span class="input-group-btn"> <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button> </span> diff --git a/coselmar-ui/src/main/webapp/views/questions/toolsPart.html b/coselmar-ui/src/main/webapp/views/questions/toolsPart.html index 32304df..a2642cd 100644 --- a/coselmar-ui/src/main/webapp/views/questions/toolsPart.html +++ b/coselmar-ui/src/main/webapp/views/questions/toolsPart.html @@ -36,7 +36,7 @@ {{ 'common.button.searchField' | translate }} <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'common.message.info.searchKeywords' | translate }}"></span> <div class="input-group"> - <input type="text" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchOptions.fullTextSearch" ng-list /> + <input type="text" class="form-control" placeholder="{{ 'placeholder.keywords' | translate }}" ng-model="searchOptions.fullTextSearch" ng-list /> <span class="input-group-btn"> <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i></button> </span> @@ -67,7 +67,7 @@ <label class="col-md-1 control-label">{{ 'question.metadata.title' | translate }}</label> <div class="col-md-2"> - <input class="form-control" type="search" class="form-control" placeholder="Titre" ng-model="searchOptions.title" /> + <input class="form-control" type="search" class="form-control" placeholder="{{ 'placeholder.project.title' | translate }}" ng-model="searchOptions.title" /> </div> <label class="col-md-1 control-label">{{ 'question.metadata.type' | translate }}</label> @@ -109,7 +109,7 @@ <div class="col-md-3"> <div class="input-group"> <input type="text" class="form-control" name="submitAfterDate" - placeholder="dd/MM/yyyy" + placeholder="{{ 'placeholder.date' | translate }}" ng-model="searchOptions.submissionAfterDate" uib-datepicker-popup="dd/MM/yyyy" is-open="submitAfterDateOpened" ng-click="submitAfterDateOpened = true"/> @@ -121,7 +121,7 @@ <div class="col-md-3"> <div class="input-group"> <input type="text" class="form-control" name="submitBeforeDate" - placeholder="dd/MM/yyyy" + placeholder="{{ 'placeholder.date' | translate }}" ng-model="searchOptions.submissionBeforeDate" uib-datepicker-popup="dd/MM/yyyy" is-open="submitBeforeDateOpened" ng-click="submitBeforeDateOpened = true"/> @@ -140,7 +140,7 @@ <div class="col-md-3"> <div class="input-group"> <input type="text" class="form-control" id="deadlineAfterDate" - placeholder="dd/MM/yyyy" + placeholder="{{ 'placeholder.date' | translate }}" ng-model="searchOptions.deadlineAfterDate" uib-datepicker-popup="dd/MM/yyyy" is-open="deadlineAfterDateOpened" ng-click="deadlineAfterDateOpened = true"/> @@ -152,7 +152,7 @@ <div class="col-md-3"> <div class="input-group"> <input type="text" class="form-control" id="deadlineBeforeDate" - placeholder="dd/MM/yyyy" + placeholder="{{ 'placeholder.date' | translate }}" ng-model="searchOptions.deadlineBeforeDate" uib-datepicker-popup="dd/MM/yyyy" is-open="deadlineBeforeDateOpened" ng-click="deadlineBeforeDateOpened = true"/> diff --git a/coselmar-ui/src/main/webapp/views/referential/referential.html b/coselmar-ui/src/main/webapp/views/referential/referential.html index 53fd8d6..5ddb756 100644 --- a/coselmar-ui/src/main/webapp/views/referential/referential.html +++ b/coselmar-ui/src/main/webapp/views/referential/referential.html @@ -35,7 +35,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="keywords" - ng-model="search.keywords" ng-list placeholder="keyword1,keyword2,..."/> + ng-model="search.keywords" ng-list placeholder="{{ 'placeholder.keywords' | translate }}"/> </div> <div class="col-md-2"> diff --git a/coselmar-ui/src/main/webapp/views/users/edituser.html b/coselmar-ui/src/main/webapp/views/users/edituser.html index 0aa0842..a104a35 100644 --- a/coselmar-ui/src/main/webapp/views/users/edituser.html +++ b/coselmar-ui/src/main/webapp/views/users/edituser.html @@ -36,7 +36,7 @@ <div class="col-md-5"> <input type="text" class="form-control" name="firstName" - placeholder="FirstName" + placeholder="{{ 'placeholder.user.firstname' | translate }}" ng-model="user.firstName" required/> <p ng-show="userForm.firstName.$invalid && !userForm.firstName.$pristine" class="help-block">{{ 'user.message.requiredFirsName' | translate }}</p> </div> @@ -47,7 +47,7 @@ <div class="col-md-5"> <input type="text" class="form-control" name="name" - placeholder="Name" + placeholder="{{ 'placeholder.user.name' | translate }}" ng-model="user.name" required/> <p ng-show="userForm.name.$invalid && !userForm.name.$pristine" class="help-block">{{ 'user.message.requiredName' | translate }}</p> </div> @@ -85,11 +85,11 @@ <div class="col-md-5"> <input type="email" class="form-control" name="mail" ng-model="user.mail" - placeholder="example@provider.mail" required + placeholder="{{ 'placeholder.user.mail' | translate }}" required ng-if="!simpleLogin" /> <input type="text" class="form-control" name="mail" ng-model="user.mail" - placeholder="login" required + placeholder="{{ 'placeholder.user.login' | translate }}" required ng-if="simpleLogin" /> <p ng-show="context.currentUser && (context.currentUser.role == 'ADMIN' || context.currentUser.role == 'SUPERVISOR') && context.currentUser.userId != user.id"> @@ -106,7 +106,7 @@ <div class="col-md-5"> <input type="text" class="form-control" name="phoneNumber" - placeholder="+33912345678" + placeholder="{{ 'placeholder.user.phone' | translate }}" ng-model="user.phoneNumber" /> </div> @@ -117,7 +117,7 @@ <div class="col-md-5"> <input type="text" class="form-control" name="organization" - placeholder="organization" + placeholder="{{ 'placeholder.user.organization' | translate }}" ng-model="user.organization" /> </div> @@ -128,7 +128,7 @@ <div class="col-md-5"> <input type="text" class="form-control" name="qualification" - placeholder="qualification" + placeholder="{{ 'placeholder.user.qualification' | translate }}" ng-model="user.qualification" required/> <p ng-show="userForm.qualification.$invalid && !userForm.qualification.$pristine" class="help-block">{{ 'user.message.requiredFirsName' | translate }}</p> </div> @@ -142,7 +142,7 @@ <div class="col-md-5"> <input type="password" class="form-control" name="password" - placeholder="current password" + placeholder="{{ 'placeholder.user.currentPassword' | translate }}" ng-model="user.password" required/> <p ng-show="userForm.password.$invalid && !userForm.password.$pristine" class="help-block">{{ 'user.message.requiredPassword' | translate }}</p> </div> @@ -161,11 +161,11 @@ <div ng-show="newPasswordAsked"> <input type="password" class="form-control" name="newPassword" - id="newPassword" placeholder="new password" + id="newPassword" placeholder="{{ 'placeholder.user.newPassword' | translate }}" ng-model="user.newPassword" ng-minlength="6" /> <input type="password" class="form-control" name="confirmNewPassword" - id="confirmPassword" placeholder="confirm password" + id="confirmPassword" placeholder="{{ 'placeholder.user.confirmPassword' | translate }}" ng-model="confirmNewPassword" ng-minlength="6" identical-check="newPassword" ng-class="{'has-error' : userForm.confirmNewPassword.$error.identicalmatch }"/> diff --git a/coselmar-ui/src/main/webapp/views/users/newPassword.html b/coselmar-ui/src/main/webapp/views/users/newPassword.html index 82fee7f..48a79d8 100644 --- a/coselmar-ui/src/main/webapp/views/users/newPassword.html +++ b/coselmar-ui/src/main/webapp/views/users/newPassword.html @@ -41,7 +41,7 @@ <label class="control-label">{{ 'user.message.enterMail' | translate }}</label> <input type="email" class="form-control" name="mail" - placeholder="nom@ifremer.fr" ng-model="mail" required/> + placeholder="{{ 'placeholder.user.mail' | translate }}" ng-model="mail" required/> </div> diff --git a/coselmar-ui/src/main/webapp/views/users/searchPart.html b/coselmar-ui/src/main/webapp/views/users/searchPart.html index fcaf325..ede744d 100644 --- a/coselmar-ui/src/main/webapp/views/users/searchPart.html +++ b/coselmar-ui/src/main/webapp/views/users/searchPart.html @@ -38,7 +38,7 @@ <div class="form-group"> {{ 'common.button.searchField' | translate }} <div class="input-group"> - <input type="search" class="form-control" placeholder="Search an user" ng-model="example.fullTextSearch" ng-list/> + <input type="search" class="form-control" placeholder="{{ 'placeholder.user.search' | translate }}" ng-model="example.fullTextSearch" ng-list/> <span class="input-group-btn"> <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i></button> </span> @@ -69,17 +69,17 @@ <label class="col-md-1 control-label">{{ 'user.metadata.name' | translate }}</label> <div class="col-md-2"> - <input class="form-control" type="search" class="form-control" placeholder="Nom" ng-model="example.name" /> + <input class="form-control" type="search" class="form-control" placeholder="{{ 'placeholder.user.name' | translate }}" ng-model="example.name" /> </div> <label class="col-md-1 control-label">{{ 'user.metadata.firstName' | translate }}</label> <div class="col-md-2"> - <input class="form-control" type="search" class="form-control" placeholder="Prénom" ng-model="example.firstName" /> + <input class="form-control" type="search" class="form-control" placeholder="{{ 'placeholder.user.firstname' | translate }}" ng-model="example.firstName" /> </div> <label class="col-md-1 control-label">{{ 'user.metadata.mail' | translate }}</label> <div class="col-md-2"> - <input class="form-control" type="search" class="form-control" placeholder="nom@ifremer.fr" ng-model="example.mail" /> + <input class="form-control" type="search" class="form-control" placeholder="{{ 'placeholder.user.mail' | translate }}" ng-model="example.mail" /> </div> <label class="col-md-1 control-label">{{ 'user.metadata.role' | translate }}</label> @@ -100,12 +100,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="Ifremer" ng-model="example.organization" /> + <input class="form-control" type="search" class="form-control" placeholder="{{ 'placeholder.user.organization' | translate }}" 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="Ingénieur" ng-model="example.qualification" /> + <input class="form-control" type="search" class="form-control" placeholder="{{ 'placeholder.user.qualification' | translate }}" 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>.