branch develop updated (5b554cb -> dfd5d32)
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 5b554cb On renomme la colonne « Zone de pêche » du plan en « Division » pour correspondre avec les filtres (testable-client #6679) new 6c353e5 Manque un espace dans le filtre espèce entre le nom latin et la parenthèse (testable-client #6680) new dfd5d32 Erreur de frappe dans le choix des paramètres à mesurer (testable-client #6681) The 2 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 dfd5d324107dbf2987043a07b139119356acee5e Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Feb 18 14:49:19 2015 +0100 Erreur de frappe dans le choix des paramètres à mesurer (testable-client #6681) commit 6c353e568e98dfe123945670322e9465352b8253 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Feb 18 14:48:00 2015 +0100 Manque un espace dans le filtre espèce entre le nom latin et la parenthèse (testable-client #6680) Summary of changes: .../src/main/resources/i18n/wao-persistence_fr_FR.properties | 2 +- .../java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java | 2 +- 2 files changed, 2 insertions(+), 2 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 6c353e568e98dfe123945670322e9465352b8253 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Feb 18 14:48:00 2015 +0100 Manque un espace dans le filtre espèce entre le nom latin et la parenthèse (testable-client #6680) --- .../java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java index 4bad269..74b8ae8 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java @@ -159,7 +159,7 @@ public class SampleRowsFilterValues extends AbstractFilterValues { species.add( FilterOption.forValueAndLabel( sampleRow.getSpecies().getTopiaId(), - sampleRow.getSpecies().getScientificName() + "(" + sampleRow.getSpecies().getVernacularName() + ")" + sampleRow.getSpecies().getScientificName() + " (" + sampleRow.getSpecies().getVernacularName() + ")" ) ); } -- 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 dfd5d324107dbf2987043a07b139119356acee5e Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Feb 18 14:49:19 2015 +0100 Erreur de frappe dans le choix des paramètres à mesurer (testable-client #6681) --- .../src/main/resources/i18n/wao-persistence_fr_FR.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bbdbde3..24e763a 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,7 +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_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 LocationType.AUCTION=Criée -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm