branch develop updated (ba469dd -> 079034c)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from ba469dd [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 079034c Ajout d'éléments à la liste des groupes de paramètres à mesurer (termine #6689) 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 079034ccc3256d56816098963ceae71c83ab09de Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Feb 24 10:34:33 2015 +0100 Ajout d'éléments à la liste des groupes de paramètres à mesurer (termine #6689) Summary of changes: .../wao/entity/IndividualMeasurementStrategy.java | 43 +++++++--------------- .../i18n/wao-persistence_en_GB.properties | 20 +++++++--- .../i18n/wao-persistence_fr_FR.properties | 20 +++++++--- 3 files changed, 42 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 079034ccc3256d56816098963ceae71c83ab09de Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Feb 24 10:34:33 2015 +0100 Ajout d'éléments à la liste des groupes de paramètres à mesurer (termine #6689) --- .../wao/entity/IndividualMeasurementStrategy.java | 43 +++++++--------------- .../i18n/wao-persistence_en_GB.properties | 20 +++++++--- .../i18n/wao-persistence_fr_FR.properties | 20 +++++++--- 3 files changed, 42 insertions(+), 41 deletions(-) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java index c98b90c..9c7b351 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java @@ -31,35 +31,20 @@ import static org.nuiton.i18n.I18n.n; */ public enum IndividualMeasurementStrategy implements I18nAble { - /** - * Taille, poids » et « » - */ - SIZE_WEIGHT(n("IndividualMeasurementStrategy.SIZE_WEIGHT")), - - /** - * Taille, poids, sexe - */ - SIZE_WEIGHT_SEX(n("IndividualMeasurementStrategy.SIZE_WEIGHT_SEX")), - - /** - * Taille, poids, âge - */ - SIZE_WEIGHT_AGE(n("IndividualMeasurementStrategy.SIZE_WEIGHT_AGE")), - - /** - * Taille, poids, sexe, maturité - */ - SIZE_WEIGHT_SEX_MATURITY(n("IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY")), - - /** - * Taille, poids, sexe, âge - */ - SIZE_WEIGHT_SEX_AGE(n("IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_AGE")), - - /** - * Taille, poids, sexe, maturité, âge - */ - SIZE_WEIGHT_SEX_MATURITY_AGE(n("IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY_AGE")); + WEIGHT_AGE(n("IndividualMeasurementStrategy.WEIGHT_AGE")), + WEIGHT_SIZE(n("IndividualMeasurementStrategy.WEIGHT_SIZE")), + WEIGHT_SIZE_AGE(n("IndividualMeasurementStrategy.WEIGHT_SIZE_AGE")), + WEIGHT_SIZE_MATURITY(n("IndividualMeasurementStrategy.WEIGHT_SIZE_MATURITY")), + WEIGHT_SIZE_SEX(n("IndividualMeasurementStrategy.WEIGHT_SIZE_SEX")), + WEIGHT_SIZE_SEX_AGE(n("IndividualMeasurementStrategy.WEIGHT_SIZE_SEX_AGE")), + WEIGHT_SIZE_SEX_MATURITY(n("IndividualMeasurementStrategy.WEIGHT_SIZE_SEX_MATURITY")), + WEIGHT_SIZE_SEX_MATURITY_AGE(n("IndividualMeasurementStrategy.WEIGHT_SIZE_SEX_MATURITY_AGE")), + SIZE_AGE(n("IndividualMeasurementStrategy.SIZE_AGE")), + SIZE_MATURITY(n("IndividualMeasurementStrategy.SIZE_MATURITY")), + SIZE_SEX(n("IndividualMeasurementStrategy.SIZE_SEX")), + SIZE_SEX_AGE(n("IndividualMeasurementStrategy.SIZE_SEX_AGE")), + SIZE_SEX_MATURITY(n("IndividualMeasurementStrategy.SIZE_SEX_MATURITY")), + SIZE_SEX_MATURITY_AGE(n("IndividualMeasurementStrategy.SIZE_SEX_MATURITY_AGE")); protected String i18nKey; diff --git a/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties b/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties index 9683525..5fada76 100644 --- a/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties +++ b/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties @@ -21,12 +21,20 @@ GlobalIndicatorValue.GOOD=Level 1 bonus GlobalIndicatorValue.NEUTRAL=Conform GlobalIndicatorValue.VERY_BAD=Level 2 penalty GlobalIndicatorValue.VERY_GOOD=Level 2 bonus -IndividualMeasurementStrategy.SIZE_WEIGHT=Size/Weight -IndividualMeasurementStrategy.SIZE_WEIGHT_AGE=Size/Weight/Age -IndividualMeasurementStrategy.SIZE_WEIGHT_SEX=Size/Weight/Sex -IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_AGE=Size/Weight/Sex/Age -IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY=Size/Weight/Sex/Maturity -IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY_AGE=Size/Weight/Sex/Maturity/Age +IndividualMeasurementStrategy.SIZE_AGE=Size/Age +IndividualMeasurementStrategy.SIZE_MATURITY=Size/Maturity +IndividualMeasurementStrategy.SIZE_SEX=Size/Sex +IndividualMeasurementStrategy.SIZE_SEX_AGE=Size/Sex/Age +IndividualMeasurementStrategy.SIZE_SEX_MATURITY=Size/Sex/Maturity +IndividualMeasurementStrategy.SIZE_SEX_MATURITY_AGE=Size/Sex/Maturity/Age +IndividualMeasurementStrategy.WEIGHT_AGE=Weight/Age +IndividualMeasurementStrategy.WEIGHT_SIZE=Weight/Size +IndividualMeasurementStrategy.WEIGHT_SIZE_AGE=Weight/Size/Age +IndividualMeasurementStrategy.WEIGHT_SIZE_MATURITY=Weight/Size/Maturity +IndividualMeasurementStrategy.WEIGHT_SIZE_SEX=Weight/Size/Sex +IndividualMeasurementStrategy.WEIGHT_SIZE_SEX_AGE=Weight/Size/Sex/Age +IndividualMeasurementStrategy.WEIGHT_SIZE_SEX_MATURITY=Weight/Size/Sex/Maturity +IndividualMeasurementStrategy.WEIGHT_SIZE_SEX_MATURITY_AGE=Weight/Size/Sex/Maturity/Age LocationType.AUCTION=Auction LocationType.DISTRICT=District LocationType.PORT=Port diff --git a/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties b/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties index 24e763a..6678f5a 100644 --- a/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties +++ b/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties @@ -21,12 +21,20 @@ GlobalIndicatorValue.GOOD=Bonus de niveau 1 GlobalIndicatorValue.NEUTRAL=Conforme au cahier des charges GlobalIndicatorValue.VERY_BAD=Pénalité de niveau 2 GlobalIndicatorValue.VERY_GOOD=Bonus de niveau 2 -IndividualMeasurementStrategy.SIZE_WEIGHT=Poids/Taille -IndividualMeasurementStrategy.SIZE_WEIGHT_AGE=Poids/Taille/Âge -IndividualMeasurementStrategy.SIZE_WEIGHT_SEX=Poids/Taille/Sexe -IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_AGE=Poids/Taille/Sexe/Âge -IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY=Poids/Taille/Sexe/Maturité -IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY_AGE=Poids/Taille/Sexe/Maturité/Âge +IndividualMeasurementStrategy.SIZE_AGE=Taille/Âge +IndividualMeasurementStrategy.SIZE_MATURITY=Taille/Maturité +IndividualMeasurementStrategy.SIZE_SEX=Taille/Sexe +IndividualMeasurementStrategy.SIZE_SEX_AGE=Taille/Sexe/Âge +IndividualMeasurementStrategy.SIZE_SEX_MATURITY=Taille/Sexe/Maturité +IndividualMeasurementStrategy.SIZE_SEX_MATURITY_AGE=Taille/Sexe/Maturité/Âge +IndividualMeasurementStrategy.WEIGHT_AGE=Poids/Âge +IndividualMeasurementStrategy.WEIGHT_SIZE=Poids/Taille +IndividualMeasurementStrategy.WEIGHT_SIZE_AGE=Poids/Taille/Âge +IndividualMeasurementStrategy.WEIGHT_SIZE_MATURITY=Poids/Taille/Maturité +IndividualMeasurementStrategy.WEIGHT_SIZE_SEX=Poids/Taille/Sexe +IndividualMeasurementStrategy.WEIGHT_SIZE_SEX_AGE=Poids/Taille/Sexe/Âge +IndividualMeasurementStrategy.WEIGHT_SIZE_SEX_MATURITY=Poids/Taille/Sexe/Maturité +IndividualMeasurementStrategy.WEIGHT_SIZE_SEX_MATURITY_AGE=Poids/Taille/Sexe/Maturité/Âge LocationType.AUCTION=Criée LocationType.DISTRICT=Quartier maritime LocationType.PORT=Port -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm