- Pollen-commits - mailman.cloud.codelutin.com

01/01: change closeContext to close for new version of topia
by chorem.org scm June 4, 2014

June 4, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit d9516c30c1e286ed96a8005219d4d0b9bee6e036 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 4 11:28:22 2014 +0200 change closeContext to close for new version of topia --- .../org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java | 4 ++-- .../chorem/pollen/services/service/security/PollenSecurityRealm.java | 2 +- .../org/chorem/pollen/services/test/FakePollenApplicationContext.java | 4 ++-- pom.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java index bd2a0a7..cafb91b 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java @@ -198,7 +198,7 @@ public class PollenRestApiApplicationContext implements PollenApplicationContext if (log.isInfoEnabled()) { log.info("stopping Pollen, will close persistence context"); } - topiaApplicationContext.closeContext(); + topiaApplicationContext.close(); } closed.set(true); @@ -263,7 +263,7 @@ public class PollenRestApiApplicationContext implements PollenApplicationContext } catch (InvalidFormException e) { //Can't happen } finally { - persistenceContext.closeContext(); + persistenceContext.close(); } // -- init security realm -- // diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java index 2c37561..b7a4201 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java @@ -97,7 +97,7 @@ public class PollenSecurityRealm extends AuthorizingRealm { return result; } finally { - persistenceContext.closeContext(); + persistenceContext.close(); } } } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/test/FakePollenApplicationContext.java b/pollen-services/src/main/java/org/chorem/pollen/services/test/FakePollenApplicationContext.java index 867b5cb..2288119 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/test/FakePollenApplicationContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/test/FakePollenApplicationContext.java @@ -155,7 +155,7 @@ public class FakePollenApplicationContext extends TestWatcher implements PollenA if (!openedTransaction.isClosed()) { - openedTransaction.closeContext(); + openedTransaction.close(); } @@ -165,7 +165,7 @@ public class FakePollenApplicationContext extends TestWatcher implements PollenA log.trace("closing transaction " + applicationContext); } - applicationContext.closeContext(); + applicationContext.close(); } } diff --git a/pom.xml b/pom.xml index 60ac4f9..793d363 100644 --- a/pom.xml +++ b/pom.xml @@ -166,8 +166,8 @@ <eugenePluginVersion>2.10</eugenePluginVersion> <topiaVersion>3.0-SNAPSHOT</topiaVersion> - <nuitonWebVersion>1.16</nuitonWebVersion> - <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> + <nuitonWebVersion>1.17-SNAPSHOT</nuitonWebVersion> + <nuitonUtilsVersion>3.0-rc-3</nuitonUtilsVersion> <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion> <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: translate poll form
by chorem.org scm June 3, 2014

June 3, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 06f0345f6a6efd146480bd99fa2301eac7fcf8a9 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 3 17:19:38 2014 +0200 translate poll form --- pollen-ui-angular/src/main/webapp/i18n/en.js | 23 +++++++++++++++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 24 +++++++++++++++- .../src/main/webapp/js/controllers/pollCtrl.js | 14 ++++++--- .../src/main/webapp/partials/big-poll.html | 8 +++--- .../src/main/webapp/partials/inline-poll.html | 10 +++---- .../src/main/webapp/partials/poll-comment.html | 6 ++-- .../src/main/webapp/partials/poll-popupChoice.html | 2 +- .../src/main/webapp/partials/poll.html | 33 +++++++++++----------- 8 files changed, 85 insertions(+), 35 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index a0b879e..b44924c 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -30,11 +30,34 @@ var translateEN = { 'user.error.mail.empty' : 'E-mail can not be empty', 'user.error.login' : 'Error in e-mail or password', +'poll.tab.vote' : 'Vote', +'poll.tab.comment' : 'Comment', +'poll.tab.result' : 'Result', +'poll.tab.create' : 'Create', +'poll.tab.edit' : 'Edit', +'poll.tab.conf' : 'Configuration', + +'poll.edit' : 'Click to edit', +'poll.desc' : 'Description is optional. This message will not visible in vote page.', +'poll.saved' : 'Poll saved.', + +'vote.added' : 'Vote added.', + +'comment' : 'Comment', +'comment.added' : 'Comment added.', + + 'action.logout' : 'Logout', 'action.login' : 'Login', 'action.register' : 'Register', 'action.recovered' : 'Recovered', 'action.send' : 'Send', +'action.return' : 'Return', +'action.save' : 'Save', +'action.delete' : 'Delete', +'action.vote' : 'Vote', + +'dateFormat' : 'MM-dd-yy', } diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 6fe7c64..c7a2022 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -30,11 +30,33 @@ var translateFR = { 'user.error.mail.empty' : 'Courriel ne peux pas être vide', 'user.error.login' : 'Erreur sur le nom d\'utilisateur ou le mot de passe', +'poll.tab.vote' : 'Voter', +'poll.tab.comment' : 'Commenter', +'poll.tab.result' : 'Résultat', +'poll.tab.create' : 'Créer', +'poll.tab.edit' : 'Éditer', +'poll.tab.conf' : 'Configuration', + +'poll.edit' : 'Clique pour éditer', +'poll.desc' : 'Description (Facultatif). Ce cadre disparait si aucune description n\'est mise', +'poll.saved' : 'Sondage sauvegardé', + +'vote.added' : 'Vote effectué', + +'comment' : 'Commentaire', +'comment.added' : 'Commentaire effectué', + 'action.logout' : 'Deconnexion', 'action.login' : 'Connexion', 'action.register' : 'S\'enregistrer', 'action.recovered' : 'Récupéré', -'action.send' : 'envoyé', +'action.send' : 'Envoyé', +'action.return' : 'Retour', +'action.save' : 'Sauvegarder', +'action.delete' : 'Supprimer', +'action.vote' : 'Voter', + +'dateFormat' : 'dd/MM/yyyy', } diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 58d2b38..40bb888 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -23,8 +23,8 @@ angular.module('pollControllers', []) }]) .controller('PollCtrl', - ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', - function ( $scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage) { + ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', '$translate', + function ( $scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate) { $scope.setTab = function (defaultValue) { if (angular.isDefined($routeParams.tab)) { return $routeParams.tab; @@ -85,6 +85,10 @@ angular.module('pollControllers', []) } } + $translate('dateFormat').then(function (dateFormat) { + $scope.globalVariables.dateFormat = dateFormat; + }); + $scope.data = {}; $scope.data.poll = {}; @@ -187,7 +191,8 @@ angular.module('pollControllers', []) controller : PollPopChoiceCtrl, resolve : { title : function () { return title;}, - choice : function () { return choice;} + choice : function () { return choice;}, + dateFormat : function () { return $scope.globalVariables.dateFormat;} } }); @@ -203,9 +208,10 @@ angular.module('pollControllers', []) } - var PollPopChoiceCtrl = function ($scope, $modalInstance, title, choice) { + var PollPopChoiceCtrl = function ($scope, $modalInstance, title, choice, dateFormat) { $scope.title = title; $scope.choice = choice; + $scope.dateFormat = dateFormat; var oldChoice = angular.copy(choice); diff --git a/pollen-ui-angular/src/main/webapp/partials/big-poll.html b/pollen-ui-angular/src/main/webapp/partials/big-poll.html index 66c5901..c26b877 100644 --- a/pollen-ui-angular/src/main/webapp/partials/big-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/big-poll.html @@ -38,11 +38,11 @@ <div ng-if="choice.choiceType == 'DATE'"> <h3 edit-me="showEdit" ng-hide="showEdit || isOpen" ng-mouseenter="showEditHover = true" ng-mouseleave="showEditHover = false"> <button class="btn btn-default" ng-if="!globalVariables.voted && globalVariables.editMode" ng-show="showEditHover" ng-click="editChoice(choice)">...</button> - {{choice.date | date:'dd/MM/yyyy'}} + {{choice.date | date:globalVariables.dateFormat}} </h3> <h3 ng-show="showEdit || isOpen"> <input type="text" ng-model="choice.date" - datepicker-popup="dd/MM/yyyy" + datepicker-popup="{{globalVariables.dateFormat}}" is-open="isOpen" focus-me="showEdit" ng-exit="showEdit = false" @@ -70,6 +70,6 @@ </div> <div class="pollBigVote"> - <input type="text" placeholder="Votre Nom" ng-model="data.vote.voterName"/> - <button class="btn btn-primary" ng-click="voter()">Voter</button> + <input type="text" placeholder="{{ 'user.name' | translate }}" ng-model="data.vote.voterName"/> + <button class="btn btn-primary" ng-click="voter()">{{ 'action.vote' | translate }}</button> </div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html index 528aab7..0b0b620 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -28,7 +28,7 @@ <td ng-repeat="choice in data.choices" class="pollChoice pollAnim" ng-mouseenter="showEditHover = true" ng-mouseleave="showEditHover = false"> <div ng-if="choice.choiceType == 'TEXT'" edit-me="showEdit" > <div ng-hide="showEdit && !globalVariables.voted" class="fixe-input" title="{{choice.description}}"> - {{choice.name || 'click pour éditer'}} + {{choice.name || 'poll.edit' | translate}} <info-error error="choice.restError.name[0]" data="choice.name"></info-error> <input type="button" class="btn btn-default" ng-if="!globalVariables.voted && globalVariables.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/></div> <div ng-show="showEdit && !globalVariables.voted"> @@ -37,9 +37,9 @@ </div> </div> <div ng-if="choice.choiceType == 'DATE'" edit-me="showEdit" > - <div ng-hide="!globalVariables.voted && showEdit || isOpen" class="fixe-input" title="{{choice.description}}">{{choice.date | date:'dd/MM/yyyy'}} <input type="button" class="btn btn-default" ng-if="!globalVariables.voted && globalVariables.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/></div> + <div ng-hide="!globalVariables.voted && showEdit || isOpen" class="fixe-input" title="{{choice.description}}">{{choice.date | date:globalVariables.dateFormat}} <input type="button" class="btn btn-default" ng-if="!globalVariables.voted && globalVariables.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/></div> <div ng-show="!globalVariables.voted && showEdit || isOpen" > - <input type="text" class="form-control" ng-model="choice.date" focus-me="showEdit" datepicker-popup="dd/MM/yyyy" is-open="isOpen" ng-exit="showEdit = false" ng-click="isOpen = true" auto-save="saveChoice(choice)" required/> + <input type="text" class="form-control" ng-model="choice.date" focus-me="showEdit" datepicker-popup="{{globalVariables.dateFormat}}" is-open="isOpen" ng-exit="showEdit = false" ng-click="isOpen = true" auto-save="saveChoice(choice)" required/> <input type="button" class="btn btn-default" data-toggle="modal" data-target="#popupAddChoice" ng-click="editChoice(choice)" value="..."/> </div> </div> @@ -51,14 +51,14 @@  <tr ng-show="!globalVariables.editMode"> <td class="pollChoice"> - <input type="text" class="form-control" placeholder="votre nom" ng-model="data.vote.voterName" /> + <input type="text" class="form-control" placeholder="{{ 'user.name' | translate }}" ng-model="data.vote.voterName" /> <info-error error="data.vote.restError.voterName[0]" data="data.vote.voteName"></info-error> </td> <td ng-repeat="choice in data.vote.choice" class="pollChoice"> <input type="checkbox" name="{{choice.choiceId}}" ng-model="choice.voteValue" /> </td> <td> - <input class="btn btn-primary btn-large" type="button" value="Vote" ng-click="voter()" /> + <input class="btn btn-primary btn-large" type="button" value="{{ 'action.vote' | translate }}" ng-click="voter()" /> </td> </tr>  diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html index 2dd295d..a519b13 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -24,7 +24,7 @@  <form ng-submit="postComment()"> <div class="form-group"> - <label class="col-sm-2"> Nom </label> + <label class="col-sm-2"> {{ 'user.name' | translate }} </label> <div class="col-sm-1"> <info-error error="restError['author.name'][0]" data="comment.authorName"></info-error> </div> @@ -34,7 +34,7 @@ </div> <div class="form-group"> - <label class="col-sm-2"> Commentaire </label> + <label class="col-sm-2"> {{ 'comment' | translate }} </label> <div class="col-sm-1"><info-error error="restError.text[0]" data="comment.text"></info-error></div> <div class="col-sm-9"> <textarea data-ck-editor ng-model="comment.text"></textarea> @@ -42,7 +42,7 @@ </div> <div class="form-group"> - <button type="submit" class="btn btn-primary" ng-click="postComment()">Commenter</button> + <button type="submit" class="btn btn-primary" ng-click="postComment()">{{ 'action.comment' | translate }}</button> </div> </form>  diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html index a2d05ce..f7abff3 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html @@ -49,7 +49,7 @@ <div class="col-sm-6"> <div class="right-inner-addon "> <i class="glyphicon glyphicon-calendar glyphicon-input"></i> - <input id="popNameChoiceDate" class="form-control" datepicker-popup="dd/MM/yyyy" type="text" ng-model="choice.date" is-open="opened" ng-click="opened = true" focus-me="choice.choiceType == 'DATE'"/> + <input id="popNameChoiceDate" class="form-control" datepicker-popup="{{dateFormat}}" type="text" ng-model="choice.date" is-open="opened" ng-click="opened = true" focus-me="choice.choiceType == 'DATE'"/> </div> </div> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index e3af305..9f17f2e 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -20,18 +20,18 @@ --> <form class="form-horizontal" novalidate> <alert type="danger" class="alert-float" ng-if="restError.choice" close="restError.choice = false"> {{restError.choice[0]}} </alert> - <alert type="success" class="alert-float" ng-if="globalVariables.editMode && globalVariables.saved" close="globalVariables.saved = false"> Sondage sauvegardé..</alert> - <alert type="success" class="alert-float" ng-if="globalVariables.voteMode && globalVariables.saved" close="globalVariables.saved = false"> Vote effectué..</alert> - <alert type="success" class="alert-float" ng-if="globalVariables.commentMode && globalVariables.saved" close="globalVariables.saved = false"> Commentaire effectué..</alert> + <alert type="success" class="alert-float" ng-if="globalVariables.editMode && globalVariables.saved" close="globalVariables.saved = false">{{ 'poll.saved' | translate }}</alert> + <alert type="success" class="alert-float" ng-if="globalVariables.voteMode && globalVariables.saved" close="globalVariables.saved = false">{{ 'vote.added' | translate }}</alert> + <alert type="success" class="alert-float" ng-if="globalVariables.commentMode && globalVariables.saved" close="globalVariables.saved = false">{{ 'comment.added' | translate }}</alert> <ul class="nav nav-tabs"> <li ng-class="{active: tab == 'home'}"><a href="{{urlTab}}tab=home"> <span class="glyphicon glyphicon-home"></span> </a></li> - <li ng-class="{active: tab == 'vote'}" ng-show="data.poll.id"><a href="{{globalVariables.linkVote}}">Voter</a></li> - <li ng-class="{active: tab == 'comment'}" ng-show="data.poll.id"><a href="{{globalVariables.linkComment}}">Commenter</a></li> - <li ng-class="{active: tab == 'result'}" ng-show="!globalVariables.create"><a href="{{globalVariables.linkResult}}">Résultat</a></li> - <li ng-class="{active: tab == 'edit'}" ng-show="globalVariables.create"><a href="#/poll/create">Créer</a></li> - <li ng-class="{active: tab == 'edit'}" ng-show="data.poll.permission"><a href="{{globalVariables.linkEdit}}">Editer</a></li> - <li ng-class="{active: tab == 'conf'}" ng-show="data.poll.permission || globalVariables.create"><a href="{{urlTab}}tab=conf">Configuration</a></li> + <li ng-class="{active: tab == 'vote'}" ng-show="data.poll.id"><a href="{{globalVariables.linkVote}}">{{ 'poll.tab.vote' | translate }}</a></li> + <li ng-class="{active: tab == 'comment'}" ng-show="data.poll.id"><a href="{{globalVariables.linkComment}}">{{ 'poll.tab.comment' | translate }}</a></li> + <li ng-class="{active: tab == 'result'}" ng-show="!globalVariables.create"><a href="{{globalVariables.linkResult}}">{{ 'poll.tab.result' | translate }}</a></li> + <li ng-class="{active: tab == 'edit'}" ng-show="globalVariables.create"><a href="#/poll/create">{{ 'poll.tab.create' | translate }}</a></li> + <li ng-class="{active: tab == 'edit'}" ng-show="data.poll.permission"><a href="{{globalVariables.linkEdit}}">{{ 'poll.tab.edit' | translate }}</a></li> + <li ng-class="{active: tab == 'conf'}" ng-show="data.poll.permission || globalVariables.create"><a href="{{urlTab}}tab=conf">{{ 'poll.tab.conf' | translate }}</a></li> </ul> <div ng-include="'partials/poll-link.html'" ng-if="tab == 'home'"></div> @@ -39,7 +39,7 @@ <div ng-if="tab == 'edit' || tab == 'vote'"> <div class="pollTitle" edit-me="showEditTitle"> <h1 ng-hide="showEditTitle"> - {{data.poll.title || 'Click pour éditer'}} + {{data.poll.title || 'poll.edit' | translate }} <info-error error="restError.title[0]" data="data.poll.title"></info-error> </h1> @@ -49,14 +49,15 @@ </div> <div ng-hide="showEditDesc || !globalVariables.editMode && !data.poll.description " class="pollDesc" edit-me="showEditDesc"> - <div ng-bind-html="toHTML(data.poll.description || 'Description (Facultatif). Ce cadre disparait si aucune description n\'est mise')"></div> + <div ng-bind-html="toHTML(data.poll.description)"></div> + <div ng-hide="data.poll.description ">{{ 'poll.desc' | translate }}</div> </div> <div ng-show="showEditDesc" class="pollDesc"> <textarea id="descEditor" data-ck-editor ng-model="data.poll.description"></textarea>  - <input type="button" value="Return" class="btn btn-primary" ng-click="showEditDesc = false;" ng-show="globalVariables.create"/> - <input type="button" value="Return" class="btn btn-primary" ng-click="showEditDesc = false; savePoll()" ng-show="globalVariables.edit"/> + <button type="button" class="btn btn-primary" ng-click="showEditDesc = false;" ng-show="globalVariables.create">{{ 'action.return' | translate }}</button> + <button type="button" class="btn btn-primary" ng-click="showEditDesc = false; savePoll()" ng-show="globalVariables.edit">{{ 'action.return' | translate }}</button> </div> <div id="poll"> @@ -67,14 +68,12 @@ <div ng-if="globalVariables.create"> <hr/> - <button type="button" class="btn btn-default" ng-model="globalVariables.editMode" btn-checkbox>Mode Edition</button> - <button class="btn btn-primary" ng-click="savePoll()">Sauvegarder</button> + <button class="btn btn-primary" ng-click="savePoll()">{{ 'action.save' | translate }}</button> </div> <div ng-if="globalVariables.edit"> <hr/> - <button type="button" class="btn btn-default" ng-model="globalVariables.editMode" btn-checkbox>Mode Edition</button> - <button class="btn btn-danger" ng-click="deletePoll();">Supprimer</button> + <button class="btn btn-danger" ng-click="deletePoll();">{{ 'action.delete' | translate }}</button> </div> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: check if accept-languages is not null for search best locale
by chorem.org scm June 3, 2014

June 3, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 03e28ec7a82cb99946561032b82108b27eead65b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 3 17:10:41 2014 +0200 check if accept-languages is not null for search best locale --- .../rest/api/PollenRestApiRequestFilter.java | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java index 2ff0e34..a31f7c3 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java @@ -137,16 +137,19 @@ public class PollenRestApiRequestFilter extends WebMotionFilter { log.info("Found Accept-Language: " + language); } - String[] allLanguage = language.split(","); - int i = 0; - do { - language = allLanguage[i].substring(0, 2); - if ( !language.equals("fr") && !language.equals("en") ) { - // language not accepted - language = null; - } - i++; - } while (language == null && i < allLanguage.length); + // search best locale accepted by the server 'fr' or 'en' + if (language != null) { + String[] allLanguage = language.split(","); + int i = 0; + do { + language = allLanguage[i].substring(0, 2); + if ( !language.equals("fr") && !language.equals("en") ) { + // language not accepted + language = null; + } + i++; + } while ( language == null && i < allLanguage.length ); + } if (language == null) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: check default languages is accepted
by chorem.org scm June 3, 2014

June 3, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 30fdd739c4a2b9154f4323d41901759ef263b0ee Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 3 15:28:07 2014 +0200 check default languages is accepted --- pollen-ui-angular/src/main/webapp/index.html | 2 +- pollen-ui-angular/src/main/webapp/js/app.js | 11 ++++------- .../src/main/webapp/js/controllers/localeCtrl.js | 14 ++++++++++++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 7957803..150738f 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -55,7 +55,7 @@ </div> <ul class="nav navbar-nav pull-right" ng-controller="LocaleCtrl"> <li dropdown class="dropdown-toggle"> - <a> <img ng:attr-src="{{localeURL}}" /></a> + <a> <img ng:attr-src="img/{{locale}}.png" /></a> <ul class="dropdown-menu"> <li><a ng-click="switchLocale('fr')"><img src="img/fr.png" /> Français </a></li> <li><a ng-click="switchLocale('en')"><img src="img/en.png" /> English </a> </li> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 8abd5c8..ef8eec1 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -30,17 +30,14 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC .factory('httpInterceptor', ['$q', '$rootScope', '$location', 'SessionStorage', function ($q, $rootScope, $location, SessionStorage) { return { request: function($config) { - // set locale with browser preference - // default : en var session = SessionStorage.get(); - // set locale if undefined - if (angular.isUndefined(session.locale)) { - var locale = navigator.language || navigator.userLanguage || 'en'; - SessionStorage.save({locale:locale.substring(0,2)}); + // rewrite 'Accept-Language' if locale is defined + if (angular.isDefined(session.locale)) { + $config.headers['Accept-Language'] = session.locale; } - $config.headers['Accept-Language'] = session.locale; + // set header for session token $config.headers['X-Pollen-Session-Token'] = session.token; return $config; }, diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js index ffe66de..960b086 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js @@ -21,7 +21,18 @@ angular.module('localeControllers', []) .controller('LocaleCtrl', ['$scope', '$translate', 'SessionStorage',function ($scope, $translate, SessionStorage) { $scope.locale = SessionStorage.get().locale; - $scope.localeURL = "img/"+$scope.locale+".png"; + if (angular.isUndefined($scope.locale)) { + // set locale with browser preference + $scope.locale = navigator.language || navigator.userLanguage; + $scope.locale = $scope.locale.substring(0,2); + + // get locale supported + if ($scope.locale != 'fr' && $scope.locale != 'en') { + $scope.locale = conf.defaultLanguage || 'en'; + } + + SessionStorage.save({locale:$scope.locale}); + } $translate.use($scope.locale); $scope.switchLocale = function (locale) { @@ -29,7 +40,6 @@ angular.module('localeControllers', []) if (locale != $scope.locale) { SessionStorage.save({locale:locale}); $scope.locale = locale; - $scope.localeURL = "img/"+locale+".png"; $translate.use(locale); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: Get the best user locale
by chorem.org scm June 3, 2014

June 3, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit e9c18aadbc3e3df0aede745fe41ff002f04fd42b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 3 15:23:27 2014 +0200 Get the best user locale --- .../chorem/pollen/rest/api/PollenRestApiRequestFilter.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java index c96137d..2ff0e34 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java @@ -137,6 +137,17 @@ public class PollenRestApiRequestFilter extends WebMotionFilter { log.info("Found Accept-Language: " + language); } + String[] allLanguage = language.split(","); + int i = 0; + do { + language = allLanguage[i].substring(0, 2); + if ( !language.equals("fr") && !language.equals("en") ) { + // language not accepted + language = null; + } + i++; + } while (language == null && i < allLanguage.length); + if (language == null) { language = Locale.FRENCH.getLanguage(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: translate error une register and login
by Chorem.org scm June 3, 2014

June 3, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository pollen. See http://git.chorem.org/pollen.git commit e4791648edeb26c0728235c588d452632b06b6c1 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 3 10:45:31 2014 +0200 translate error une register and login --- pollen-ui-angular/src/main/webapp/i18n/en.js | 4 ++++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 4 ++++ .../src/main/webapp/js/controllers/userCtrl.js | 16 +++++++++++----- .../src/main/webapp/partials/user-register.html | 2 +- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index b10797f..a0b879e 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -25,6 +25,10 @@ var translateEN = { 'user.register.success' : 'Register with success', 'user.edit.success' : 'Save with success', 'user.forgotPassword.success' : 'Password send by email', +'user.error.password.diff' : 'Passwords not equal', +'user.error.mail.notFound' : 'E-mail not found', +'user.error.mail.empty' : 'E-mail can not be empty', +'user.error.login' : 'Error in e-mail or password', 'action.logout' : 'Logout', 'action.login' : 'Login', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 2c9f68f..6fe7c64 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -25,6 +25,10 @@ var translateFR = { 'user.register.success' : 'Compte enregisté, un mail de validation vient d\'être envoyé..', 'user.edit.success' : 'Modification effectuée..', 'user.forgotPassword.success' : 'Un mail de changement de mot de passe vient d\'être envoyé..', +'user.error.password.diff' : 'Mot de passe différent', +'user.error.mail.notFound' : 'Courriel n\'a pas été trouvé', +'user.error.mail.empty' : 'Courriel ne peux pas être vide', +'user.error.login' : 'Erreur sur le nom d\'utilisateur ou le mot de passe', 'action.logout' : 'Deconnexion', 'action.login' : 'Connexion', diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index e4c8070..d9afb8b 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -38,7 +38,7 @@ } }]) -.controller('UserLostPasswordCtrl', ['$scope', 'UserLostPassword', function ($scope, UserLostPassword) { +.controller('UserLostPasswordCtrl', ['$scope', '$translate', 'UserLostPassword', function ($scope, $translate, UserLostPassword) { $scope.email = ''; $scope.submit = function () { if ($scope.email != '') { @@ -46,11 +46,15 @@ $scope.saved = true; $scope.email = ''; }, function (error) { - $scope.restError = {email: ["email n'a pas été trouvé"]}; + $translate('user.error.mail.notFound').then(function (error) { + $scope.restError = {email: [error]}; + }) }) } else { - $scope.restError = {email : ["email ne peut pas être vide"]}; + $translate('user.error.mail.empty').then(function (error) { + $scope.restError = {email: [error]}; + }) } } }]) @@ -71,7 +75,7 @@ } }]) -.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionStorage', '$route', '$location', function ($scope, UserLogin, UserLogout, User, SessionStorage, $route, $location) { +.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionStorage', '$route', '$location', '$translate', function ($scope, UserLogin, UserLogout, User, SessionStorage, $route, $location, $translate) { if (angular.isUndefined($scope.data)) { $scope.data = {user:{}}; } @@ -94,7 +98,9 @@ $route.reload(); }) }, function (error) { - $scope.restError = {connexion : "Erreur sur le nom d'utilisateur ou le mot de passe"}; + $translate('user.error.login').then(function (error) { + $scope.restError = {connexion: error}; + }) }); } diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 9bd9657..de3c261 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -75,7 +75,7 @@ <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> </div> <div class="col-sm-1"> - <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="Mot de passe différent" ng-if="data.user.password != data.user.password2"></span> + <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="{{ 'user.error.password.diff' | translate }}" ng-if="data.user.password != data.user.password2"></span> </div> </div> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: aupdates mavenpom and eugene
by Chorem.org scm June 3, 2014

June 3, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository pollen. See http://git.chorem.org/pollen.git commit 5fd43529a5c49fb920b88235235d3875fc18dab7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jun 3 08:45:11 2014 +0200 aupdates mavenpom and eugene --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fdc7ee1..60ac4f9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.7</version> + <version>5.0.8</version> </parent> <groupId>org.chorem</groupId> @@ -163,7 +163,7 @@ <webmotionVersion>2.4.1-SNAPSHOT</webmotionVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> - <eugenePluginVersion>2.10-SNAPSHOT</eugenePluginVersion> + <eugenePluginVersion>2.10</eugenePluginVersion> <topiaVersion>3.0-SNAPSHOT</topiaVersion> <nuitonWebVersion>1.16</nuitonWebVersion> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: add translate in form user
by Chorem.org scm June 2, 2014

June 2, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository pollen. See http://git.chorem.org/pollen.git commit 42560f01cb7ae3c38a55d305f94c16e368238266 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 2 18:21:29 2014 +0200 add translate in form user --- pollen-ui-angular/src/main/webapp/i18n/en.js | 46 +++++++++++------- pollen-ui-angular/src/main/webapp/i18n/fr.js | 56 +++++++++++++--------- pollen-ui-angular/src/main/webapp/index.html | 6 +-- pollen-ui-angular/src/main/webapp/js/app.js | 4 +- .../src/main/webapp/partials/user-edit.html | 12 ++--- .../src/main/webapp/partials/user-login.html | 2 +- .../main/webapp/partials/user-lostPassword.html | 8 ++-- .../src/main/webapp/partials/user-register.html | 14 +++--- 8 files changed, 85 insertions(+), 63 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 2ed5f09..b10797f 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -1,26 +1,36 @@ var translateEN = { -'newPoll':'New', +'title.forgotPassword' : 'Forget Password', +'title.register' : 'Register', +'title.editUser' : 'Edit Profile', -'admin' : 'Administration', -'admin.listPoll' : 'List of Polls', -'admin.listUser' : 'List of Users', -'admin.config' : 'Configuration', +'newPoll' : 'New Poll', -'logout' : 'Logout', -'login' : 'Login', -'user.edit' : 'Profile', -'user.listPollCreated' : 'Created Poll', -'user.listPollParticiped' : 'Participed Poll', -'user.listPollInvited' : 'Invited Poll', -'user.register' : 'Register', +'admin' : 'Administration', +'admin.listPoll' : 'List of Polls', +'admin.listUser' : 'List of Users', +'admin.config' : 'Configuration', -'user.mail' : 'e-mail', -'user.password' : 'Password', -'user.password2' : 'Confirm', -'user.rememberMe' : 'Remember Me', -'user.forgotPassword' : 'Forgot Password', +'user.edit' : 'Profile', +'user.listPollCreated' : 'Created Poll', +'user.listPollParticiped' : 'Participed Poll', +'user.listPollInvited' : 'Invited Poll', +'user.name' : 'Name', +'user.mail' : 'e-mail', +'user.password' : 'Password', +'user.password2' : 'Confirm', +'user.rememberMe' : 'Remember Me', +'user.forgotPassword' : 'Forgot Password', +'user.register.success' : 'Register with success', +'user.edit.success' : 'Save with success', +'user.forgotPassword.success' : 'Password send by email', +'action.logout' : 'Logout', +'action.login' : 'Login', +'action.register' : 'Register', +'action.recovered' : 'Recovered', +'action.send' : 'Send', + +} -} \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 6754b68..2c9f68f 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -1,24 +1,36 @@ var translateFR = { -'newPoll':'Nouveau Sondage', - -'admin' : 'Administration', -'admin.listPoll' : 'Liste des Sondages', -'admin.listUser' : 'Liste des Utilisateurs', -'admin.config' : 'Configuration', - -'logout' : 'Deconnexion', -'login' : 'Connexion', -'user.edit' : 'Profile', -'user.listPollCreated' : 'Sondage Crée', -'user.listPollParticiped' : 'Sondage Participé', -'user.listPollInvited' : 'Sondage invité', -'user.register' : 'S\'enregistrer', - -'user.mail' : 'Courriel', -'user.password' : 'Mot de passe', -'user.password2' : 'Confirmation', -'user.rememberMe' : 'Connexion automatique', -'user.forgotPassword' : 'Mot de passe oublié', - -} \ No newline at end of file +'title.forgotPassword' : 'Récupération du Mot de Passe', +'title.register' : 'Inscription', +'title.editUser' : 'Modification de votre profile', + +'newPoll' : 'Nouveau Sondage', + +'admin' : 'Administration', +'admin.listPoll' : 'Liste des Sondages', +'admin.listUser' : 'Liste des Utilisateurs', +'admin.config' : 'Configuration', + +'user.edit' : 'Profile', +'user.listPollCreated' : 'Sondage Crée', +'user.listPollParticiped' : 'Sondage Participé', +'user.listPollInvited' : 'Sondage invité', + +'user.name' : 'Votre Nom', +'user.mail' : 'Courriel', +'user.password' : 'Mot de passe', +'user.password2' : 'Confirmation', +'user.rememberMe' : 'Connexion automatique', +'user.forgotPassword' : 'Mot de passe oublié', +'user.register.success' : 'Compte enregisté, un mail de validation vient d\'être envoyé..', +'user.edit.success' : 'Modification effectuée..', +'user.forgotPassword.success' : 'Un mail de changement de mot de passe vient d\'être envoyé..', + +'action.logout' : 'Deconnexion', +'action.login' : 'Connexion', +'action.register' : 'S\'enregistrer', +'action.recovered' : 'Récupéré', +'action.send' : 'envoyé', + +} + diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index a43a8f2..7957803 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -68,14 +68,14 @@ </ul> <ul class="nav navbar-nav pull-right"> <li ng-show="!currentUser.id"> - <a href="#/user/register/"> {{ 'user.register' | translate }} </a> + <a href="#/user/register/"> {{ 'action.register' | translate }} </a> </li> <li class="divider-vertical" ng-show="!currentUser.id"></li> <li ng-show="!currentUser.id" dropdown> <a href="#" role="button" class="dropdown-toggle"> - {{ 'login' | translate }} <strong class="caret"></strong> + {{ 'action.login' | translate }} <strong class="caret"></strong> </a> <div class="dropdown-menu form" role="menu" ng-click="$event.stopPropagation()"> @@ -122,7 +122,7 @@ <li class="divider"></li> <li> - <a ng-click="logout()">{{ 'logout' | translate }}</a> + <a ng-click="logout()">{{ 'action.logout' | translate }}</a> </li> </ul> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 39a938b..8abd5c8 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -80,11 +80,11 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC if (angular.isDefined(conf.defaultLanguage)) { $translateProvider.preferredLanguage(conf.defaultLanguage); - $translateProvider.fallbackLanguage(conf.defaultLanguage); + // $translateProvider.fallbackLanguage(conf.defaultLanguage); } else { $translateProvider.preferredLanguage('en'); - $translateProvider.fallbackLanguage('en'); + // $translateProvider.fallbackLanguage('en'); } }]) diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit.html b/pollen-ui-angular/src/main/webapp/partials/user-edit.html index 53ef5ce..a0d1b68 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit.html @@ -18,14 +18,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> Modification effectuée..</alert> +<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> {{ 'user.edit.success' | translate }} </alert> -<h2> Modification du Profile </h2> +<h2> {{ 'title.editUser' | translate }} </h2> <form class="horizontal-form" ng-submit="editUser()"> <div class="control-group"> <label for="formName" class="col-sm-5 text-right control-label"> - Nom + {{ 'user.name' | translate }} </label> <div class="col-sm-6"> <input type="text" id="formName" class="form-control" ng-model="currentUser.name"/> @@ -37,7 +37,7 @@ <div class="control-group"> <label for="formEmail" class="col-sm-5 text-right control-label"> - Courriel + {{ 'user.mail' | translate }} </label> <div class="col-sm-6"> @@ -50,7 +50,7 @@ <div class="control-group"> <label for="formPassword" class="col-sm-5 text-right control-label"> - Mot de passe Actuel + {{ 'user.password' | translate }} </label> <div class="col-sm-6"> <input type="password" id="formPassword" class="form-control" ng-model="currentUser.password"/> @@ -63,7 +63,7 @@ <div class="control-group"> <div class="col-sm-5"></div> <div class="col-sm-6"> - <button class="btn btn-primary" type="submit">Envoyer</button> + <button class="btn btn-primary" type="submit">{{ 'action.send' | translate }} </button> </div> <div class="col-sm-1"></div> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-login.html b/pollen-ui-angular/src/main/webapp/partials/user-login.html index 8797515..3363889 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-login.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-login.html @@ -23,7 +23,7 @@ </div> <div class="form-actions"> - <button type="submit" class="btn btn-primary">{{ 'login' | translate }}</button> + <button type="submit" class="btn btn-primary">{{ 'action.login' | translate }}</button> <hr/> <a href="#/user/lostpassword"> {{ 'user.forgotPassword' | translate }}</a> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html b/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html index 1108f58..386f833 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html @@ -18,15 +18,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> Compte enregisté, un mail de validation vient d'être envoyé..</alert> +<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> {{ 'user.forgotPassword.success' | translate }} </alert> -<h2>Mot de passe oublié</h2> +<h2>{{ 'title.forgotPassword' | translate }}</h2> <form ng-submit="submit()" class="form-horizontal"> <div class="control-group"> <label for="formEmail" class="col-sm-5 text-right control-label"> - Courriel + {{ 'user.mail' | translate }} </label> <div class="col-sm-6"> @@ -40,7 +40,7 @@ <div class="control-group"> <div class="col-sm-5"></div> <div class="col-sm-6"> - <button class="btn btn-primary" type="submit">Récupéré</button> + <button class="btn btn-primary" type="submit">{{ 'action.recovered' | translate }}</button> </div> <div class="col-sm-1"></div> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 819a4e5..9bd9657 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -18,15 +18,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> Compte enregisté, un mail de validation vient d'être envoyé..</alert> +<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> {{ 'user.register.success' | translate }}</alert> -<h2>Créer un compte</h2> +<h2>{{ 'title.register' | translate }}</h2> <form ng-submit="submit()" class="form-horizontal"> <div class="control-group"> <label for="formEmail" class="col-sm-5 text-right control-label"> - Courriel + {{ 'user.mail' | translate }} </label> <div class="col-sm-6"> @@ -39,7 +39,7 @@ <div class="control-group"> <label for="formName" class="col-sm-5 text-right control-label"> - Nom + {{ 'user.name' | translate }} </label> <div class="col-sm-6"> <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.name"/> @@ -57,7 +57,7 @@ <div class="control-group"> <label for="formPassword" class="col-sm-5 text-right control-label"> - Mot de passe + {{ 'user.password' | translate }} </label> <div class="col-sm-6"> <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> @@ -69,7 +69,7 @@ </div> <div class="control-group"> <label for="formPassword2" class="col-sm-5 text-right control-label"> - Confirmation + {{ 'user.password2' | translate }} </label> <div class="col-sm-6"> <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> @@ -82,7 +82,7 @@ <div class="control-group"> <div class="col-sm-5"></div> <div class="col-sm-6"> - <button class="btn btn-primary" type="submit">S'enregister</button> + <button class="btn btn-primary" type="submit">{{ 'action.register' | translate }}</button> </div> <div class="col-sm-1"></div> </div> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: translate menu bar
by Chorem.org scm June 2, 2014

June 2, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository pollen. See http://git.chorem.org/pollen.git commit 5e7f6db335cf208025f93851fbd32f40b4ec8d2a Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 2 15:57:14 2014 +0200 translate menu bar --- pollen-ui-angular/src/main/webapp/i18n/en.js | 26 +++++++++++++++++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 24 +++++++++++++++ pollen-ui-angular/src/main/webapp/index.html | 34 ++++++++++++---------- pollen-ui-angular/src/main/webapp/js/app.js | 15 +++++++++- .../src/main/webapp/js/conf.js.exemple | 3 ++ .../src/main/webapp/js/controllers/localeCtrl.js | 6 +++- .../src/main/webapp/partials/user-login.html | 14 +++++---- 7 files changed, 99 insertions(+), 23 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js new file mode 100644 index 0000000..2ed5f09 --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -0,0 +1,26 @@ +var translateEN = { + +'newPoll':'New', + +'admin' : 'Administration', +'admin.listPoll' : 'List of Polls', +'admin.listUser' : 'List of Users', +'admin.config' : 'Configuration', + +'logout' : 'Logout', +'login' : 'Login', +'user.edit' : 'Profile', +'user.listPollCreated' : 'Created Poll', +'user.listPollParticiped' : 'Participed Poll', +'user.listPollInvited' : 'Invited Poll', +'user.register' : 'Register', + +'user.mail' : 'e-mail', +'user.password' : 'Password', +'user.password2' : 'Confirm', +'user.rememberMe' : 'Remember Me', +'user.forgotPassword' : 'Forgot Password', + + + +} \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js new file mode 100644 index 0000000..6754b68 --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -0,0 +1,24 @@ +var translateFR = { + +'newPoll':'Nouveau Sondage', + +'admin' : 'Administration', +'admin.listPoll' : 'Liste des Sondages', +'admin.listUser' : 'Liste des Utilisateurs', +'admin.config' : 'Configuration', + +'logout' : 'Deconnexion', +'login' : 'Connexion', +'user.edit' : 'Profile', +'user.listPollCreated' : 'Sondage Crée', +'user.listPollParticiped' : 'Sondage Participé', +'user.listPollInvited' : 'Sondage invité', +'user.register' : 'S\'enregistrer', + +'user.mail' : 'Courriel', +'user.password' : 'Mot de passe', +'user.password2' : 'Confirmation', +'user.rememberMe' : 'Connexion automatique', +'user.forgotPassword' : 'Mot de passe oublié', + +} \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 258f372..a43a8f2 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -28,12 +28,13 @@ <script src="js/conf.js"></script> - <script src="http://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-route.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-resource.min…"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-cookies.min.…"></script> - <script src="http://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.11.0/ui-bootst…"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/bower-angular-translate/2.0.1/angula…"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.11.0/ui-boots…"></script> <script src="js/libs/ckeditor/ckeditor.js"></script> <script src="js/app.js"></script> @@ -41,6 +42,9 @@ <script src="js/controllers/pollCtrl.js"></script> <script src="js/controllers/userCtrl.js"></script> <script src="js/controllers/localeCtrl.js"></script> + + <script src="i18n/fr.js"></script> + <script src="i18n/en.js"></script> </head> <body> @@ -51,7 +55,7 @@ </div> <ul class="nav navbar-nav pull-right" ng-controller="LocaleCtrl"> <li dropdown class="dropdown-toggle"> - <a> <img src="img/{{locale}}.png" /></a> + <a> <img ng:attr-src="{{localeURL}}" /></a> <ul class="dropdown-menu"> <li><a ng-click="switchLocale('fr')"><img src="img/fr.png" /> Français </a></li> <li><a ng-click="switchLocale('en')"><img src="img/en.png" /> English </a> </li> @@ -60,18 +64,18 @@ </ul> <div class="collapse navbar-collapse" ng-controller="UserLoginCtrl"> <ul class="nav navbar-nav"> - <li><a href="#/poll/create">Creer</a></li> + <li><a href="#/poll/create"> {{ 'newPoll' | translate }}</a></li> </ul> <ul class="nav navbar-nav pull-right"> <li ng-show="!currentUser.id"> - <a href="#/user/register/">S'enregistrer</a> + <a href="#/user/register/"> {{ 'user.register' | translate }} </a> </li> <li class="divider-vertical" ng-show="!currentUser.id"></li> <li ng-show="!currentUser.id" dropdown> <a href="#" role="button" class="dropdown-toggle"> - Connexion<strong class="caret"></strong> + {{ 'login' | translate }} <strong class="caret"></strong> </a> <div class="dropdown-menu form" role="menu" ng-click="$event.stopPropagation()"> @@ -81,13 +85,13 @@ <li class="dropdown" ng-show="currentUser.administrator"> <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown"> - Administration <strong class="caret"></strong> + {{ 'admin' | translate }} <strong class="caret"></strong> </a> <ul class="dropdown-menu" role="menu"> - <li><a href="#/poll/list">Liste Sondages</a></li> - <li><a href="#/user/list">List Users</a></li> - <li><a href="#/conf">Configuration</a></li> + <li><a href="#/poll/list">{{ 'admin.listPoll' | translate }}</a></li> + <li><a href="#/user/list">{{ 'admin.listUser' | translate }}</a></li> + <li><a href="#/conf">{{ 'admin.config' | translate }}</a></li> </ul> </li> @@ -98,27 +102,27 @@ <ul class="dropdown-menu" role="menu"> <li> - <a href="#/user/edit">Profile</a> + <a href="#/user/edit">{{ 'user.edit' | translate }}</a> </li> <li class="divider"></li> <li> - <a href="#/poll/list/created"> Sondage Créé </a> + <a href="#/poll/list/created"> {{ 'user.listPollCreated' | translate }} </a> </li> <li> - <a href="#/poll/list/participated"> Sondage Participé </a> + <a href="#/poll/list/participated"> {{ 'user.listPollParticiped' | translate }} </a> </li> <li> - <a href="#/poll/list/invited"> Sondage Invité </a> + <a href="#/poll/list/invited"> {{ 'user.listPollInvited' | translate }} </a> </li> <li class="divider"></li> <li> - <a ng-click="logout()">Deconnexion</a> + <a ng-click="logout()">{{ 'logout' | translate }}</a> </li> </ul> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index d25969c..39a938b 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'localeControllers', 'ui.bootstrap', 'ngCookies']) +angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'localeControllers', 'ui.bootstrap', 'ngCookies', 'pascalprecht.translate']) .config(['$httpProvider', function($httpProvider) { // edit header for locale and sessionToken $httpProvider.interceptors.push('httpInterceptor'); @@ -74,6 +74,19 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }]) +.config(['$translateProvider', function ($translateProvider) { + $translateProvider.translations('en', translateEN); + $translateProvider.translations('fr', translateFR); + + if (angular.isDefined(conf.defaultLanguage)) { + $translateProvider.preferredLanguage(conf.defaultLanguage); + $translateProvider.fallbackLanguage(conf.defaultLanguage); + } + else { + $translateProvider.preferredLanguage('en'); + $translateProvider.fallbackLanguage('en'); + } +}]) .directive('focusMe', function($timeout) { return { diff --git a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple index adcbae6..06021c7 100644 --- a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple +++ b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple @@ -10,4 +10,7 @@ var conf = { // Favorite list number per page favoriteListDefaultPageSize : 15, + + // Default Language for i18n : 'en' or 'fr' + defaultLanguage: 'en', } \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js index fe18e24..ffe66de 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js @@ -19,14 +19,18 @@ * #L% */ angular.module('localeControllers', []) -.controller('LocaleCtrl', ['$scope', 'SessionStorage',function ($scope, SessionStorage) { +.controller('LocaleCtrl', ['$scope', '$translate', 'SessionStorage',function ($scope, $translate, SessionStorage) { $scope.locale = SessionStorage.get().locale; + $scope.localeURL = "img/"+$scope.locale+".png"; + $translate.use($scope.locale); $scope.switchLocale = function (locale) { //change locale if (locale != $scope.locale) { SessionStorage.save({locale:locale}); $scope.locale = locale; + $scope.localeURL = "img/"+locale+".png"; + $translate.use(locale); } } }]) diff --git a/pollen-ui-angular/src/main/webapp/partials/user-login.html b/pollen-ui-angular/src/main/webapp/partials/user-login.html index 9a6cf79..8797515 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-login.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-login.html @@ -2,28 +2,30 @@ <div class="control-group"> <label class="control-label"> - Courriel + {{ 'user.mail' | translate }} <info-error error="restError.connexion" data="data.user"></info-error> </label> <input type="text" name='login' ng-model="data.user.login" class="form-control"/> </div> <div class="control-group"> - <label class="control-label" >Mot de Passe</label> + <label class="control-label" > + {{ 'user.password' | translate }} + </label> <input type="password" name='password' ng-model="data.user.password" class="form-control"/> - <span class="help-block hide"></span> </div> <div class="control-group"> <label class="control-label checkbox" > - <input type="checkbox" name='rememberMe' ng-model="data.user.rememberMe"> Connexion automatique + <input type="checkbox" name='rememberMe' ng-model="data.user.rememberMe"> + {{ 'user.rememberMe' | translate }} </label> </div> <div class="form-actions"> - <button type="submit" class="btn btn-primary">Connexion</button> + <button type="submit" class="btn btn-primary">{{ 'login' | translate }}</button> <hr/> - <a href="#/user/lostpassword">Mot de passe oublié</a> + <a href="#/user/lostpassword"> {{ 'user.forgotPassword' | translate }}</a> </div> </form> \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: get server message for error no choice
by Chorem.org scm June 2, 2014

June 2, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository pollen. See http://git.chorem.org/pollen.git commit 340c990b868400564519b1201b4084a886ac2919 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 2 14:33:51 2014 +0200 get server message for error no choice --- pollen-ui-angular/src/main/webapp/partials/poll.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index f2fe86d..e3af305 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -19,7 +19,7 @@ #L% --> <form class="form-horizontal" novalidate> - <alert type="danger" class="alert-float" ng-if="restError.choice" close="restError.choice = false"> Vous devez avoir au moins 1 choix </alert> + <alert type="danger" class="alert-float" ng-if="restError.choice" close="restError.choice = false"> {{restError.choice[0]}} </alert> <alert type="success" class="alert-float" ng-if="globalVariables.editMode && globalVariables.saved" close="globalVariables.saved = false"> Sondage sauvegardé..</alert> <alert type="success" class="alert-float" ng-if="globalVariables.voteMode && globalVariables.saved" close="globalVariables.saved = false"> Vote effectué..</alert> <alert type="success" class="alert-float" ng-if="globalVariables.commentMode && globalVariables.saved" close="globalVariables.saved = false"> Commentaire effectué..</alert> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0