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 0e8eb23ada431de88beeaeec9310a2fe1ed88d7c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 13:57:45 2014 +0200 improve message with url for edit comment --- 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 | 7 ++++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index e57511d..e7060f5 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -115,6 +115,7 @@ var translateEN = { 'comment' : 'Comment', 'comment.added' : 'Comment added.', +'comment.added.printLink' : 'You can modify your comment to using this address when you are not connected: {{url}}', 'comment.order.toDesc' : 'Ordered by newer date', 'comment.order.toAsc' : 'Ordered by older date', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index ac2978d..f5c6714 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -115,6 +115,7 @@ var translateFR = { 'comment' : 'Commentaire', 'comment.added' : 'Commentaire effectué', +'comment.added.printLink' : 'Garder le lien suivant pour pouvoir modifier votre commentaire, lorsque vous n\'êtes pas connecté : {{url}}', 'comment.order.toDesc' : 'Ordonner par le plus récent', 'comment.order.toAsc' : 'Ordonner par ordre chronologique', 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 22a464e..0896b82 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -1244,8 +1244,8 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr ////////////////////////////////// .controller('PollCommentCtrl', - ['$scope', '$rootScope', '$controller', '$routeParams', 'Poll', 'PollComment', '$translate', '$timeout', '$location', 'Page', - function ( $scope, $rootScope, $controller, $routeParams, Poll, PollComment, $translate, $timeout, $location, Page) { + ['$scope', '$rootScope', '$controller', '$routeParams', 'Poll', 'PollComment', '$translate', '$filter', '$timeout', '$location', 'Page', + function ( $scope, $rootScope, $controller, $routeParams, Poll, PollComment, $translate, $filter, $timeout, $location, Page) { if (angular.isUndefined($scope.globalVariables)) { $scope.globalVariables = {}; @@ -1336,9 +1336,10 @@ angular.module('pollControllers', ['ngRoute', 'pollenServices', 'pascalprecht.tr $scope.commentToken = data.permission; $rootScope.$broadcast('newInfo', + $filter('translate')('comment.added.printLink', {url : '<input type="text" class="form-control" value="' + $scope.globalVariables.baseUrl+'#/poll/comment/'+$routeParams.pollId+'/'+data.permission + - '" readonly />' + '" readonly />' }) , -1); $location.url('/poll/comment/'+$routeParams.pollId+'/'+data.permission); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.