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 00ac16edd9b40c0a6cb611c7a986976e9bef472f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 23 15:31:37 2017 +0200 supression des options et des traductions non utilisées --- pollen-services/src/main/config/PollenServices.ini | 51 +--------------------- .../services/config/PollenServicesConfig.java | 7 --- .../pollen/services/service/CommentService.java | 3 +- .../services/service/FavoriteListService.java | 3 +- .../pollen/services/service/PollService.java | 3 +- .../services/service/PollenServiceSupport.java | 2 + .../pollen/services/service/PollenUserService.java | 3 +- .../pollen/services/service/VoteService.java | 3 +- .../pollen/services/service/mail/EmailService.java | 4 +- .../i18n/pollen-services_en_GB.properties | 24 ---------- .../i18n/pollen-services_fr_FR.properties | 26 +---------- 11 files changed, 13 insertions(+), 116 deletions(-) diff --git a/pollen-services/src/main/config/PollenServices.ini b/pollen-services/src/main/config/PollenServices.ini index 465b7a15..5f8ce7d2 100644 --- a/pollen-services/src/main/config/PollenServices.ini +++ b/pollen-services/src/main/config/PollenServices.ini @@ -51,12 +51,6 @@ key = pollen.default.continuousResults type = Boolean defaultValue = true -[option defaultChoiceType] -description = pollen.configuration.defaultChoiceType -key = pollen.default.choiceType -type = org.chorem.pollen.persistence.entity.ChoiceType -defaultValue = TEXT - [option defaultVoteNotification] description = pollen.configuration.defaultVoteNotification key = pollen.default.voteNotification @@ -81,42 +75,6 @@ key = pollen.default.notifyMeHoursBeforePollEnds type = int defaultValue = 0 -[option defaultPollPageSize] -description = pollen.configuration.defaultPollPageSize -key = pollen.default.pollPageSize -type = int -defaultValue = 10 - -[option defaultCommentPageSize] -description = pollen.configuration.defaultCommentPageSize -key = pollen.default.commentPageSize -type = int -defaultValue = 10 - -[option defaultVotePageSize] -description = pollen.configuration.defaultVotePageSize -key = pollen.default.votePageSize -type = int -defaultValue = 10 - -[option defaultFavoriteListPageSize] -description = pollen.configuration.defaultFavoriteListPageSize -key = pollen.default.favoriteListPageSize -type = int -defaultValue = 10 - -[option defaultFavoriteListMemberPageSize] -description = pollen.configuration.defaultFavoriteListMemberPageSize -key = pollen.default.favoriteListMemberPageSize -type = int -defaultValue = 10 - -[option defaultPollenUserPageSize] -description = pollen.configuration.defaultPollenUserPageSize -key = pollen.default.pollenUserPageSize -type = int -defaultValue = 10 - [option sessionTimeoutDelay] description = pollen.configuration.sessionTimeoutDelay key = pollen.default.sessionTimeoutDelay @@ -139,20 +97,13 @@ defaultValue = 25 description = pollen.configuration.smtpFrom key = pollen.smtp.from type = string -defaultValue = "no-reply@pollen.com" +defaultValue = "noreply@serveur.com" [option logConfigurationFile] description = pollen.configuration.logConfigurationFile key = pollen.logConfigurationFile type = file -[option version] -description = pollen.configuration.version -key = pollen.version -type = string -transient = true -final = true - [option sendEndPollRemindersCronSchedule] description = pollen.configuration.sendEndPollRemindersCronSchedule key = pollen.sendEndPollRemindersCronSchedule diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServicesConfig.java b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServicesConfig.java index c71f5b3c..e68feda5 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServicesConfig.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServicesConfig.java @@ -27,7 +27,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.shiro.crypto.hash.Sha512Hash; -import org.chorem.pollen.persistence.entity.ChoiceType; import org.chorem.pollen.persistence.entity.CommentVisibility; import org.chorem.pollen.persistence.entity.PollType; import org.chorem.pollen.persistence.entity.ResultVisibility; @@ -133,11 +132,6 @@ public class PollenServicesConfig extends GeneratedPollenServicesConfig { } @Override - public ChoiceType getDefaultChoiceType() { - return ChoiceType.valueOf(get().getOption(PollenServicesConfigOption.DEFAULT_CHOICE_TYPE.getKey())); - } - - @Override public Boolean getDefaultVoteNotification() { return Boolean.valueOf(get().getOption(PollenServicesConfigOption.DEFAULT_VOTE_NOTIFICATION.getKey())); } @@ -147,7 +141,6 @@ public class PollenServicesConfig extends GeneratedPollenServicesConfig { return Boolean.valueOf(get().getOption(PollenServicesConfigOption.DEFAULT_COMMENT_NOTIFICATION.getKey())); } - @Override public Boolean getDefaultNewChoiceNotification() { return Boolean.valueOf(get().getOption(PollenServicesConfigOption.DEFAULT_NEW_CHOICE_NOTIFICATION.getKey())); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java index 2bfeda2b..4cb5cc47 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java @@ -289,10 +289,9 @@ public class CommentService extends PollenServiceSupport { if (paginationParameter == null) { - int pageSize = getPollenServiceConfig().getDefaultCommentPageSize(); paginationParameter = PaginationParameterBean.of( 0, - pageSize, + PAGE_SIZE_DEFAULT, Comment.PROPERTY_TOPIA_CREATE_DATE, true); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java index 3127617f..4e007b4a 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java @@ -640,8 +640,7 @@ public class FavoriteListService extends PollenServiceSupport { if (paginationParameter == null) { - int pageSize = getPollenServiceConfig().getDefaultFavoriteListPageSize(); - paginationParameter = PaginationParameterBean.of(0, pageSize); + paginationParameter = PaginationParameterBean.of(0, PAGE_SIZE_DEFAULT); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java index 1ce0a46f..8afbb635 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java @@ -693,8 +693,7 @@ public class PollService extends PollenServiceSupport { if (paginationParameter == null) { - int pageSize = getPollenServiceConfig().getDefaultPollPageSize(); - paginationParameter = PaginationParameterBean.of(0, pageSize); + paginationParameter = PaginationParameterBean.of(0, PAGE_SIZE_DEFAULT); } if (paginationParameter.getOrder() == null) { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java index 20460e7f..b9b36ae4 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java @@ -77,6 +77,8 @@ import java.util.function.Function; */ public abstract class PollenServiceSupport implements PollenService { + public static final int PAGE_SIZE_DEFAULT = 10; + // -- PollenServiceSupport -- // protected PollenServiceContext serviceContext; diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java index 54298256..f20bdc91 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java @@ -516,8 +516,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer if (paginationParameter == null) { - int pageSize = getPollenServiceConfig().getDefaultPollenUserPageSize(); - paginationParameter = PaginationParameterBean.of(0, pageSize); + paginationParameter = PaginationParameterBean.of(0, PAGE_SIZE_DEFAULT); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java index 8fdae9dd..b05b2e8f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java @@ -558,10 +558,9 @@ public class VoteService extends PollenServiceSupport { if (paginationParameter == null) { - int pageSize = getPollenServiceConfig().getDefaultVotePageSize(); paginationParameter = PaginationParameterBean.of( 0, - pageSize, + PAGE_SIZE_DEFAULT, Vote.PROPERTY_TOPIA_CREATE_DATE, true); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java index af7a11dc..3e3ba8f9 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java @@ -629,7 +629,9 @@ public class EmailService extends PollenServiceSupport { feedbackBean.getScreenShotId().getReducedId()); email.setScreenShotUrl(screenShotUrl); } - email.setApplicationVersion(getPollenServiceConfig().getVersion()); + + String version = getClass().getPackage().getImplementationVersion(); + email.setApplicationVersion(version); return email; } 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 7440e08f..3bb4345c 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,29 +1,17 @@ PollenServicesConfig.description=Pollen Backend configuration pollen.configuration.data.directory=Directory where Pollen stores his data -pollen.configuration.defaultChoiceType=Default choice type pollen.configuration.defaultCommentNotification=Default notification type for the comments of a poll -pollen.configuration.defaultCommentPageSize=Default number of comments per page pollen.configuration.defaultCommentVisibility=Default comment visibility pollen.configuration.defaultContinuousResults=Défault continuous results -pollen.configuration.defaultFavoriteListMemberPageSize=Default number of participants per page -pollen.configuration.defaultFavoriteListPageSize=Default number of favorite lists per page pollen.configuration.defaultNewChoiceNotification=Default notification type for the new choices of a poll pollen.configuration.defaultNotifyMeHoursBeforePollEnds=Default time before the end of the poll to send the reminder email -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=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=Default number of users per pages pollen.configuration.defaultResultVisibility=Default Result visibility pollen.configuration.defaultTimeZoneId=Default timeZone pollen.configuration.defaultVoteCountingType=Default vote counting type used when creating a new poll pollen.configuration.defaultVoteNotification=Default notification type for the votes of a poll -pollen.configuration.defaultVotePageSize=Default number of vote per page pollen.configuration.defaultVoteVisibility=Default vote visiblity pollen.configuration.deleteObsoleteSessionTokensCronSchedule=Time between two cron jobs of delete obsolete session tokens -pollen.configuration.devMode=Dev mode pollen.configuration.feedback.locale=locale to send feedback pollen.configuration.feedback.mails=mails to send feedback pollen.configuration.logConfigurationFile=Path to log configuration file @@ -39,14 +27,9 @@ pollen.configuration.sessionTimeoutDelay=Inactivity delay before invalidate the 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.userConnectedRequired=Only connected users can be access on application pollen.configuration.usersCanCreatePoll=Wich user can create Poll ("All_USERS", "USERS_CONNECTED" or "USERS_SELECTED") 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.childFavoriteList.already.used=Child list "%s" is already used pollen.error.childFavoriteList.childIsAncestor=Child list "%2$s" is ancestor of main list %1$s pollen.error.childFavoriteList.sameParentChild=Child "%s" must be not equal to parent @@ -88,14 +71,11 @@ pollen.error.poll.commentVisibility.mandatory=comment visiblity is mandatory pollen.error.poll.creator.email.invalid=email is not valid pollen.error.poll.endChoiceDate.beforeBeginChoiceDate=The end date of adding choice is before the begin date pollen.error.poll.endDate.beforeBeginDate=The end date of vote is before the begin date -pollen.error.poll.mismatch.freePoll=cant' have a voter list for a free poll pollen.error.poll.pollType.mandatory=poll type is mandatory pollen.error.poll.resultVisibility.mandatory=result visibility is mandatory pollen.error.poll.title.mandatory=title is mandatory -pollen.error.poll.unique.voterList.mandatory.for.restrictedPoll=A voter list is mandatory for a restricted poll 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.report.email.invalid=Email invalid pollen.error.report.email.mandatory=Email cannot be empty pollen.error.report.level.mandatory=Report level cannot be empty @@ -114,10 +94,7 @@ pollen.error.user.passwordEmpty=The password cannot be empty pollen.error.user.passwordInvalid=The password is not valid pollen.error.vote.limitedVote.overflow=Too many choices pollen.error.vote.poll.finished=Votes are finished, you cannot vote anymore -pollen.error.vote.poll.isClosed=poll is closed, you can't vote pollen.error.vote.poll.notStarted=poll is not started -pollen.error.vote.totalVote.invalid=Total vote value is invalid -pollen.error.vote.voteValue.invalid=Value is invalid pollen.error.vote.voterName.alreadyExist=voter name is already used pollen.error.vote.voterName.mandatory=voter name cannot be empty pollen.error.voterList.member.email.alreadyUsed=member email already used in this list @@ -178,7 +155,6 @@ pollen.service.mail.UserAccountPasswordChangedEmail.subject=[Pollen] Confirmatio pollen.service.mail.VoteAddedEmail.subject=[Pollen] A vote was added in poll %s pollen.service.mail.VoteDeletedEmail.subject=[Pollen] A vote was deleted in poll %s pollen.service.mail.VoteEditedEmail.subject=[Pollen] A vote was edited in poll %s -pollen.service.mail.VoteSummaryEmail.subject=[Pollen] Summary of the votes since %s for the poll %s pollen.service.mail.feedbackEmail.subject=[Pollen] feedback - %s pollen.service.mail.loginProvider.amazon=Amazon pollen.service.mail.loginProvider.facebook=Facebook 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 374861dc..fc54e488 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,29 +1,17 @@ PollenServicesConfig.description=Configuration du backend de Pollen pollen.configuration.data.directory=Répertoire de données de l'application -pollen.configuration.defaultChoiceType=Type de choix par défaut pollen.configuration.defaultCommentNotification=Type de notification par défaut pour les commentaires -pollen.configuration.defaultCommentPageSize=Nombre de commentaires par page pollen.configuration.defaultCommentVisibility=Visibilité des commentaires par défaut pollen.configuration.defaultContinuousResults=Voire les résultats en continue par défaut -pollen.configuration.defaultFavoriteListMemberPageSize=Nomnre de participants par page -pollen.configuration.defaultFavoriteListPageSize=Nombre de liste de favoris par page pollen.configuration.defaultNewChoiceNotification=Type de notification par défaut pour les nouveaux choix -pollen.configuration.defaultNotifyMeHoursBeforePollEnds=Combien de temps par défaut avant la fin du sondage envoyer le rappel -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=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.defaultNotifyMeHoursBeforePollEnds=Combien de temps par défaut avant la fin du sondage envoyer le rappele 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=Nombre d'utilisateurs par page pollen.configuration.defaultResultVisibility=Visibilité des résultats par défaut pollen.configuration.defaultTimeZoneId=Fuseau horaire par défaut pollen.configuration.defaultVoteCountingType=Type de dépouillement par défaut lors de la création d'un nouveau sondage pollen.configuration.defaultVoteNotification=Type de notification par défaut pour les votes -pollen.configuration.defaultVotePageSize=Nombre de votes par page pollen.configuration.defaultVoteVisibility=Visibilité des votes par défaut pollen.configuration.deleteObsoleteSessionTokensCronSchedule=Intervalle entre deux lancements de la supression des tokens de session obsoletes -pollen.configuration.devMode=Mode développement pollen.configuration.feedback.locale=La locale pour envoyer les retours utlisateur pollen.configuration.feedback.mails=Courriel destinataires des retours utilisateur pollen.configuration.logConfigurationFile=Chemin vers le fichier de configuration des logs @@ -36,17 +24,12 @@ pollen.configuration.resource.preview.max=Dimension maximal de la prévisualisat pollen.configuration.secret= pollen.configuration.sendEndPollRemindersCronSchedule=Intervalle entre deux lancements de la tâche d'envoi de mails de rappel de fin de sondage pollen.configuration.sessionTimeoutDelay=Temps autorisé d'inactivité avant d'invalider une session utilisateur (en secondes) -pollen.configuration.smptHost=Hôye smtp +pollen.configuration.smptHost=Hôte 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.userConnectedRequired=Seul les utilisateurs connectés peuvent accéder à l'application pollen.configuration.usersCanCreatePoll=Quels utilisateurs peuvent créer des sondages ("All_USERS", "USERS_CONNECTED" ou "USERS_SELECTED") 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.childFavoriteList.already.used=La sous-liste « %s » est déja utlisée pollen.error.childFavoriteList.childIsAncestor=La sous-liste « %2$s » ne doit pas dépendre de la liste principal « %1$s » pollen.error.childFavoriteList.sameParentChild=La liste principal « %s » ne peut avoir comme sous-lists elle-même @@ -91,10 +74,8 @@ pollen.error.poll.endDate.beforeBeginDate=La date de fin des votes est avant la pollen.error.poll.pollType.mandatory=le type de sondage est obligatoire pollen.error.poll.resultVisibility.mandatory=la visibilité des résultats est obligatoire pollen.error.poll.title.mandatory=le titre du sondage est obligatoire -pollen.error.poll.unique.voterList.mandatory.for.restrictedPoll=une liste de votant est obligatoire pour un sondage restreint 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.report.email.invalid=Le courriel n'est pas valid pollen.error.report.email.mandatory=Le courriel est obligatoire pollen.error.report.level.mandatory=Le type de signalement est obligatoire @@ -113,10 +94,7 @@ pollen.error.user.passwordEmpty=Le mot de passe ne peut pas être vide pollen.error.user.passwordInvalid=Le mot de passe est invalide pollen.error.vote.limitedVote.overflow=Le nombre de choix maximal atteind pollen.error.vote.poll.finished=Les votes sont terminés, vous ne pouvez plus voter -pollen.error.vote.poll.isClosed=Le sondage est clos, vous ne pouvez plus voter pollen.error.vote.poll.notStarted=Les votes n'ont pas commencé -pollen.error.vote.totalVote.invalid=Le total des valeurs est invalide -pollen.error.vote.voteValue.invalid=La valeur est invalide pollen.error.vote.voterName.alreadyExist=Le nom existe déjà pollen.error.vote.voterName.mandatory=Le nom est obligatoire pollen.error.voterList.member.email.alreadyUsed=L'email du membre est déjà utilisé dans cette liste -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.