Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 7f028ae1 by tchemit at 2019-02-13T13:15:01Z [PS] Libellé échantillon faune associée - Closes #1220 - - - - - a4a2eb7f by tchemit at 2019-02-13T13:22:16Z [PS] Le formulaire bonnes pratiques de remise à l'eau ne s'ouvre pas - Closes #1221 - - - - - 4 changed files: - dto/src/main/java/fr/ird/observe/dto/referential/SpeciesGroupHelper.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== dto/src/main/java/fr/ird/observe/dto/referential/SpeciesGroupHelper.java ===================================== @@ -28,9 +28,9 @@ import java.util.List; public class SpeciesGroupHelper extends GeneratedSpeciesGroupHelper { //FIXME PROTECTED-ID public static final List<String> SPECIES_GROUP_IDS = Arrays.asList( - "fr.ird.referential.common.SpeciesGroup#1445863056144#0.9820877553253712", - "fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461", - "fr.ird.referential.common.SpeciesGroup#1446014286433#0.6480183366605247", - "fr.ird.referential.common.SpeciesGroup#1239832683689#0.7120116158620075" + "fr.ird.observe.entities.referentiel.SpeciesGroup#1445863056144#0.9820877553253712", + "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461", + "fr.ird.observe.entities.referentiel.SpeciesGroup#1446014286433#0.6480183366605247", + "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075" ); } ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -916,14 +916,14 @@ observe.common.NonTargetCatchReleasingTimeDto.type=Releasing time observe.common.NonTargetCatchReleasingTimeDto.types=Releasing time observe.common.NonTargetLengthDto.comment=Non target sample comment observe.common.NonTargetLengthDto.count=Count -observe.common.NonTargetLengthDto.length=Length +observe.common.NonTargetLengthDto.length=Length (cm) observe.common.NonTargetLengthDto.picturesReferences=Pictures references observe.common.NonTargetLengthDto.table.count=Count observe.common.NonTargetLengthDto.table.count.tip=Count observe.common.NonTargetLengthDto.table.gender=Sex observe.common.NonTargetLengthDto.table.gender.tip=Sex observe.common.NonTargetLengthDto.table.length=Length -observe.common.NonTargetLengthDto.table.length.tip=Length +observe.common.NonTargetLengthDto.table.length.tip=Length (cm) observe.common.NonTargetLengthDto.table.meanWeight=Indiv. Weight observe.common.NonTargetLengthDto.table.meanWeight.tip=Individual weight (en Kg) observe.common.NonTargetLengthDto.table.nonTargetSpecies=Species ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -916,14 +916,14 @@ observe.common.NonTargetCatchReleasingTimeDto.type=Hora de liberación de fauna observe.common.NonTargetCatchReleasingTimeDto.types=Horas de liberación de fauna accesoria observe.common.NonTargetLengthDto.comment=Comentarios sobre el muestreo de fauna accesoria observe.common.NonTargetLengthDto.count=Número -observe.common.NonTargetLengthDto.length=Talla +observe.common.NonTargetLengthDto.length=Talla (cm) observe.common.NonTargetLengthDto.picturesReferences=Referencia foto observe.common.NonTargetLengthDto.table.count=Número observe.common.NonTargetLengthDto.table.count.tip=Número de ejemplares medidos observe.common.NonTargetLengthDto.table.gender=Sexo observe.common.NonTargetLengthDto.table.gender.tip=Sexo observe.common.NonTargetLengthDto.table.length=Talla -observe.common.NonTargetLengthDto.table.length.tip=Talla +observe.common.NonTargetLengthDto.table.length.tip=Talla (cm) observe.common.NonTargetLengthDto.table.meanWeight=Peso indiv. observe.common.NonTargetLengthDto.table.meanWeight.tip=Peso del individuo (en Kg) observe.common.NonTargetLengthDto.table.nonTargetSpecies=Especie ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -916,14 +916,14 @@ observe.common.NonTargetCatchReleasingTimeDto.type=Moment de la libération observe.common.NonTargetCatchReleasingTimeDto.types=Moments de la libération observe.common.NonTargetLengthDto.comment=Commentaire de l’échantillonnage faune observe.common.NonTargetLengthDto.count=Nombre -observe.common.NonTargetLengthDto.length=Longueur hors tout +observe.common.NonTargetLengthDto.length=Taille (cm) observe.common.NonTargetLengthDto.picturesReferences=Référence photo observe.common.NonTargetLengthDto.table.count=Effectif observe.common.NonTargetLengthDto.table.count.tip=Effectif observe.common.NonTargetLengthDto.table.gender=Sexe observe.common.NonTargetLengthDto.table.gender.tip=Sexe -observe.common.NonTargetLengthDto.table.length=Longueur -observe.common.NonTargetLengthDto.table.length.tip=Longueur +observe.common.NonTargetLengthDto.table.length=Taille +observe.common.NonTargetLengthDto.table.length.tip=Taille (cm) observe.common.NonTargetLengthDto.table.meanWeight=Poids ind. observe.common.NonTargetLengthDto.table.meanWeight.tip=Poids individuel (en Kg) observe.common.NonTargetLengthDto.table.nonTargetSpecies=Espèce faune View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/151466957f6198fd50143568d01... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/151466957f6198fd50143568d01... You're receiving this email because of your account on gitlab.com.