[pollen] branch develop updated (2c020bc -> 59a5ece)
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 2c020bc add group result, improve UI with group result new 59a5ece add translate 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 59a5eceafabf4ef8f48048ed491a353f0acc05e9 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Aug 18 17:24:52 2014 +0200 add translate Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 6 ++++++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 10 +++++----- 2 files changed, 11 insertions(+), 5 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 59a5eceafabf4ef8f48048ed491a353f0acc05e9 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Aug 18 17:24:52 2014 +0200 add translate --- pollen-ui-angular/src/main/webapp/i18n/en.js | 6 ++++++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 10 +++++----- 2 files changed, 11 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 cef2cad..b90399c 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -92,6 +92,12 @@ var translateEN = { 'poll.result.title.zero' : 'No result', 'poll.result.title.one' : 'Result : One voter', 'poll.result.title.other' : 'Result : {{nbVoter}} Voters', +'poll.result.title.group.zero' : 'No result', +'poll.result.title.group.one' : 'Result : One group', +'poll.result.title.group.other' : 'Result : {{nbVoter}} Groups', +'poll.result.group.title.zero' : 'Group : {{name}}, no voter', +'poll.result.group.title.one' : 'Group : {{name}}, one voter', +'poll.result.group.title.other' : 'Group : {{name}}, {{nbVoter}} voters', 'poll.config.title.creator' : 'Creator information', 'poll.config.title.poll' : 'Global config', 'poll.config.title.choice' : 'Choice config', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 9c79e26..2c7fd84 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -93,11 +93,11 @@ var translateFR = { 'poll.result.title.one' : 'Résultat : Un votant', 'poll.result.title.other' : 'Résultat : {{nbVoter}} Votants', 'poll.result.title.group.zero' : 'Aucun Résultat', -'poll.result.title.group.one' : 'Résultat : Un group', -'poll.result.title.group.other' : 'Résultat : {{nbVoter}} Groups', -'poll.result.group.title.zero' : 'Group : {{name}}, aucun votants', -'poll.result.group.title.one' : 'Group : {{name}}, un votants', -'poll.result.group.title.other' : 'Group : {{name}}, {{nbVoter}} Votants', +'poll.result.title.group.one' : 'Résultat : Un groupe', +'poll.result.title.group.other' : 'Résultat : {{nbVoter}} Groupes', +'poll.result.group.title.zero' : 'Groupe : {{name}}, aucun votant', +'poll.result.group.title.one' : 'Groupe : {{name}}, un votant', +'poll.result.group.title.other' : 'Groupe : {{name}}, {{nbVoter}} Votants', 'poll.config.title.creator' : 'Information du créateur', 'poll.config.title.poll' : 'Configuration globale', 'poll.config.title.choice' : 'Configuration des choix', -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm