branch feature/8490_i18n_manquantes created (now 99791e4)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8490_i18n_manquantes in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git at 99791e4 Corrige les chaines i18n manquantes dans les messages d'information This branch includes the following new commits: new 99791e4 Corrige les chaines i18n manquantes dans les messages d'information 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 99791e4489d948209080ea1039cb851551941027 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Fri Sep 2 10:56:55 2016 +0200 Corrige les chaines i18n manquantes dans les messages d'information refs #8490 -- 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/8490_i18n_manquantes in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 99791e4489d948209080ea1039cb851551941027 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Fri Sep 2 10:56:55 2016 +0200 Corrige les chaines i18n manquantes dans les messages d'information refs #8490 --- .../swing/decoration/DecoratorService.java | 1 + .../application-swing-decoration_en_GB.properties | 1 + .../application-swing-decoration_es_ES.properties | 1 + .../application-swing-decoration_fr_FR.properties | 1 + .../seine/ActivitySeineObservedSystemUIHandler.java | 20 +++++++++++++++----- ...tingObjectTransmittingBuoyOperationUIHandler.java | 12 ++++++++---- .../ui/content/table/ContentTableUIHandler.java | 13 +++++++++++-- .../longline/GearUseFeaturesLonglineUIHandler.java | 16 ++++++---------- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 14 +++++--------- 9 files changed, 49 insertions(+), 30 deletions(-) diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java index fa95e5f..0469879 100644 --- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java +++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java @@ -324,6 +324,7 @@ public class DecoratorService extends DecoratorProvider { n("observe.common.weightMeasure"); n("observe.common.gearUseFeaturesSeine"); n("observe.common.gearUseFeaturesLongline"); + n("observe.common.longlineDetailComposition"); n("observe.common.vesselSizeCategory"); n("observe.common.harbour"); diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties index 82f1dc1..2e4b9bf 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties @@ -50,6 +50,7 @@ observe.common.lightsticksColor=Lightsticks color observe.common.lightsticksType=Lightsticks type observe.common.lineType=Line type observe.common.locode=Locode +observe.common.longlineDetailComposition=Detailed composition observe.common.maturityStatus=Maturity status observe.common.mitigationType=Mitigation type observe.common.name=Name diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties index ec4bce4..5c02e58 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties @@ -50,6 +50,7 @@ observe.common.lightsticksColor=Color de barrita de luz observe.common.lightsticksType=Tipo de barrita de luz observe.common.lineType=Tipo de línea observe.common.locode=Locode +observe.common.longlineDetailComposition=Composición detallada observe.common.maturityStatus=Maturidad observe.common.mitigationType=Tipo de medida de atenuación observe.common.name=Nombre diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties index ac5769e..bc3e52e 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties @@ -50,6 +50,7 @@ observe.common.lightsticksColor=Couleur de baton lumineux observe.common.lightsticksType=Type de baton lumineux observe.common.lineType=Type de ligne observe.common.locode=Locode +observe.common.longlineDetailComposition=Composition détaillée observe.common.maturityStatus=Maturité observe.common.mitigationType=Type de mesure d'atténuation observe.common.name=Nom diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java index 8c059b0..006cf54 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java @@ -23,17 +23,19 @@ package fr.ird.observe.application.swing.ui.content.impl.seine; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; +import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.ui.content.ContentMode; +import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.services.dto.Form; -import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.result.SaveResultDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDtos; import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; -import fr.ird.observe.application.swing.ui.content.ContentMode; -import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.validator.NuitonValidatorScope; import static org.nuiton.i18n.I18n.t; @@ -70,7 +72,10 @@ public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<Activ } // activity courante non ouverte - addInfoMessage(t("observe.storage.activitySeine.message.not.open")); + addMessage(getUi(), + NuitonValidatorScope.INFO, + getEntityLabel(ActivitySeineDto.class), + t("observe.storage.activitySeine.message.not.open")); return ContentMode.READ; } @@ -103,7 +108,12 @@ public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<Activ @Override public void startEditUI(String... binding) { - addInfoMessage(t("observe.storage.activitySeine.message.updating")); + + addMessage(getUi(), + NuitonValidatorScope.INFO, + getEntityLabel(ActivitySeineDto.class), + t("observe.storage.activitySeine.message.updating")); + super.startEditUI(binding); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index f7b67cf..64ae47e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -26,6 +26,9 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.ui.UIHelper; +import fr.ird.observe.application.swing.ui.content.ContentMode; +import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.constants.seine.Ownership; import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation; @@ -33,14 +36,12 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDtos; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDtos; import fr.ird.observe.services.service.seine.TransmittingBuoyOperationService; -import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.application.swing.ui.content.ContentMode; -import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; @@ -173,7 +174,10 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH FloatingObjectTransmittingBuoyOperationUI ui = getUi(); - addInfoMessage(t("observe.message.updating.floatingObject")); + addMessage(getUi(), + NuitonValidatorScope.INFO, + getEntityLabel(FloatingObjectDto.class), + t("observe.message.updating.floatingObject")); Collection<TransmittingBuoyDto> balises = getBean().getTransmittingBuoy(); if (balises != null && !balises.isEmpty()) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java index 53c43c9..0156e14 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java @@ -26,9 +26,11 @@ import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; @@ -107,11 +109,18 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex if (dataContext.isSelectedActivityLongline()) { - addInfoMessage(t("observe.storage.activityLongline.message.not.open")); + // l'activité n'est pas ouverte, mode lecture + addMessage(getUi(), + NuitonValidatorScope.INFO, + getEntityLabel(ActivityLonglineDto.class), + t("observe.storage.activityLongline.message.not.open")); } else { - addInfoMessage(t("observe.storage.activitySeine.message.not.open")); + addMessage(getUi(), + NuitonValidatorScope.INFO, + getEntityLabel(ActivitySeineDto.class), + t("observe.storage.activitySeine.message.not.open")); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 9aa66e7..1c50440 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -31,6 +31,7 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDtos; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; @@ -410,17 +411,12 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip return ContentMode.UPDATE; } - // mode lecture + // mode lecture : la marée n'est pas ouverte - if (dataContext.isSelectedTripLongline()) { - - addInfoMessage(t("observe.content.tripLongline.message.not.open")); - - } else { - - addInfoMessage(t("observe.content.tripLongline.message.not.open")); - - } + addMessage(getUi(), + NuitonValidatorScope.INFO, + getEntityLabel(TripLonglineDto.class), + t("observe.content.tripLongline.message.not.open")); return ContentMode.READ; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 861c5c6..554f173 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -36,6 +36,7 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDtos; import fr.ird.observe.services.service.ReferentialService; @@ -409,15 +410,10 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei // mode lecture - if (dataContext.isSelectedTripLongline()) { - - addInfoMessage(t("observe.content.tripLongline.message.not.open")); - - } else { - - addInfoMessage(t("observe.content.tripSeine.message.not.open")); - - } + addMessage(getUi(), + NuitonValidatorScope.INFO, + getEntityLabel(TripSeineDto.class), + t("observe.content.tripSeine.message.not.open")); return ContentMode.READ; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm