[pollen] branch develop updated (ec745a5 -> a2aa2e5)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from ec745a5 refs #1075 add notification when email not validate new a2aa2e5 add translate poll.noComment, fix link comment in sidebar The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a2aa2e5b32da1f64ab5a6618b4a79307dee5eee4 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 28 15:10:35 2014 +0200 add translate poll.noComment, fix link comment in sidebar Summary of changes: 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/partials/poll-link.html | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 a2aa2e5b32da1f64ab5a6618b4a79307dee5eee4 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 28 15:10:35 2014 +0200 add translate poll.noComment, fix link comment in sidebar --- 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/partials/poll-link.html | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 10ffde2..b879eb8 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -107,6 +107,7 @@ var translateEN = { 'poll.cloned' : 'Poll cloned', 'poll.closed' : 'Poll closed', 'poll.deleted' : 'Poll deleted', +'poll.noComment' : 'No comment', 'poll.restricted.name' : 'Name', 'poll.restricted.mail' : 'E-mail', 'poll.restricted.weight' : 'Weight', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 0263961..cf535bb 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -107,6 +107,7 @@ var translateFR = { 'poll.cloned' : 'Sondage cloné', 'poll.closed' : 'Sondage clos', 'poll.deleted' : 'Sondage supprimé', +'poll.noComment' : 'Aucun commentaire', 'poll.restricted.name' : 'Nom du votant', 'poll.restricted.mail' : 'Courriel du votant', 'poll.restricted.weight' : 'Poids', diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-link.html b/pollen-ui-angular/src/main/webapp/partials/poll-link.html index f7d62f9..5814ee3 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-link.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-link.html @@ -41,7 +41,7 @@ <input type="text" select-on-click value="{{globalVariables.linkResult}}" readonly class="form-control input-mini"/> </li> - <li ng-if="data.poll.resultIsVisible"> + <li ng-if="data.poll.commentIsVisible"> <a href="{{globalVariables.linkComment}}"> <span class="fa fa-comments-o"></span> <span class="text">{{ 'poll.link.comment' | translate }}</span> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm