This is an automated email from the git hooks/post-receive script. New change to branch feature/7531_Corrige_i18n_manquantes in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from a4e435b Ajout de la chaine observe.common.label new 3ea0fbb Sépare les chaines d'avertissement concernant l'équipement non saisi pour une marée (message distinct senne/palangre) 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 3ea0fbbcc672c3430a1ec7bf950be2806c3fba2c Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Aug 16 10:05:29 2016 +0200 Sépare les chaines d'avertissement concernant l'équipement non saisi pour une marée (message distinct senne/palangre) refs #7531 Summary of changes: .../longline/TripLonglineGearUseDto-n1-update-warning-validation.xml | 2 +- .../dto/seine/TripSeineGearUseDto-n1-update-warning-validation.xml | 2 +- .../i18n/observe-application-swing-validation_en_GB.properties | 3 ++- .../i18n/observe-application-swing-validation_es_ES.properties | 3 ++- .../i18n/observe-application-swing-validation_fr_FR.properties | 3 ++- .../resources/i18n/observe-services-topia-validation_en_GB.properties | 3 ++- .../resources/i18n/observe-services-topia-validation_es_ES.properties | 3 ++- .../resources/i18n/observe-services-topia-validation_fr_FR.properties | 3 ++- 8 files changed, 14 insertions(+), 8 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 feature/7531_Corrige_i18n_manquantes in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 3ea0fbbcc672c3430a1ec7bf950be2806c3fba2c Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Aug 16 10:05:29 2016 +0200 Sépare les chaines d'avertissement concernant l'équipement non saisi pour une marée (message distinct senne/palangre) refs #7531 --- .../longline/TripLonglineGearUseDto-n1-update-warning-validation.xml | 2 +- .../dto/seine/TripSeineGearUseDto-n1-update-warning-validation.xml | 2 +- .../i18n/observe-application-swing-validation_en_GB.properties | 3 ++- .../i18n/observe-application-swing-validation_es_ES.properties | 3 ++- .../i18n/observe-application-swing-validation_fr_FR.properties | 3 ++- .../resources/i18n/observe-services-topia-validation_en_GB.properties | 3 ++- .../resources/i18n/observe-services-topia-validation_es_ES.properties | 3 ++- .../resources/i18n/observe-services-topia-validation_fr_FR.properties | 3 ++- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-n1-update-warning-validation.xml index 53a81cd..45898e8 100644 --- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-n1-update-warning-validation.xml +++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/TripLonglineGearUseDto-n1-update-warning-validation.xml @@ -33,7 +33,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/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-n1-update-warning-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-n1-update-warning-validation.xml index b973dd2..96c5e2f 100644 --- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-n1-update-warning-validation.xml +++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TripSeineGearUseDto-n1-update-warning-validation.xml @@ -33,7 +33,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/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_en_GB.properties b/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_en_GB.properties index 5e32e4c..561bd27 100644 --- a/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_en_GB.properties +++ b/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_en_GB.properties @@ -376,7 +376,8 @@ validator.ui.trip.invalid.startDate= validator.ui.trip.null.captain= validator.ui.trip.null.dataEntryOperator= validator.ui.trip.null.departureHarbour= -validator.ui.trip.null.gearUseFeature= +validator.ui.trip.null.gearUseFeatureLongline= +validator.ui.trip.null.gearUseFeatureSeine= validator.ui.trip.null.landingHarbour= validator.ui.trip.required.comment.for.captain= validator.ui.trip.required.comment.for.dataEntryOperator= diff --git a/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_es_ES.properties b/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_es_ES.properties index 067f746..b292fdb 100644 --- a/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_es_ES.properties +++ b/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_es_ES.properties @@ -376,7 +376,8 @@ validator.ui.trip.invalid.startDate=La fecha de comienzo de marea debe ser infer validator.ui.trip.null.captain= validator.ui.trip.null.dataEntryOperator= validator.ui.trip.null.departureHarbour= -validator.ui.trip.null.gearUseFeature= +validator.ui.trip.null.gearUseFeatureLongline= +validator.ui.trip.null.gearUseFeatureSeine= validator.ui.trip.null.landingHarbour= validator.ui.trip.required.comment.for.captain= validator.ui.trip.required.comment.for.dataEntryOperator= diff --git a/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_fr_FR.properties b/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_fr_FR.properties index d3f0df0..99ff07f 100644 --- a/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_fr_FR.properties +++ b/observe-application-swing-validation/src/main/resources/i18n/observe-application-swing-validation_fr_FR.properties @@ -376,7 +376,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/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_en_GB.properties b/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_en_GB.properties index 1419895..2412741 100644 --- a/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_en_GB.properties +++ b/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_en_GB.properties @@ -366,7 +366,8 @@ validator.service.trip.invalid.startDate= validator.service.trip.null.captain= validator.service.trip.null.dataEntryOperator= validator.service.trip.null.departureHarbour= -validator.service.trip.null.gearUseFeature= +validator.service.trip.null.gearUseFeatureLongline= +validator.service.trip.null.gearUseFeatureSeine= validator.service.trip.null.landingHarbour= validator.service.trip.required.comment.for.captain= validator.service.trip.required.comment.for.dataEntryOperator= diff --git a/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_es_ES.properties b/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_es_ES.properties index 6e5a1c2..15fe20b 100644 --- a/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_es_ES.properties +++ b/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_es_ES.properties @@ -366,7 +366,8 @@ validator.service.trip.invalid.startDate=La fecha de comienzo de marea debe ser validator.service.trip.null.captain= validator.service.trip.null.dataEntryOperator= validator.service.trip.null.departureHarbour= -validator.service.trip.null.gearUseFeature= +validator.service.trip.null.gearUseFeatureLongline= +validator.service.trip.null.gearUseFeatureSeine= validator.service.trip.null.landingHarbour= validator.service.trip.required.comment.for.captain= validator.service.trip.required.comment.for.dataEntryOperator= diff --git a/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_fr_FR.properties b/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_fr_FR.properties index 1a75691..a8f8498 100644 --- a/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_fr_FR.properties +++ b/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_fr_FR.properties @@ -366,7 +366,8 @@ 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.gearUseFeatureLongline=Vous n'avez pas saisi d'équipement. +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>.
participants (1)
-
codelutin.com scm