This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c91164968e5c373c343e1c26357e812148df7f3f Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Thu Sep 1 18:27:12 2016 +0200 Sépare les message d'avertissment concernant l'équipement non renseigné entre senne et palangre --- .../longline/TripLonglineGearUseDto-ui-update-warning-validation.xml | 2 +- .../dto/seine/TripSeineGearUseDto-ui-update-warning-validation.xml | 2 +- .../main/resources/i18n/application-swing-validation_en_GB.properties | 3 ++- .../main/resources/i18n/application-swing-validation_es_ES.properties | 3 ++- .../main/resources/i18n/application-swing-validation_fr_FR.properties | 3 ++- .../seine/TripSeine-service-gearUseFeatures-warning-validation.xml | 2 +- .../src/main/resources/i18n/services-topia-validation_en_GB.properties | 2 +- .../src/main/resources/i18n/services-topia-validation_es_ES.properties | 2 +- .../src/main/resources/i18n/services-topia-validation_fr_FR.properties | 2 +- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-ui-update-warning-validation.xml index 53a90db..4b2bd9c 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-ui-update-warning-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-ui-update-warning-validation.xml @@ -31,7 +31,7 @@ <param name="expression"> <![CDATA[ gearUseFeaturesLongline != null && !gearUseFeaturesLongline.empty ]]> </param> - <message>validator.ui.trip.null.gearUseFeature</message> + <message>validator.ui.trip.null.gearUseFeatureLongline</message> </field-validator> </field> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-ui-update-warning-validation.xml index ac33a4e..c08b74f 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-ui-update-warning-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-ui-update-warning-validation.xml @@ -31,7 +31,7 @@ <param name="expression"> <![CDATA[ gearUseFeaturesSeine != null && !gearUseFeaturesSeine.empty ]]> </param> - <message>validator.ui.trip.null.gearUseFeature</message> + <message>validator.ui.trip.null.gearUseFeatureSeine</message> </field-validator> </field> diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties index bafba3e..d723326 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties @@ -572,7 +572,8 @@ validator.ui.trip.invalid.startDate=Start date of the trip must be before route validator.ui.trip.null.captain=Captain is not filled. validator.ui.trip.null.dataEntryOperator=Data entry operator is not filled. validator.ui.trip.null.departureHarbour=Depeature harbour is not filled. -validator.ui.trip.null.gearUseFeature=Gear use feature is not filled. +validator.ui.trip.null.gearUseFeatureLongline=Gear use feature is not filled. +validator.ui.trip.null.gearUseFeatureSeine=Gear use feature is not filled (Seine advised). validator.ui.trip.null.landingHarbour=Landing harbour is not filled. validator.ui.trip.required.comment.for.captain=A comment is required for the selected captain. validator.ui.trip.required.comment.for.dataEntryOperator=A comment is required for the selected data entry operator. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties index a42f520..e22a571 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -572,7 +572,8 @@ validator.ui.trip.invalid.startDate=La fecha de comienzo de marea debe ser infer validator.ui.trip.null.captain=Un capitán debe ser seleccionado. validator.ui.trip.null.dataEntryOperator=Un operador de captación debe ser seleccionado. validator.ui.trip.null.departureHarbour=Un puerto de salida debe ser seleccionado. -validator.ui.trip.null.gearUseFeature=Usted no seleccionó un equipamiento (Senne aconsejado). +validator.ui.trip.null.gearUseFeatureLongline=Usted no seleccionó un equipamiento. +validator.ui.trip.null.gearUseFeatureSeine=Usted no seleccionó un equipamiento (Senne aconsejado). validator.ui.trip.null.landingHarbour=Un puerto de llegada debe ser seleccionado. validator.ui.trip.required.comment.for.captain=Se necesita un comentario para el capitán seleccionado. validator.ui.trip.required.comment.for.dataEntryOperator=Se necesita un comentario para el operador de captación seleccionado. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties index 915935c..c9aa185 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties @@ -572,7 +572,8 @@ validator.ui.trip.invalid.startDate=La date de début de marée doit être infé validator.ui.trip.null.captain=Pas de capitaine sélectionné. validator.ui.trip.null.dataEntryOperator=Pas de saisisseur sélectionné. validator.ui.trip.null.departureHarbour=Pas de port de départ sélectionné. -validator.ui.trip.null.gearUseFeature=Vous n'avez pas saisi d'équipement (Senne conseillée). +validator.ui.trip.null.gearUseFeatureLongline=Vous n'avez pas saisi d'équipement. +validator.ui.trip.null.gearUseFeatureSeine=Vous n'avez pas saisi d'équipement (Senne conseillée). validator.ui.trip.null.landingHarbour=Pas de port d'arrivée sélectionné. validator.ui.trip.required.comment.for.captain=Un commentaire est requis pour le captiaine sélectionné. validator.ui.trip.required.comment.for.dataEntryOperator=Un commentaire est requis pour le saisisseur sélectionné. diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-gearUseFeatures-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-gearUseFeatures-warning-validation.xml index aae2afc..ad43fb2 100644 --- a/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-gearUseFeatures-warning-validation.xml +++ b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-service-gearUseFeatures-warning-validation.xml @@ -31,7 +31,7 @@ <param name="expression"> <![CDATA[ gearUseFeaturesSeine != null && !gearUseFeaturesSeine.empty ]]> </param> - <message>validator.service.trip.null.gearUseFeature</message> + <message>validator.service.trip.null.gearUseFeatureSeine</message> </field-validator> </field> diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties index bf6b58c..bd0b9e7 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties @@ -558,7 +558,7 @@ validator.service.trip.invalid.startDate=Start date of the trip must be before r validator.service.trip.null.captain=Captain is not filled. validator.service.trip.null.dataEntryOperator=Data entry operator is not filled. validator.service.trip.null.departureHarbour=Depeature harbour is not filled. -validator.service.trip.null.gearUseFeature=Gear use feature is not filled. +validator.service.trip.null.gearUseFeatureSeine=Gear use feature is not filled. validator.service.trip.null.landingHarbour=Landing harbour is not filled. validator.service.trip.required.comment.for.captain=A comment is required for the selected captain. validator.service.trip.required.comment.for.dataEntryOperator=A comment is required for the selected data entry operator. diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties index 0fefd65..df3d337 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties @@ -558,7 +558,7 @@ validator.service.trip.invalid.startDate=La fecha de comienzo de marea debe ser validator.service.trip.null.captain=Un capitán debe ser seleccionado. validator.service.trip.null.dataEntryOperator=Un operador de captación debe ser seleccionado. validator.service.trip.null.departureHarbour=Un puerto de salida debe ser seleccionado. -validator.service.trip.null.gearUseFeature=Usted no seleccionó un equipamiento (Senne aconsejado). +validator.service.trip.null.gearUseFeatureSeine=Usted no seleccionó un equipamiento (Senne aconsejado). validator.service.trip.null.landingHarbour=Un puerto de llegada debe ser seleccionado. validator.service.trip.required.comment.for.captain=Se necesita un comentario para el capitán seleccionado. validator.service.trip.required.comment.for.dataEntryOperator=Se necesita un comentario para el operador de captación seleccionado. diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties index aa1d9cf..60860bb 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties @@ -558,7 +558,7 @@ validator.service.trip.invalid.startDate=La date de début de marée doit être validator.service.trip.null.captain=Pas de capitaine sélectionné. validator.service.trip.null.dataEntryOperator=Pas de saisisseur sélectionné. validator.service.trip.null.departureHarbour=Pas de port de départ sélectionné. -validator.service.trip.null.gearUseFeature=Vous n'avez pas saisi d'équipement (Senne conseillée). +validator.service.trip.null.gearUseFeatureSeine=Vous n'avez pas saisi d'équipement (Senne conseillée). validator.service.trip.null.landingHarbour=Pas de port d'arrivée sélectionné. validator.service.trip.required.comment.for.captain=Un commentaire est requis pour le captiaine sélectionné. validator.service.trip.required.comment.for.dataEntryOperator=Un commentaire est requis pour le saisisseur sélectionné. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.