branch develop updated (f434463 -> 540cdd3)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from f434463 Utilisation de nuiton-config pour générer la configuration + normalisation des options de la configuration new 540cdd3 optimize dependencies + fix i18n issues in services module 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 540cdd379301d995b91ca249da2b3cfd8edfe43e Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Jan 6 12:52:35 2017 +0100 optimize dependencies + fix i18n issues in services module Summary of changes: pollen-services/pom.xml | 13 +++++++---- .../i18n/pollen-services_en_GB.properties | 27 +++++++++++++++++----- .../i18n/pollen-services_fr_FR.properties | 27 +++++++++++++++++----- 3 files changed, 50 insertions(+), 17 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 https://gitlab.nuiton.org/chorem/pollen.git commit 540cdd379301d995b91ca249da2b3cfd8edfe43e Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Jan 6 12:52:35 2017 +0100 optimize dependencies + fix i18n issues in services module --- pollen-services/pom.xml | 13 +++++++---- .../i18n/pollen-services_en_GB.properties | 27 +++++++++++++++++----- .../i18n/pollen-services_fr_FR.properties | 27 +++++++++++++++++----- 3 files changed, 50 insertions(+), 17 deletions(-) diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index 4330fe5..dc8dddb 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -148,11 +148,6 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-version</artifactId> - </dependency> - - <dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-core</artifactId> </dependency> @@ -198,6 +193,7 @@ </goals> <configuration> <packageName>org.chorem.pollen.services.config</packageName> + <useNuitonI18n>true</useNuitonI18n> </configuration> </execution> </executions> @@ -211,6 +207,13 @@ <goal>parserJava</goal> <goal>gen</goal> </goals> + <configuration> + <entries> + <entry> + <basedir>${project.build.directory}/generated-sources/java</basedir> + </entry> + </entries> + </configuration> </execution> </executions> </plugin> diff --git a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties index e1210d8..7d0b986 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties @@ -1,16 +1,32 @@ +PollenServicesConfig.description=Pollen Backend configuration pollen.configuration.data.directory=Directory where Pollen stores his data -pollen.configuration.defaultCommentPageSize= -pollen.configuration.defaultFavoriteListMemberPageSize= -pollen.configuration.defaultFavoriteListPageSize= +pollen.configuration.defaultChoiceType=Default choice type +pollen.configuration.defaultCommentPageSize=Default number of comments per page +pollen.configuration.defaultCommentVisibility=Default comment visibility +pollen.configuration.defaultFavoriteListMemberPageSize=Default number of participants per page +pollen.configuration.defaultFavoriteListPageSize=Default number of favorite lists per page pollen.configuration.defaultPollChoiceType=Default choice type used when creating a new poll pollen.configuration.defaultPollCommentVisibility=Default Poll comment visibility used when creating a new poll -pollen.configuration.defaultPollPageSize= +pollen.configuration.defaultPollPageSize=Default number of polls per page pollen.configuration.defaultPollResultVisibility=Default Result vsibility used when creating a new poll pollen.configuration.defaultPollType=Default Poll type used when creating a new poll pollen.configuration.defaultPollVoteVisibility=Default Poll vote visibility used when creating a new poll -pollen.configuration.defaultPollenUserPageSize= +pollen.configuration.defaultPollenUserPageSize=Default number of users per pages +pollen.configuration.defaultResultVisibility=Default Result visibility pollen.configuration.defaultVoteCountingType=Default vote counting type used when creating a new poll +pollen.configuration.defaultVoteVisibility=Default vote visiblity +pollen.configuration.devMode=Dev mode +pollen.configuration.logConfigurationFile=Path to log configuration file pollen.configuration.sessionTimeoutDelay=Inactivity delay before invalidate the session of a user (in seconds) +pollen.configuration.smptHost=Smtp Host +pollen.configuration.smtpFrom=Smtp From +pollen.configuration.smtpPort=Smtp Port +pollen.configuration.uiEndPoint=Ui end point +pollen.configuration.uiUrlPollEdit=Url to edit a poll +pollen.configuration.uiUrlPollVote=Url to vote on a poll +pollen.configuration.version=Application version +pollen.configurqtion.uiUrlPollVoteEdit=Url to edit a vote on a poll +pollen.configurqtion.uiUrlUserValidate=Url de validate user account pollen.error.choice.choiceDateEmpty=choice date can not be empty pollen.error.choice.choiceDateExist=choice date already used in this list pollen.error.choice.choiceNameEmpty=choice name can not be empty @@ -45,7 +61,6 @@ pollen.error.poll.unique.voterList.mandatory.for.restrictedPoll=A voter list is pollen.error.poll.voteCountingType.mandatory=vote counting type is mandatory pollen.error.poll.voteVisibility.mandatory=vote visibility is mandatory pollen.error.poll.voterList.mandatory.for.groupedPoll=At least one voter list ins mandatory for a grouped poll -pollen.error.poll.voterList.mismatch.freePoll= pollen.error.resource.empty=No resource sent pollen.error.resource.notExist=Image don't exist pollen.error.user.mailEmpty=email can not be empty diff --git a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties index a6353b6..f3d3d62 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties @@ -1,16 +1,32 @@ +PollenServicesConfig.description=Configuration du backend de Pollen pollen.configuration.data.directory=Répertoire de données de l'application -pollen.configuration.defaultCommentPageSize= -pollen.configuration.defaultFavoriteListMemberPageSize= -pollen.configuration.defaultFavoriteListPageSize= +pollen.configuration.defaultChoiceType=Type de choix par défaut +pollen.configuration.defaultCommentPageSize=Nombre de commentaires par page +pollen.configuration.defaultCommentVisibility=Visibilité des commentaires par défaut +pollen.configuration.defaultFavoriteListMemberPageSize=Nomnre de participants par page +pollen.configuration.defaultFavoriteListPageSize=Nombre de liste de favoris par page pollen.configuration.defaultPollChoiceType=Type de choix par défaut lors de la création d'un nouveau sondage pollen.configuration.defaultPollCommentVisibility=Visibilité des commentaires par défaut lors de la création d'un nouveau sondage -pollen.configuration.defaultPollPageSize= +pollen.configuration.defaultPollPageSize=Nombre de sondages par page pollen.configuration.defaultPollResultVisibility=Visibilité des résultats par défaut lors de la création d'un nouveau sondage pollen.configuration.defaultPollType=Type de sondage par défaut lors de la création d'un nouveau sondage pollen.configuration.defaultPollVoteVisibility=Visibilité des votes par défaut lors de la création d'un nouveau sondage -pollen.configuration.defaultPollenUserPageSize= +pollen.configuration.defaultPollenUserPageSize=Nombre d'utilisateurs par page +pollen.configuration.defaultResultVisibility=Visibilité des résultats par défaut pollen.configuration.defaultVoteCountingType=Type de dépouillement par défaut lors de la création d'un nouveau sondage +pollen.configuration.defaultVoteVisibility=Visibilité des votes par défaut +pollen.configuration.devMode=Mode développement +pollen.configuration.logConfigurationFile=Chemin vers le fichier de configuration des logs pollen.configuration.sessionTimeoutDelay=Temps autorisé d'inactivité avant d'invalider une session utilisateur (en secondes) +pollen.configuration.smptHost=Hôye smtp +pollen.configuration.smtpFrom=Expéditeur +pollen.configuration.smtpPort=Port smtp +pollen.configuration.uiEndPoint=End point de l'ui +pollen.configuration.uiUrlPollEdit=Url d'édition d'un sondage +pollen.configuration.uiUrlPollVote=Url de vote sur un sondage +pollen.configuration.version=Version de l'application +pollen.configurqtion.uiUrlPollVoteEdit=Url d'édition de vote sur un sondage +pollen.configurqtion.uiUrlUserValidate=Url de validation d'un compte utilisateur pollen.error.choice.choiceDateEmpty=La date ne peut pas être vide pollen.error.choice.choiceDateExist=La date exist déjà utilisé sur ce sondage pollen.error.choice.choiceNameEmpty=Le nom du choix ne peut pas être vide @@ -44,7 +60,6 @@ pollen.error.poll.unique.voterList.mandatory.for.restrictedPoll=une liste de vot pollen.error.poll.voteCountingType.mandatory=le type de vote est obligatoire pollen.error.poll.voteVisibility.mandatory=la visiblité des votes est obligatoire pollen.error.poll.voterList.mandatory.for.groupedPoll=Au moins une liste de votant est obligatoire pour un sondage groupé -pollen.error.poll.voterList.mismatch.freePoll=Liste de votants impossible pour un sondage libre pollen.error.resource.empty=Aucune resource envoyé pollen.error.resource.notExist=L'image n'existe pas sur le serveur pollen.error.user.mailEmpty=Courriel ne peut pas être vide -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm