This is an automated email from the git hooks/post-receive script. New commit to branch feature/editVote in repository pollen. See http://git.chorem.org/pollen.git commit b43ea8ca4f29b450d67112bbebcf3b4ce89b3d3c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 13:51:29 2014 +0200 improve message with url for edit vote --- pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 11 ++++++----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 0dfab39..e57511d 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -111,6 +111,7 @@ var translateEN = { 'poll.error.listEmpty' : 'No poll find', 'vote.added' : 'Vote added.', +'vote.added.printLink' : 'You can modify your vote to using this address when you are not connected: {{url}}', 'comment' : 'Comment', 'comment.added' : 'Comment added.', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index fafb37c..ac2978d 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -111,6 +111,7 @@ var translateFR = { 'poll.error.listEmpty' : 'Aucun sondage trouvé', 'vote.added' : 'Vote effectué', +'vote.added.printLink' : 'Garder le lien suivant pour pouvoir modifier votre vote plus tard, lorsque vous n\'êtes pas connecté : {{url}}', 'comment' : 'Commentaire', 'comment.added' : 'Commentaire effectué', 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 a49c11e..22a464e 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -1051,8 +1051,8 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr // Vote controller // ////////////////////////////////// -.controller('PollVoteCtrl', ['$scope', '$rootScope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', '$translate', '$location', 'Page', - function ($scope, $rootScope, $q, $controller, $routeParams, Poll, PollChoice, PollVote, $translate, $location, Page) { +.controller('PollVoteCtrl', ['$scope', '$rootScope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', '$translate', '$filter', '$location', 'Page', + function ($scope, $rootScope, $q, $controller, $routeParams, Poll, PollChoice, PollVote, $translate, $filter, $location, Page) { $controller('PollAdminChoiceCtrl', {$scope:$scope}); if (angular.isUndefined($scope.globalVariables)) { @@ -1171,9 +1171,10 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr initVote(); $rootScope.$broadcast('newInfo', - '<input type="text" class="form-control" value="' + - $scope.globalVariables.baseUrl+'#/poll/vote/'+$routeParams.pollId+'/'+ returnRequest.permission + - '" readonly />' + $filter('translate')('vote.added.printLink', {url: + '<input type="text" class="form-control" value="' + + $scope.globalVariables.baseUrl+'#/poll/vote/'+$routeParams.pollId+'/'+ returnRequest.permission + + '" readonly />'}) , -1); $location.url('/poll/vote/'+$routeParams.pollId+'/'+ returnRequest.permission); }, function (error) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.