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 f7553a4dd063dcef05803c0a9e3d838af2412bc8 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Feb 10 16:37:40 2015 +0100 Ajout d'une stratégie d'échantillonnage Poids/Taille/Sexe/Age (termine #6645) --- .../java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java | 5 +++++ .../src/main/resources/i18n/wao-persistence_en_GB.properties | 1 + .../src/main/resources/i18n/wao-persistence_fr_FR.properties | 1 + 3 files changed, 7 insertions(+) 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 1e38c23..c98b90c 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 @@ -52,6 +52,11 @@ public enum IndividualMeasurementStrategy implements I18nAble { 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")); 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 bfda578..9683525 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 @@ -24,6 +24,7 @@ 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 LocationType.AUCTION=Auction 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 20646d7..bbdbde3 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 @@ -24,6 +24,7 @@ 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/Sex/Âge IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY=Poids/Taille/Sexe/Maturité IndividualMeasurementStrategy.SIZE_WEIGHT_SEX_MATURITY_AGE=Poids/Taille/Sexe/Maturité/Âge LocationType.AUCTION=Criée -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.