This is an automated email from the git hooks/post-receive script. New commit to branch feature/pollen-riot-js in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 9e2028e1e7f58df72d7b49a69b9e44bb020f6c34 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Feb 1 13:27:39 2017 +0100 i18n sur la page de création du sondage --- pollen-ui-riot-js/src/main/web/i18n.json | 15 +++++++++++++++ .../src/main/web/tag/poll/PollCreated.tag | 18 +++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n.json b/pollen-ui-riot-js/src/main/web/i18n.json index 1748088..e437cc5 100644 --- a/pollen-ui-riot-js/src/main/web/i18n.json +++ b/pollen-ui-riot-js/src/main/web/i18n.json @@ -151,6 +151,7 @@ "poll_settings_voteCountingType_condorcet": "Condorcet", "poll_settings_anonymousVote": "Rendre les votes anonymes", "poll_settings_commentsConfiguration": "Configuration des commentaires", + "poll_settings_resultsConfiguration": "Configuration des résultats", "poll_settings_votePeriod": "Quand les participants peuvent-ils voter ?", "poll_settings_help": "Aide", "poll_settings_beginDate": "Début de vote", @@ -158,6 +159,8 @@ "poll_settings_beginChoiceDate": "Début d'ajout de choix", "poll_settings_endChoiceDate": "Fin d'ajout de choix", "poll_settings_maxChoiceNumber": "Nombre maximum de choix", + "poll_settings_nav_pollTitle": "Titre", + "poll_settings_nav_pollDescription": "Description", "poll_choices_label": "Choix", "poll_choices_description": "Description", "poll_choices_previous": "Précédent", @@ -180,6 +183,12 @@ "poll_voters_restrictedPoll_withGroup": "Organiser les invités dans des groupes", "poll_voters_invite": "Inviter des participants", "poll_voters_invite_label": "Renseigner le courriel des participants (séparé par un espace)", + "poll_created_title": "Sondage créé", + "poll_created_message": "Le sondage vient d'être créé. Un courriel vous a été adressé ainsi qu'aux éventuels participants.", + "poll_created_edit": "Pour gérer le sondage, veuillez utiliser le lien suivant", + "poll_created_vote": "Pour voter, veuillez utiliser le lien suivant", + "poll_created_editUrl": "Gérer le sondage", + "poll_created_voteUrl": "Voter", "": "" }, "en": { @@ -369,6 +378,12 @@ "poll_voters_restrictedPoll_withGroup": "Organize participants in groups", "poll_voters_invite": "Invite people to vote", "poll_voters_invite_label": "Type participants emails separated by space", + "poll_created_title": "Poll created", + "poll_created_message": "The poll was created. An email was sent to you and declared voters.", + "poll_created_edit": "To manage the poll, please use following link", + "poll_created_vote": "To vote on poll, please use following link", + "poll_created_editUrl": "Manage poll", + "poll_created_voteUrl": "Vote on poll", "": "" } } \ No newline at end of file diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/PollCreated.tag b/pollen-ui-riot-js/src/main/web/tag/poll/PollCreated.tag index 04da539..2097d33 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/PollCreated.tag +++ b/pollen-ui-riot-js/src/main/web/tag/poll/PollCreated.tag @@ -8,12 +8,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% @@ -23,18 +23,22 @@ <div class="container"> <div class="legend"> - Sondage créé. + {__.title} «{form.model.title}». </div> <div> - Le sondage «{form.model.title}» vient d'être créé. Un courriel vous a été adressé ainsi qu'aux éventuels participants. - + {__.message} <br/> - <a href="#poll/{form.model.id}">Accéder au sondage</a>. - + <div> + {__.vote} (<a href="#poll/{form.model.id}/{form.model.permission}">{__.editUrl}</a>). + </div> + <div if="{form.model.pollType==='FREE'}"> + {__.vote} (<a href="#poll/{form.model.id}/vote">{__.voteUrl}</a>). + </div> </div> </div> <script> + this.installBundle(opts.session, "poll_created"); this.form = opts.form; console.info("Created poll"); console.info(this.form); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.