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 1699f4a753c23f63b7ee00a1aa8059cc6d760bef Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 14:50:13 2016 +0200 Correction du type d'objet dans la popup des combobox de référentiels + ajout traduction manquante --- .../observe/application/swing/decoration/DecoratorService.java | 1 + .../i18n/observe-application-swing-decoration_en_GB.properties | 1 + .../i18n/observe-application-swing-decoration_es_ES.properties | 1 + .../i18n/observe-application-swing-decoration_fr_FR.properties | 1 + .../main/java/fr/ird/observe/ui/content/ContentUIInitializer.java | 8 +++++--- .../resources/i18n/observe-application-swing_en_GB.properties | 1 + .../resources/i18n/observe-application-swing_es_ES.properties | 1 + .../resources/i18n/observe-application-swing_fr_FR.properties | 1 + 8 files changed, 12 insertions(+), 3 deletions(-) diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java index 0706a18..3ce63d7 100644 --- a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java @@ -287,6 +287,7 @@ public class DecoratorService extends DecoratorProvider { n("observe.common.species/scientificLabel"); n("observe.common.observerLabel"); + n("observe.common.label"); n("observe.common.targetSample"); diff --git a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_en_GB.properties b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_en_GB.properties index 984194c..7400508 100644 --- a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_en_GB.properties +++ b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_en_GB.properties @@ -42,6 +42,7 @@ observe.common.id= observe.common.inconnu= observe.common.itemHorizontalPosition= observe.common.itemVerticalPosition= +observe.common.label= observe.common.lengthWeightFormula= observe.common.lengthWeightParameter= observe.common.lightsticksColor= diff --git a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_es_ES.properties b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_es_ES.properties index 1e81127..b82dc63 100644 --- a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_es_ES.properties +++ b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_es_ES.properties @@ -42,6 +42,7 @@ observe.common.id= observe.common.inconnu= observe.common.itemHorizontalPosition= observe.common.itemVerticalPosition= +observe.common.label= observe.common.lengthWeightFormula=Relación de peso observe.common.lengthWeightParameter= observe.common.lightsticksColor= diff --git a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_fr_FR.properties b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_fr_FR.properties index 78be28e..9dc2fca 100644 --- a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_fr_FR.properties +++ b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_fr_FR.properties @@ -42,6 +42,7 @@ observe.common.id=Identifiant observe.common.inconnu=inconnu observe.common.itemHorizontalPosition=Localisation de l'élément sur la ligne mère observe.common.itemVerticalPosition=Localisation de l'élément sur l'avançon +observe.common.label=Libellé observe.common.lengthWeightFormula=Relation Poids observe.common.lengthWeightParameter=Relation Taille-Poids observe.common.lightsticksColor=Couleur de baton lumineux diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index ce76f29..245bdb0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -25,6 +25,9 @@ package fr.ird.observe.ui.content; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.decoration.DecoratorService; +import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; @@ -33,11 +36,8 @@ import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.util.I18nEnumUtil; -import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.ui.actions.shared.AbstractUIAction; import fr.ird.observe.ui.util.BooleanEditor; -import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; -import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.ui.util.tripMap.ObserveMapPane; import fr.ird.observe.validation.ObserveSwingValidator; import jaxx.runtime.JAXXValidator; @@ -723,6 +723,8 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E ReferentialReferenceDecorator<D> decorator = decoratorService.getReferentialReferenceDecorator(dtoClass); + String entityLabel = t(DecoratorService.getEntityLabel(dtoClass)); + comboBox.setPopupTitleText(t("observe.content.referentialType", entityLabel)); comboBox.init(decorator, Collections.emptyList()); JComboBox<ReferentialReference<D>> combobox = comboBox.getCombobox(); diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 5e8bbc0..5518f59 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -1493,6 +1493,7 @@ observe.content.objectObservedSpecies.table.speciesStatus.tip= observe.content.person.country=Nationality observe.content.program.tab.general=General caracteristics observe.content.program.tab.observations=Observations +observe.content.referentialType= observe.content.route.message.active.found= observe.content.route.message.active.found.for.other.trip= observe.content.route.message.creating= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 99f684d..1c47f5d 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -1493,6 +1493,7 @@ observe.content.objectObservedSpecies.table.speciesStatus.tip=Estado observe.content.person.country=Nacionalidad observe.content.program.tab.general= observe.content.program.tab.observations= +observe.content.referentialType= observe.content.route.message.active.found=Ruta abierta. observe.content.route.message.active.found.for.other.trip=Existe una ruta abierta en otra marea. observe.content.route.message.creating=Ruta en proceso de creación. diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index f49c02a..ed1062f 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1493,6 +1493,7 @@ observe.content.objectObservedSpecies.table.speciesStatus.tip=Statut Espèce observe.content.person.country=Nationalité observe.content.program.tab.general=Caractértistiques générales observe.content.program.tab.observations=Observations +observe.content.referentialType=<html><body>Référentiel <i>%s</i> observe.content.route.message.active.found=Une route est ouverte. observe.content.route.message.active.found.for.other.trip=Une route ouverte existe dans une autre marée. observe.content.route.message.creating=La route est en cours de création. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.