[pollen] branch develop updated (599e8f1 -> 620e946)
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 599e8f1 add a pool alert with alert.timeout == -1 new 0a7f73b rename button on home page new 620e946 translate home page The 2 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 620e9461c99a1c244300fe9e2b61ddc7f92a5b6c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Aug 4 10:16:53 2014 +0200 translate home page commit 0a7f73bb6832f88891e061f3de830919329deeee Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Aug 4 10:11:55 2014 +0200 rename button on home page Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 6 +++++- pollen-ui-angular/src/main/webapp/i18n/fr.js | 6 +++++- pollen-ui-angular/src/main/webapp/index.html | 2 +- pollen-ui-angular/src/main/webapp/partials/home.html | 7 ++++--- 4 files changed, 15 insertions(+), 6 deletions(-) -- 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 0a7f73bb6832f88891e061f3de830919329deeee Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Aug 4 10:11:55 2014 +0200 rename button on home page --- pollen-ui-angular/src/main/webapp/i18n/en.js | 4 +++- pollen-ui-angular/src/main/webapp/i18n/fr.js | 4 +++- pollen-ui-angular/src/main/webapp/index.html | 2 +- pollen-ui-angular/src/main/webapp/partials/home.html | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 551e046..b5a9bd1 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -12,7 +12,8 @@ var translateEN = { 'title.user.forgotPassword' : 'Forget Password', 'title.user.list' : 'List of user', -'newPoll' : 'New Poll', +'home.newPoll' : 'Create a poll', +'home.register' : 'Sign-in now', 'admin' : 'Administration', 'admin.listPoll' : 'List of Polls', @@ -61,6 +62,7 @@ var translateEN = { 'poll.tab.conf' : 'Configuration', 'poll.tab.participant' : 'Participants', +'poll.new' : 'New Poll', 'poll.link.edit' : 'Edit poll', 'poll.link.vote' : 'Vote', 'poll.link.result' : 'Result of poll', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 78c910d..2c740af 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -12,7 +12,8 @@ var translateFR = { 'title.user.forgotPassword' : 'Récupération du Mot de Passe', 'title.user.list' : 'Liste des utilisateurs', -'newPoll' : 'Nouveau Sondage', +'home.newPoll' : 'Créer des maintenants un sondage gratuitement', +'home.register' : 'Créer un compte gratuitement', 'admin' : 'Administration', 'admin.listPoll' : 'Liste des Sondages', @@ -69,6 +70,7 @@ var translateFR = { 'poll.link.close' : 'Clore les votes du sondage', 'poll.link.delete' : 'Supprimer le sondage', +'poll.new' : 'Nouveau Sondage', 'poll.edit' : 'Clique pour éditer', 'poll.desc' : 'Description (Facultatif). Ce cadre disparait si aucune description n\'est mise', 'poll.saved' : 'Sondage sauvegardé', diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 956b387..708d13f 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -96,7 +96,7 @@ </ul> <div class="collapse navbar-collapse" ng-controller="UserLoginCtrl"> <ul class="nav navbar-nav"> - <li><a href="#/poll/create"> {{ 'newPoll' | translate }}</a></li> + <li><a href="#/poll/create"> {{ 'poll.new' | translate }}</a></li> </ul> <ul class="nav navbar-nav pull-right"> <li ng-show="!currentUser.id"> diff --git a/pollen-ui-angular/src/main/webapp/partials/home.html b/pollen-ui-angular/src/main/webapp/partials/home.html index 517506e..7556bf1 100644 --- a/pollen-ui-angular/src/main/webapp/partials/home.html +++ b/pollen-ui-angular/src/main/webapp/partials/home.html @@ -28,7 +28,8 @@ Créer dés maintenant votre sondage gratuitement. Partager le lien de vote. Et regarder le résultat. </p> <p class=""> - <a href="#/poll/create" class="btn btn-primary btn-lg"><span class="glyphicon glyphicon-plus-sign"></span> {{ 'newPoll' | translate }}</a> + <a href="#/poll/create" class="btn btn-primary btn-lg"><span class="glyphicon glyphicon-plus-sign"></span> {{ 'home.newPoll' | translate }}</a> + <a href="#/user/register" class="btn btn-default btn-lg"><span class="glyphicon glyphicon-user"></span> {{ 'home.register' | translate }} </a> </p> </div> </div> -- 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 620e9461c99a1c244300fe9e2b61ddc7f92a5b6c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Aug 4 10:16:53 2014 +0200 translate home page --- pollen-ui-angular/src/main/webapp/i18n/en.js | 2 ++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 4 +++- pollen-ui-angular/src/main/webapp/partials/home.html | 4 ++-- 3 files changed, 7 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 b5a9bd1..479a9a0 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -12,6 +12,8 @@ var translateEN = { 'title.user.forgotPassword' : 'Forget Password', 'title.user.list' : 'List of user', +'home.title' : 'Pollen, Poll Application', +'home.description' : 'Create now your poll. Share the vote link. And show the result.', 'home.newPoll' : 'Create a poll', 'home.register' : 'Sign-in now', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 2c740af..c56413c 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -12,7 +12,9 @@ var translateFR = { 'title.user.forgotPassword' : 'Récupération du Mot de Passe', 'title.user.list' : 'Liste des utilisateurs', -'home.newPoll' : 'Créer des maintenants un sondage gratuitement', +'home.title' : 'Pollen, Application de sondage', +'home.description' : 'Créer dés maintenant votre sondage gratuitement. Partager le lien de vote. Et regarder le résultat.', +'home.newPoll' : 'Créer dés maintenant un sondage gratuitement', 'home.register' : 'Créer un compte gratuitement', 'admin' : 'Administration', diff --git a/pollen-ui-angular/src/main/webapp/partials/home.html b/pollen-ui-angular/src/main/webapp/partials/home.html index 7556bf1..61ea157 100644 --- a/pollen-ui-angular/src/main/webapp/partials/home.html +++ b/pollen-ui-angular/src/main/webapp/partials/home.html @@ -22,10 +22,10 @@ <div class="jumbotron"> <div class="container"> <h1> - Pollen, Application de sondage + {{ 'home.title' | translate }} </h1> <p> - Créer dés maintenant votre sondage gratuitement. Partager le lien de vote. Et regarder le résultat. + {{ 'home.description' | translate }} </p> <p class=""> <a href="#/poll/create" class="btn btn-primary btn-lg"><span class="glyphicon glyphicon-plus-sign"></span> {{ 'home.newPoll' | translate }}</a> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm