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

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

02/02: add menu for change locale
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 052eee3d4ffd23351868b0381160f8dca9742b9f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 2 14:06:20 2014 +0200 add menu for change locale --- pollen-ui-angular/src/main/webapp/img/en.png | Bin 0 -> 599 bytes pollen-ui-angular/src/main/webapp/img/fr.png | Bin 0 -> 545 bytes pollen-ui-angular/src/main/webapp/index.html | 18 +++++++++--- pollen-ui-angular/src/main/webapp/js/app.js | 2 +- .../src/main/webapp/js/controllers/localeCtrl.js | 32 +++++++++++++++++++++ 5 files changed, 47 insertions(+), 5 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/img/en.png b/pollen-ui-angular/src/main/webapp/img/en.png new file mode 100644 index 0000000..ff701e1 Binary files /dev/null and b/pollen-ui-angular/src/main/webapp/img/en.png differ diff --git a/pollen-ui-angular/src/main/webapp/img/fr.png b/pollen-ui-angular/src/main/webapp/img/fr.png new file mode 100644 index 0000000..8332c4e Binary files /dev/null and b/pollen-ui-angular/src/main/webapp/img/fr.png differ diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 3a6f668..258f372 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -29,10 +29,10 @@ <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://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular.min.js"></script> - <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular-route.min.js"></script> - <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular-resource.min…"></script> - <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular-cookies.min.…"></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="js/libs/ckeditor/ckeditor.js"></script> @@ -40,6 +40,7 @@ <script src="js/services.js"></script> <script src="js/controllers/pollCtrl.js"></script> <script src="js/controllers/userCtrl.js"></script> + <script src="js/controllers/localeCtrl.js"></script> </head> <body> @@ -48,6 +49,15 @@ <div class="navbar-header"> <a class="navbar-brand" href="#">Pollen</a> </div> + <ul class="nav navbar-nav pull-right" ng-controller="LocaleCtrl"> + <li dropdown class="dropdown-toggle"> + <a> <img 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> + </ul> + </li> + </ul> <div class="collapse navbar-collapse" ng-controller="UserLoginCtrl"> <ul class="nav navbar-nav"> <li><a href="#/poll/create">Creer</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 e310b8f..d25969c 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', 'ui.bootstrap', 'ngCookies']) +angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'localeControllers', 'ui.bootstrap', 'ngCookies']) .config(['$httpProvider', function($httpProvider) { // edit header for locale and sessionToken $httpProvider.interceptors.push('httpInterceptor'); diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js new file mode 100644 index 0000000..fe18e24 --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js @@ -0,0 +1,32 @@ +/* + * #%L + * Pollen :: UI (Angular) + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +angular.module('localeControllers', []) +.controller('LocaleCtrl', ['$scope', 'SessionStorage',function ($scope, SessionStorage) { + $scope.locale = SessionStorage.get().locale; + + $scope.switchLocale = function (locale) { + //change locale + if (locale != $scope.locale) { + SessionStorage.save({locale:locale}); + $scope.locale = locale; + } + } +}]) -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: translate choice error
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 09155938fa9ba73d15542c4b1500bdbc13aa9506 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 2 14:05:11 2014 +0200 translate choice error --- .../java/org/chorem/pollen/services/service/ChoiceService.java | 8 +++++--- .../src/main/resources/i18n/pollen-services_en_GB.properties | 3 +++ .../src/main/resources/i18n/pollen-services_fr_FR.properties | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java index 2514e88..3e6acc0 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java @@ -37,6 +37,8 @@ import org.chorem.pollen.services.service.security.PermissionVerb; import java.util.List; import java.util.Set; +import static org.nuiton.i18n.I18n.l; + /** * TODO * @@ -259,7 +261,7 @@ public class ChoiceService extends PollenServiceSupport { Set<String> choiceNames = Sets.newHashSet(); - boolean withChoiceType = checkNotNull(errors, "choiceType", choice.getChoiceType(), "choiceType can not be null"); + boolean withChoiceType = checkNotNull(errors, "choiceType", choice.getChoiceType(), l(getLocale(), "pollen.error.choice.choiceTypeEmpty")); if (CollectionUtils.isNotEmpty(existingChoices)) { @@ -289,11 +291,11 @@ public class ChoiceService extends PollenServiceSupport { boolean nameNotBlank = checkNotBlank(errors, "name", choiceName, - "choice name can not be empty"); + l(getLocale(), "pollen.error.choice.choiceNameEmpty")); if (nameNotBlank) { boolean nameAdded = choiceNames.add(choiceName); - check(errors, "name", nameAdded, "choice name already used in this list"); + check(errors, "name", nameAdded, l(getLocale(), "pollen.error.choice.choiceNameExist")); } break; diff --git a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties index aba2f45..3eab430 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties @@ -11,6 +11,9 @@ pollen.configuration.defaultPollVoteVisibility=Default Poll vote visibility used pollen.configuration.defaultPollenUserPageSize= pollen.configuration.defaultVoteCountingType=Default vote counting type used when creating a new poll pollen.configuration.sessionTimeoutDelay=Inactivity delay before invalidate the session of a user (in seconds) +pollen.error.choice.choiceNameEmpty=choice name can not be empty +pollen.error.choice.choiceNameExist=choice name already used in this list +pollen.error.choice.choiceTypeEmpty=choiceType can not be null pollen.error.favoriteList.import.csv.already.used.email= pollen.error.favoriteList.import.csv.already.used.name= pollen.error.favoriteList.import.csv.invalid.email= diff --git a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties index 2bc5315..1faec5d 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties @@ -11,6 +11,9 @@ pollen.configuration.defaultPollVoteVisibility=Visibilité des votes par défaut pollen.configuration.defaultPollenUserPageSize= pollen.configuration.defaultVoteCountingType=Type de dépouillement par défaut lors de la création d'un nouveau sondage pollen.configuration.sessionTimeoutDelay=Temps autorisé d'inactivité avant d'invalider une session utilisateur (en secondes) +pollen.error.choice.choiceNameEmpty=le nom du choix ne peut pas être vide +pollen.error.choice.choiceNameExist=le nom du choix est déjà utilisé sur ce sondage +pollen.error.choice.choiceTypeEmpty=le type du choix doit être défini pollen.error.favoriteList.import.csv.already.used.email= pollen.error.favoriteList.import.csv.already.used.name= pollen.error.favoriteList.import.csv.invalid.email= -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: add translate (fr-en) in pollUserService
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 96ba3bf40b762cfa11bdeb920ce42598317d7343 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 2 12:01:01 2014 +0200 add translate (fr-en) in pollUserService --- .../chorem/pollen/services/service/PollenUserService.java | 14 ++++++++------ .../main/resources/i18n/pollen-services_en_GB.properties | 5 +++++ .../main/resources/i18n/pollen-services_fr_FR.properties | 5 +++++ .../src/main/webapp/partials/user-register.html | 4 ++++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java index e7e3417..4191c45 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java @@ -40,6 +40,8 @@ import org.nuiton.util.pagination.PaginationResult; import java.util.Objects; +import static org.nuiton.i18n.I18n.l; + /** * TODO * @@ -204,11 +206,11 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer String userEmail = getCleanMail(user.getEmail()); - boolean emailNotblank = checkNotBlank(errors, "email", userEmail, "email can not be empty"); + boolean emailNotblank = checkNotBlank(errors, "email", userEmail, l(getLocale(), "pollen.error.user.mailEmpty")); if (emailNotblank) { - checkValidEmail(errors, "email", userEmail, "email is not valid"); + checkValidEmail(errors, "email", userEmail, l(getLocale(), "pollen.error.user.mailInvalid")); if (userExists) { @@ -218,19 +220,19 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer if (emailChanged) { - check(errors, "email", !dao.emailExists(userEmail), "email already exists"); + check(errors, "email", !dao.emailExists(userEmail), l(getLocale(), "pollen.error.user.mailExist")); } } else { - check(errors, "email", !dao.emailExists(userEmail), "email already exists"); + check(errors, "email", !dao.emailExists(userEmail), l(getLocale(), "pollen.error.user.mailExist")); } } - boolean passwordNotBlank = checkNotBlank(errors, "password", user.getPassword() , "password can not be empty"); + boolean passwordNotBlank = checkNotBlank(errors, "password", user.getPassword() , l(getLocale(), "pollen.error.user.passwordEmpty")); if (userExists && passwordNotBlank) { @@ -242,7 +244,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer } catch (PollenInvalidPasswordException e) { - check(errors, "password", false, "invalid password"); + check(errors, "password", false, l(getLocale(), "pollen.error.user.passwordInvalid")); } diff --git a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties index 13c2595..aba2f45 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties @@ -28,6 +28,11 @@ pollen.error.poll.voteCountingType.mandatory=vote counting type is mandatory pollen.error.poll.voteVisibility.mandatory=vote visibility is mandatory pollen.error.poll.voterList.mandatory.for.groupedPoll=At least one voter list ins mandatory for a grouped poll pollen.error.poll.voterList.mismatch.freePoll= +pollen.error.user.mailEmpty=email can not be empty +pollen.error.user.mailExist=email already exists +pollen.error.user.mailInvalid=email is not valid +pollen.error.user.passwordEmpty=password can not be empty +pollen.error.user.passwordInvalid=password is not valid pollen.service.mail.ChoiceAddedEmail.subject=[Pollen] A choice was added in poll %s pollen.service.mail.ChoiceDeletedEmail.subject=[Pollen] A choice was deleted in poll %s pollen.service.mail.ChoiceEditedEmail.subject=[Pollen] A choice was edited in poll %s diff --git a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties index 572583b..2bc5315 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties @@ -27,6 +27,11 @@ pollen.error.poll.voteCountingType.mandatory=le type de vote est obligatoire pollen.error.poll.voteVisibility.mandatory=la visiblité des votes est obligatoire pollen.error.poll.voterList.mandatory.for.groupedPoll=Au moins une liste de votant est obligatoire pour un sondage groupé pollen.error.poll.voterList.mismatch.freePoll=Liste de votants impossible pour un sondage libre +pollen.error.user.mailEmpty=Courriel ne peut pas être vide +pollen.error.user.mailExist=Courriel existe déjà +pollen.error.user.mailInvalid=Courriel est invalide +pollen.error.user.passwordEmpty=Mot de passe ne peut pas être vide +pollen.error.user.passwordInvalid=Mot de passe est invalide pollen.service.mail.ChoiceAddedEmail.subject=[Pollen] Un choix a été ajouté au sondage %s pollen.service.mail.ChoiceDeletedEmail.subject=[Pollen] Un choix a été supprimé du sondage %s pollen.service.mail.ChoiceEditedEmail.subject=[Pollen] Un choix a été modifié sur le sondage %s 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 3109875..819a4e5 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -62,6 +62,10 @@ <div class="col-sm-6"> <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> </div> + <div class="col-sm-1"> + <info-error error="restError.password[0]" data="data.user.password"></info-error> + + </div> </div> <div class="control-group"> <label for="formPassword2" class="col-sm-5 text-right control-label"> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: Add form lostPassword
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 da31e2855a7bb26e315dfc6f18ded4bb63f468c2 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 2 11:18:33 2014 +0200 Add form lostPassword --- pollen-rest-api/src/main/resources/mapping | 2 +- pollen-ui-angular/src/main/webapp/index.html | 2 +- pollen-ui-angular/src/main/webapp/js/app.js | 1 + .../src/main/webapp/js/controllers/userCtrl.js | 21 +++++ pollen-ui-angular/src/main/webapp/js/services.js | 8 ++ .../src/main/webapp/partials/user-login.html | 2 + .../main/webapp/partials/user-lostPassword.html | 47 ++++++++++ .../src/main/webapp/partials/user-register.html | 104 +++++++++++---------- 8 files changed, 134 insertions(+), 53 deletions(-) diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index fe48ec3..06799d9 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -53,7 +53,7 @@ GET /v1/doc DocApi.showMapping # AuthApi POST,PUT /v1/login AuthApi.login -GET /v1/lostpassword/{token} AuthApi.lostPassword +GET /v1/lostpassword/{login} AuthApi.lostPassword GET /v1/logout AuthApi.logout # ChoiceApi diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 173af00..3a6f668 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -83,7 +83,7 @@ <li class="dropdown" ng-show="currentUser.id"> <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown"> - {{ currentUser.name || currentUser.login }} <strong class="caret"></strong> + {{ currentUser.name || currentUser.email }} <strong class="caret"></strong> </a> <ul class="dropdown-menu" role="menu"> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 1a252fa..e310b8f 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -69,6 +69,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC .when('/poll/list/:cmd', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) .when('/user/edit', {templateUrl: './partials/user-edit.html', controller:"UserEditCtrl"}) + .when('/user/lostpassword', {templateUrl: './partials/user-lostPassword.html', controller:"UserLostPasswordCtrl"}) .otherwise({redirectTo: '/'}); }]) 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 218f6df..e4c8070 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -29,6 +29,8 @@ $scope.submit = function () { if ($scope.data.user.password == $scope.data.user.password2) { User.add({}, $scope.data.user, function (data) { + $scope.saved = true; + $scope.data.user = {email:'', password:'', password2:''}; }, function (error) { $scope.restError = error.data; }); @@ -36,6 +38,25 @@ } }]) +.controller('UserLostPasswordCtrl', ['$scope', 'UserLostPassword', function ($scope, UserLostPassword) { + $scope.email = ''; + $scope.submit = function () { + if ($scope.email != '') { + UserLostPassword.send({login:$scope.email}, function (data) { + $scope.saved = true; + $scope.email = ''; + }, function (error) { + $scope.restError = {email: ["email n'a pas été trouvé"]}; + }) + } + else { + $scope.restError = {email : ["email ne peut pas être vide"]}; + } + } +}]) + + + .controller('UserEditCtrl', ['$scope', 'User', 'SessionStorage', function ($scope, User, SessionStorage) { $scope.currentUser = SessionStorage.get().user; $scope.currentUser.password = ''; diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 8171f52..20679cf 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -168,6 +168,14 @@ angular.module('pollenServices', ['ngResource']) }) }]) +.factory('UserLostPassword', ['$resource', function ($resource) { + return $resource(conf.restURL+'/lostpassword/:login', {}, + { + 'send' : { + method: 'GET' + } + }) +}]) .factory('SessionStorage', [function () { var storageId='sessionStorage'; 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 5d8f8e4..9a6cf79 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-login.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-login.html @@ -22,6 +22,8 @@ <div class="form-actions"> <button type="submit" class="btn btn-primary">Connexion</button> + <hr/> + <a href="#/user/lostpassword">Mot de passe oublié</a> </div> </form> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html b/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html new file mode 100644 index 0000000..1108f58 --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html @@ -0,0 +1,47 @@ + +<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> Compte enregisté, un mail de validation vient d'être envoyé..</alert> + +<h2>Mot de passe oublié</h2> +<form ng-submit="submit()" class="form-horizontal"> + + <div class="control-group"> + + <label for="formEmail" class="col-sm-5 text-right control-label"> + Courriel + </label> + + <div class="col-sm-6"> + <input type="email" id="formEmail" name="email" class="form-control" ng-model="email"/> + </div> + <div class="col-sm-1"> + <info-error error="restError.email[0]" data="email"></info-error> + </div> + </div> + + <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> + </div> + <div class="col-sm-1"></div> + </div> +</form> \ No newline at end of file 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 6ae1a8f..3109875 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -18,66 +18,68 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> - <h2>Créer un compte</h2> - <form ng-submit="submit()" class="form-horizontal"> +<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> Compte enregisté, un mail de validation vient d'être envoyé..</alert> - <div class="control-group"> +<h2>Créer un compte</h2> +<form ng-submit="submit()" class="form-horizontal"> - <label for="formEmail" class="col-sm-5 text-right control-label"> - Courriel - </label> + <div class="control-group"> - <div class="col-sm-6"> - <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> - </div> - <div class="col-sm-1"> - <info-error error="restError.email[0]" data="data.user.email"></info-error> - </div> - </div> + <label for="formEmail" class="col-sm-5 text-right control-label"> + Courriel + </label> - <div class="control-group"> - <label for="formName" class="col-sm-5 text-right control-label"> - Nom - </label> - <div class="col-sm-6"> - <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.name"/> - </div> - <div class="col-sm-1"> - </div> - </div> + <div class="col-sm-6"> + <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> + </div> + <div class="col-sm-1"> + <info-error error="restError.email[0]" data="data.user.email"></info-error> + </div> + </div> + <div class="control-group"> + <label for="formName" class="col-sm-5 text-right control-label"> + Nom + </label> + <div class="col-sm-6"> + <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.name"/> + </div> + <div class="col-sm-1"> + </div> + </div> - <div> - <div class="col-sm-3"></div> - <div class="col-sm-8"><hr/></div> - <div class="col-sm-1"></div> - </div> - <div class="control-group"> - <label for="formPassword" class="col-sm-5 text-right control-label"> - Mot de passe - </label> - <div class="col-sm-6"> - <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> - </div> + <div> + <div class="col-sm-3"></div> + <div class="col-sm-8"><hr/></div> + <div class="col-sm-1"></div> </div> + <div class="control-group"> - <label for="formPassword2" class="col-sm-5 text-right control-label"> - Confirmation - </label> - <div class="col-sm-6"> - <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> - </div> + <label for="formPassword" class="col-sm-5 text-right control-label"> + Mot de passe + </label> + <div class="col-sm-6"> + <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> + </div> + </div> + <div class="control-group"> + <label for="formPassword2" class="col-sm-5 text-right control-label"> + Confirmation + </label> + <div class="col-sm-6"> + <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> + </div> + </div> - <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> - </div> - <div class="col-sm-1"></div> + <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> </div> - </form> \ No newline at end of file + <div class="col-sm-1"></div> + </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