This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit 689034ba2c39fde6421e8605a9a09369c0ab1df0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:08:31 2015 +0200 ajout d'une validation sur le pays d'un balise --- .../seine/TransmittingBuoy-n1-update-error-validation.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-error-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-error-validation.xml index 5944744..59aaf76 100644 --- a/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-error-validation.xml +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-error-validation.xml @@ -60,4 +60,16 @@ </field> + <field name="country"> + + <!-- country desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ country == null || country.enabled ]]> + </param> + <message>validator.transmittingBuoy.desactivated.country</message> + </field-validator> + + </field> + </validators> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit 260d44f71caf77ed52a45db4040df86cfba3aa75 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:10:18 2015 +0200 correction du calcul des données dans le contexte --- .../main/java/fr/ird/observe/db/DataContext.java | 104 +++++++++++++++++++-- .../ird/observe/db/constants/DataContextType.java | 36 +++---- .../java/fr/ird/observe/entities/Entities.java | 8 ++ 3 files changed, 120 insertions(+), 28 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/db/DataContext.java b/observe-business/src/main/java/fr/ird/observe/db/DataContext.java index b64f10f..378a81b 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/DataContext.java +++ b/observe-business/src/main/java/fr/ird/observe/db/DataContext.java @@ -23,6 +23,7 @@ package fr.ird.observe.db; */ import fr.ird.observe.db.constants.DataContextType; +import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.referentiel.Program; @@ -135,6 +136,15 @@ public class DataContext extends AbstractSerializableBean { return openTripId; } + public String getOpenTripLonglineId() { + return isOpenTripLongline() ? getOpenTripId() : null; + } + + public String getOpenTripSeineId() { + return isOpenTripSeine() ? getOpenTripId() : null; + } + + public void setOpenTripId(String openTripId) { String oldValue = getOpenTripId(); boolean oldValue2 = isOpenTrip(); @@ -159,6 +169,14 @@ public class DataContext extends AbstractSerializableBean { return openActivityId; } + public String getOpenActivityLonglineId() { + return isOpenActivityLongline() ? getOpenActivityId() : null; + } + + public String getOpenActivitySeineId() { + return isOpenActivitySeine() ? getOpenActivityId() : null; + } + public void setOpenActivityId(String openActivityId) { String oldValue = getOpenActivityId(); boolean oldValue2 = isOpenActivity(); @@ -171,6 +189,15 @@ public class DataContext extends AbstractSerializableBean { return openSetId; } + public String getOpenSetLonglineId() { + return isOpenSetLongline() ? getOpenSetId() : null; + } + + public String getOpenSetSeineId() { + return isOpenSetSeine() ? getOpenSetId() : null; + } + + public void setOpenSetId(String openSetId) { String oldValue = getOpenSetId(); boolean oldValue2 = isOpenSet(); @@ -193,6 +220,14 @@ public class DataContext extends AbstractSerializableBean { return selectedTripId; } + public String getSelectedTripLonglineId() { + return isSelectedTripLongline() ? getSelectedTripId() : null; + } + + public String getSelectedTripSeineId() { + return isSelectedTripSeine() ? getSelectedTripId() : null; + } + public void setSelectedTripId(String selectedTripId) { String oldValue = getSelectedTripId(); this.selectedTripId = selectedTripId; @@ -200,7 +235,11 @@ public class DataContext extends AbstractSerializableBean { } public boolean isSelectedTripLongline() { - return selectedTripId != null && selectedTripId.contains("Longline"); + return selectedTripId != null && Entities.isLonglineId(selectedTripId); + } + + public boolean isSelectedTripSeine() { + return selectedTripId != null && Entities.isSeineId(selectedTripId); } public String getSelectedRouteId() { @@ -217,8 +256,20 @@ public class DataContext extends AbstractSerializableBean { return selectedActivityId; } + public String getSelectedActivityLonglineId() { + return isSelectedActivityLongline() ? getSelectedActivityId() : null; + } + + public String getSelectedActivitySeineId() { + return isSelectedActivitySeine() ? getSelectedActivityId() : null; + } + public boolean isSelectedActivityLongline() { - return selectedActivityId != null && selectedActivityId.contains("Longline"); + return selectedActivityId != null && Entities.isLonglineId(selectedActivityId); + } + + public boolean isSelectedActivitySeine() { + return selectedActivityId != null && Entities.isSeineId(selectedActivityId); } public void setSelectedActivityId(String selectedActivityId) { @@ -231,6 +282,14 @@ public class DataContext extends AbstractSerializableBean { return selectedSetId; } + public String getSelectedSetLonglineId() { + return isSelectedActivityLongline() ? getSelectedSetId() : null; + } + + public String getSelectedSetSeineId() { + return isSelectedActivitySeine() ? getSelectedSetId() : null; + } + public void setSelectedSetId(String selectedSetId) { String oldValue = getSelectedSetId(); this.selectedSetId = selectedSetId; @@ -365,10 +424,10 @@ public class DataContext extends AbstractSerializableBean { // on a seine trip if (!TripSeine.class.equals(type) && isOpenRoute()) { ids.add(getOpenRouteId()); - if (!Route.class.equals(type) && isOpenActivity()) { - ids.add(getOpenActivityId()); - if (!ActivitySeine.class.equals(type) && isOpenSet()) { - ids.add(getOpenSetId()); + if (!Route.class.equals(type) && isOpenActivitySeine()) { + ids.add(getOpenActivitySeineId()); + if (!ActivitySeine.class.equals(type) && isOpenSetSeine()) { + ids.add(getOpenSetSeineId()); } } } @@ -376,10 +435,10 @@ public class DataContext extends AbstractSerializableBean { } else { // on a longline trip - if (!TripLongline.class.equals(type) && isOpenActivity()) { - ids.add(getOpenActivityId()); - if (!ActivityLongline.class.equals(type) && isOpenSet()) { - ids.add(getOpenSetId()); + if (!TripLongline.class.equals(type) && isOpenActivityLongline()) { + ids.add(getOpenActivityLonglineId()); + if (!ActivityLongline.class.equals(type) && isOpenSetLongline()) { + ids.add(getOpenSetLonglineId()); } } @@ -403,6 +462,14 @@ public class DataContext extends AbstractSerializableBean { return openTripId != null; } + public boolean isOpenTripLongline() { + return isOpenTrip() && Entities.isLonglineId(openTripId); + } + + public boolean isOpenTripSeine() { + return isOpenTrip() && Entities.isSeineId(openTripId); + } + public boolean isOpenRoute() { return openRouteId != null; } @@ -411,10 +478,27 @@ public class DataContext extends AbstractSerializableBean { return openActivityId != null; } + public boolean isOpenActivityLongline() { + return isOpenActivity() && Entities.isLonglineId(openActivityId); + } + + public boolean isOpenActivitySeine() { + return isOpenActivity() && Entities.isSeineId(openActivityId); + } + + public boolean isOpenSet() { return openSetId != null; } + public boolean isOpenSetLongline() { + return isOpenSet() && Entities.isLonglineId(openSetId); + } + + public boolean isOpenSetSeine() { + return isOpenSet() && Entities.isSeineId(openSetId); + } + public boolean isSelectedOpen(Class<?> type) { for (DataContextType entityType : DataContextType.values()) { diff --git a/observe-business/src/main/java/fr/ird/observe/db/constants/DataContextType.java b/observe-business/src/main/java/fr/ird/observe/db/constants/DataContextType.java index 4c9522b..592b4fc 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/constants/DataContextType.java +++ b/observe-business/src/main/java/fr/ird/observe/db/constants/DataContextType.java @@ -72,12 +72,12 @@ public enum DataContextType { TripSeine(TripSeine.class, DataContext.PROPERTY_OPEN_TRIP) { @Override public boolean isOpen(DataContext context) { - return context.isOpenTrip(); + return context.isOpenTripSeine(); } @Override public String getOpenId(DataContext context) { - return context.getOpenTripId(); + return context.getOpenTripSeineId(); } @Override @@ -87,7 +87,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedTripId(); + return context.getSelectedTripSeineId(); } @Override @@ -99,12 +99,12 @@ public enum DataContextType { TripLongline(TripLongline.class, DataContext.PROPERTY_OPEN_TRIP) { @Override public boolean isOpen(DataContext context) { - return context.isOpenTrip(); + return context.isOpenTripLongline(); } @Override public String getOpenId(DataContext context) { - return context.getOpenTripId(); + return context.getOpenTripLonglineId(); } @Override @@ -114,7 +114,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedTripId(); + return context.getSelectedTripLonglineId(); } @Override @@ -153,12 +153,12 @@ public enum DataContextType { ActivitySeine(ActivitySeine.class, DataContext.PROPERTY_OPEN_ACTIVITY) { @Override public boolean isOpen(DataContext context) { - return context.isOpenActivity(); + return context.isOpenActivityLongline(); } @Override public String getOpenId(DataContext context) { - return context.getOpenActivityId(); + return context.getOpenActivitySeineId(); } @Override @@ -168,7 +168,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedActivityId(); + return context.getSelectedActivitySeineId(); } @Override @@ -180,12 +180,12 @@ public enum DataContextType { ActivityLongline(ActivityLongline.class, DataContext.PROPERTY_OPEN_ACTIVITY) { @Override public boolean isOpen(DataContext context) { - return context.isOpenActivity(); + return context.isOpenActivityLongline(); } @Override public String getOpenId(DataContext context) { - return context.getOpenActivityId(); + return context.getOpenActivityLonglineId(); } @Override @@ -195,7 +195,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedActivityId(); + return context.getSelectedActivityLonglineId(); } @Override @@ -207,12 +207,12 @@ public enum DataContextType { SetSeine(SetSeine.class, DataContext.PROPERTY_OPEN_SET) { @Override public boolean isOpen(DataContext context) { - return context.isOpenSet(); + return context.isOpenSetSeine(); } @Override public String getOpenId(DataContext context) { - return context.getOpenSetId(); + return context.getOpenSetSeineId(); } @Override @@ -222,7 +222,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedSetId(); + return context.getSelectedSetSeineId(); } @Override @@ -234,12 +234,12 @@ public enum DataContextType { SetLongline(SetLongline.class, DataContext.PROPERTY_OPEN_SET) { @Override public boolean isOpen(DataContext context) { - return context.isOpenSet(); + return context.isOpenSetLongline(); } @Override public String getOpenId(DataContext context) { - return context.getOpenSetId(); + return context.getOpenSetLonglineId(); } @Override @@ -249,7 +249,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedSetId(); + return context.getSelectedSetLonglineId(); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java index da63dac..f914e3b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java @@ -351,4 +351,12 @@ public class Entities { } + public static boolean isSeineId(String id) { + return id.contains("Seine"); + } + + public static boolean isLonglineId(String id) { + return id.contains("Longline"); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit 3d4f9474df76450f1330ce36ea6b31489990447d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:14:00 2015 +0200 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation --- .../fr/ird/observe/ui/tree/ObserveTreeBridge.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 31 +++++- .../loadors/ActivityLonglineNodeChildLoador.java | 19 ++-- .../tree/loadors/ActivitySeineNodeChildLoador.java | 12 +-- .../loadors/FloatingObjectNodeChildLoador.java | 18 ++-- .../loadors/ProgramLonglineNodeChildLoador.java | 13 ++- .../tree/loadors/ProgramSeineNodeChildLoador.java | 43 +++++--- .../loadors/ReferenceCommonNodeChildLoador.java | 28 ++++- .../loadors/ReferenceLonglineNodeChildLoador.java | 36 ++++++- .../loadors/ReferenceSeineNodeChildLoador.java | 28 ++++- .../ui/tree/loadors/RootNodeChildLoador.java | 6 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 13 +-- .../tree/loadors/SetLonglineNodeChildLoador.java | 24 ++--- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 22 ++-- .../resources/i18n/observe-swing_en_GB.properties | 115 +++++++++++++++----- .../resources/i18n/observe-swing_es_ES.properties | 118 ++++++++++++++++----- .../resources/i18n/observe-swing_fr_FR.properties | 116 +++++++++++++++----- 17 files changed, 469 insertions(+), 175 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java index 6d44d03..36257a6 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java @@ -83,7 +83,7 @@ public class ObserveTreeBridge extends NavTreeBridge<ObserveNode> { String nodeId = node.getId(); ObserveNode containerNode; - if (nodeId.startsWith("observe.common.")) { + if (nodeId.startsWith(ObserveTreeHelper.TREE_NODE_PREFIX)) { containerNode = node.getParent(); } else { containerNode = node; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java index 961ccfa..0c7b126 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java @@ -22,10 +22,10 @@ package fr.ird.observe.ui.tree; import com.google.common.base.Preconditions; +import fr.ird.observe.DataService; import fr.ird.observe.DecoratorService; import fr.ird.observe.ObserveContext; import fr.ird.observe.db.DataContext; -import fr.ird.observe.DataService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.model.DataSelectionModel; import fr.ird.observe.entities.OpenableEntity; @@ -40,6 +40,7 @@ import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.ui.ObserveMainUI; +import fr.ird.observe.ui.tree.loadors.AbstractNodeChildLoador; import fr.ird.observe.ui.tree.loadors.ActivityLonglineNodeChildLoador; import fr.ird.observe.ui.tree.loadors.ActivityLonglinesNodeChildLoador; import fr.ird.observe.ui.tree.loadors.ActivitySeineNodeChildLoador; @@ -75,6 +76,8 @@ import static org.nuiton.i18n.I18n.n; */ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { + public static final String TREE_NODE_PREFIX = "observe.tree."; + /** Logger. */ static private final Log log = LogFactory.getLog(ObserveTreeHelper.class); @@ -87,6 +90,27 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { super(new ObserveTreeBridge()); } + public static ObserveNode createStringNode(String context) { + + ObserveNode result = createStringNode(context, null); + return result; + + } + + public static <L extends AbstractNodeChildLoador> ObserveNode createStringNode(String context, Class<L> loadorType) { + + L childLoador = loadorType == null ? null : ObserveTreeHelper.getChildLoador(loadorType); + + String propertyLabel = DecoratorService.getPropertyLabel(TREE_NODE_PREFIX, context); + ObserveNode result = new ObserveNode(String.class, + propertyLabel, + context, + childLoador, + false); + return result; + + } + protected DataService getDataService() { if (dataService == null) { dataService = ObserveContext.get().getDataService(); @@ -349,8 +373,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { public ObserveNode addUnsavedNode(ObserveNode parentNode, Class<?> type) { // noeud en mode creation - DecoratorService decorator = getDataService().getDecoratorService(); - String label = decorator.getEntityLabel(type) + ".unsaved"; + String label = DecoratorService.getEntityLabel(TREE_NODE_PREFIX, type) + ".unsaved"; ObserveNode result = new ObserveNode(type, null, label, null, false); insertNode(parentNode, result); @@ -381,7 +404,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { return addRoute(parentNode, (Route) bean); } else if (bean instanceof ActivitySeine) { return addActivity(parentNode, (ActivitySeine) bean); - }else if (bean instanceof ActivityLongline) { + } else if (bean instanceof ActivityLongline) { return addActivity(parentNode, (ActivityLongline) bean); } throw new IllegalStateException("Can not come here!"); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index 4a727ea..9029597 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -47,6 +47,11 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str private static final long serialVersionUID = 1L; + static { + n("observe.tree.encounter"); + n("observe.tree.sensorUsed"); + } + public ActivityLonglineNodeChildLoador() { super(String.class); } @@ -96,22 +101,12 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str return result; } - static { - n("observe.common.encounter"); - n("observe.common.sensorUsed"); - } - @Override public ObserveNode createNode(String data, NavDataProvider dataProvider) { - ObserveNode result = new ObserveNode( - getBeanType(), - getDecoratorService().getPropertyLabel(data), - data, - null, - false - ); + ObserveNode result = ObserveTreeHelper.createStringNode(data); return result; + } public ObserveNode createSetNode(SetLongline data) { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java index b17d351..7c17abc 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java @@ -43,6 +43,10 @@ public class ActivitySeineNodeChildLoador extends AbstractAssociationNodeChildLo private static final long serialVersionUID = 1L; + static { + n("observe.common.observedSystem"); + } + public ActivitySeineNodeChildLoador() { super(FloatingObject.class, ActivitySeine.PROPERTY_FLOATING_OBJECT); } @@ -60,13 +64,7 @@ public class ActivitySeineNodeChildLoador extends AbstractAssociationNodeChildLo } // Creation d'un node systeme observe - ObserveNode child = new ObserveNode( - String.class, - n("observe.common.observedSystem"), - ActivitySeine.PROPERTY_OBSERVED_SYSTEM, - null, - false - ); + ObserveNode child = ObserveTreeHelper.createStringNode(ActivitySeine.PROPERTY_OBSERVED_SYSTEM); parentNode.add(child); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java index 7a7daf8..754c001 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java @@ -24,11 +24,14 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; import java.util.List; +import static org.nuiton.i18n.I18n.n; + /** * Le chargeur des noeuds de marees. * @@ -43,6 +46,12 @@ public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<Strin super(String.class); } + static { + n("observe.tree.objectOperation"); + n("observe.tree.objectSchoolEstimate"); + n("observe.tree.objectObservedSpecies"); + } + @Override public List<String> getData(Class<?> parentClass, String parentId, @@ -58,13 +67,8 @@ public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<Strin @Override public ObserveNode createNode(String data, NavDataProvider dataProvider) { - ObserveNode result = new ObserveNode( - getBeanType(), - getDecoratorService().getPropertyLabel(data), - data, - null, - false - ); + ObserveNode result = ObserveTreeHelper.createStringNode(data); return result; } + } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index 365dd91..b76637a 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -47,6 +47,10 @@ public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<Trip private static final long serialVersionUID = 1L; + static { + n("observe.tree.activityLongline"); + } + public ProgramLonglineNodeChildLoador() { super(TripLongline.class); } @@ -116,13 +120,8 @@ public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<Trip if (addActivities) { - ObserveNode child = new ObserveNode( - String.class, - n("observe.common.activities"), - TripLongline.PROPERTY_ACTIVITY_LONGLINE, - ObserveTreeHelper.getChildLoador(ActivityLonglinesNodeChildLoador.class), - false - ); + ObserveNode child = ObserveTreeHelper.createStringNode( + TripLongline.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesNodeChildLoador.class); result.add(child); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java index c18c24f..4a23ead 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java @@ -46,23 +46,28 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei private static final long serialVersionUID = 1L; + static { + n("observe.tree.gearUseFeaturesSeine"); + n("observe.tree.route"); + } + public ProgramSeineNodeChildLoador() { super(TripSeine.class); } - protected boolean addRoutes; + protected boolean addChilds; @Override public void loadChilds(NavTreeBridge<ObserveNode> model, ObserveNode parentNode, NavDataProvider dataProvider) throws Exception { DataSelectionModel selectionModel = getSelectionModel(dataProvider); - addRoutes = selectionModel == null; + addChilds = selectionModel == null; try { super.loadChilds(model, parentNode, dataProvider); } finally { - addRoutes = true; + addChilds = true; } } @@ -79,10 +84,10 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei if (selectionModel != null) { result = new ArrayList<TripSeine>(); - List<String> mareeIds = selectionModel.getDatas().get(parentId); - if (!CollectionUtils.isEmpty(mareeIds)) { - for (String mareeId : mareeIds) { - result.add((TripSeine) service.loadEntity(dataSource, mareeId, true)); + List<String> tripIds = selectionModel.getDatas().get(parentId); + if (!CollectionUtils.isEmpty(tripIds)) { + for (String tripId : tripIds) { + result.add((TripSeine) service.loadEntity(dataSource, tripId, true)); } } } else { @@ -105,16 +110,20 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei null, false ); - if (addRoutes) { - - ObserveNode child = new ObserveNode( - String.class, - n("observe.common.routes"), - TripSeine.PROPERTY_ROUTE, - ObserveTreeHelper.getChildLoador(RoutesNodeChildLoador.class), - false - ); - result.add(child); + + if (addChilds) { + + { + // Add gears + ObserveNode child = ObserveTreeHelper.createStringNode(TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE); + result.add(child); + } + + { + // Add routes + ObserveNode child = ObserveTreeHelper.createStringNode(TripSeine.PROPERTY_ROUTE, RoutesNodeChildLoador.class); + result.add(child); + } } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java index cb3ed11..1c704db 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java @@ -31,6 +31,8 @@ import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; import java.util.List; +import static org.nuiton.i18n.I18n.n; + /** * Le chargeur des noeuds du referentiel. * @@ -41,6 +43,29 @@ public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<Clas private static final long serialVersionUID = 1L; + static { + + n("observe.tree.vesselSizeCategory"); + n("observe.tree.country"); + n("observe.tree.harbour"); + n("observe.tree.vesselType"); + n("observe.tree.vessel"); + n("observe.tree.speciesGroup"); + n("observe.tree.species"); + n("observe.tree.sex"); + n("observe.tree.fpaZone"); + n("observe.tree.speciesList"); + n("observe.tree.person"); + n("observe.tree.ocean"); + n("observe.tree.organism"); + n("observe.tree.lengthWeightParameter"); + n("observe.tree.program"); + n("observe.tree.gearCaracteristicType"); + n("observe.tree.gearCaracteristic"); + n("observe.tree.gear"); + + } + public ReferenceCommonNodeChildLoador() { super(Class.class); } @@ -51,8 +76,7 @@ public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<Clas NavDataProvider dataProvider) throws DataSourceException { List<Class> result = new ArrayList<Class>(); - for (ObserveEntityEnum anEnum : - Entities.REFERENCE_COMMON_ENTITIES_LIST) { + for (ObserveEntityEnum anEnum : Entities.REFERENCE_COMMON_ENTITIES_LIST) { result.add(anEnum.getContract()); } UIHelper.sortReferentiel(result); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java index 4e8594f..8181f95 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.entities.Entities; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.db.DataSourceException; +import fr.ird.observe.entities.Entities; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -31,6 +31,8 @@ import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; import java.util.List; +import static org.nuiton.i18n.I18n.n; + /** * Le chargeur des noeuds du referentiel. * @@ -41,6 +43,35 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Cl private static final long serialVersionUID = 1L; + static { + n("observe.tree.baitHaulingStatus"); + n("observe.tree.baitSettingStatus"); + n("observe.tree.baitType"); + n("observe.tree.catchFateLongline"); + n("observe.tree.encounterType"); + n("observe.tree.healthness"); + n("observe.tree.hookPosition"); + n("observe.tree.hookSize"); + n("observe.tree.hookType"); + n("observe.tree.itemVerticalPosition"); + n("observe.tree.itemHorizontalPosition"); + n("observe.tree.lightsticksColor"); + n("observe.tree.lightsticksType"); + n("observe.tree.lineType"); + n("observe.tree.maturityStatus"); + n("observe.tree.mitigationType"); + n("observe.tree.sensorBrand"); + n("observe.tree.sensorDataFormat"); + n("observe.tree.sensorType"); + n("observe.tree.settingShape"); + n("observe.tree.sizeMeasureType"); + n("observe.tree.stomacFullness"); + n("observe.tree.tripType"); + n("observe.tree.vesselActivityLongline"); + n("observe.tree.weightMeasureType"); + + } + public ReferenceLonglineNodeChildLoador() { super(Class.class); } @@ -51,8 +82,7 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Cl NavDataProvider dataProvider) throws DataSourceException { List<Class> result = new ArrayList<Class>(); - for (ObserveEntityEnum anEnum : - Entities.REFERENCE_LONGLINE_ENTITIES_LIST) { + for (ObserveEntityEnum anEnum : Entities.REFERENCE_LONGLINE_ENTITIES_LIST) { result.add(anEnum.getContract()); } UIHelper.sortReferentiel(result); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java index fcd3250..3db8f30 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.entities.Entities; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.db.DataSourceException; +import fr.ird.observe.entities.Entities; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -31,6 +31,8 @@ import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; import java.util.List; +import static org.nuiton.i18n.I18n.n; + /** * Le chargeur des noeuds du referentiel. * @@ -41,6 +43,27 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<Class private static final long serialVersionUID = 1L; + static { + + n("observe.tree.vesselActivitySeine"); + n("observe.tree.surroundingActivity"); + n("observe.tree.reasonForNullSet"); + n("observe.tree.reasonForNoFishing"); + n("observe.tree.speciesFate"); + n("observe.tree.objectFate"); + n("observe.tree.weightCategory"); + n("observe.tree.detectionMode"); + n("observe.tree.transmittingBuoyOperation"); + n("observe.tree.objectOperation"); + n("observe.tree.reasonForDiscard"); + n("observe.tree.speciesStatus"); + n("observe.tree.observedSystem"); + n("observe.tree.transmittingBuoyType"); + n("observe.tree.objectType"); + n("observe.tree.wind"); + + } + public ReferenceSeineNodeChildLoador() { super(Class.class); } @@ -51,8 +74,7 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<Class NavDataProvider dataProvider) throws DataSourceException { List<Class> result = new ArrayList<Class>(); - for (ObserveEntityEnum anEnum : - Entities.REFERENCE_SEINE_ENTITIES_LIST) { + for (ObserveEntityEnum anEnum : Entities.REFERENCE_SEINE_ENTITIES_LIST) { result.add(anEnum.getContract()); } UIHelper.sortReferentiel(result); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java index f03db1e..bcf28d7 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java @@ -106,7 +106,7 @@ public class RootNodeChildLoador extends AbstractNodeChildLoador<Program> { { // ajout du referentiel commun ObserveNode child = new ObserveNode( String.class, - n("observe.common.reference.common"), + n("observe.tree.reference.common"), ObserveTreeHelper.getChildLoador(ReferenceCommonNodeChildLoador.class), true ); @@ -115,7 +115,7 @@ public class RootNodeChildLoador extends AbstractNodeChildLoador<Program> { { // ajout du referentiel seine ObserveNode child = new ObserveNode( String.class, - n("observe.common.reference.seine"), + n("observe.tree.reference.seine"), ObserveTreeHelper.getChildLoador(ReferenceSeineNodeChildLoador.class), true ); @@ -124,7 +124,7 @@ public class RootNodeChildLoador extends AbstractNodeChildLoador<Program> { { // ajout du referentiel longline ObserveNode child = new ObserveNode( String.class, - n("observe.common.reference.longline"), + n("observe.tree.reference.longline"), ObserveTreeHelper.getChildLoador(ReferenceLonglineNodeChildLoador.class), true ); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java index 6204d24..b96e7af 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java @@ -42,6 +42,9 @@ public class RoutesNodeChildLoador extends AbstractAssociationNodeChildLoador<Ro private static final long serialVersionUID = 1L; + static { + n("observe.tree.activitySeine"); + } public RoutesNodeChildLoador() { super(Route.class, TripSeine.PROPERTY_ROUTE); } @@ -70,14 +73,8 @@ public class RoutesNodeChildLoador extends AbstractAssociationNodeChildLoador<Ro false ); - // Creation d'un node activitys - ObserveNode child = new ObserveNode( - String.class, - n("observe.common.activities"), - Route.PROPERTY_ACTIVITY_SEINE, - ObserveTreeHelper.getChildLoador(ActivitySeinesNodeChildLoador.class), - false - ); + // Creation d'un node activites + ObserveNode child = ObserveTreeHelper.createStringNode(Route.PROPERTY_ACTIVITY_SEINE, ActivitySeinesNodeChildLoador.class); result.add(child); return result; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java index 2607b59..a671699 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java @@ -25,6 +25,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; @@ -42,6 +43,13 @@ public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<String> private static final long serialVersionUID = 1L; + static { + n("observe.tree.longlineGlobalComposition"); + n("observe.tree.longlineDetailComposition"); + n("observe.tree.catchLongline"); + n("observe.tree.tdr"); + } + public SetLonglineNodeChildLoador() { super(String.class); } @@ -59,23 +67,13 @@ public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<String> return result; } - { - n("observe.common.longlineGlobalComposition"); - n("observe.common.longlineDetailComposition"); - n("observe.common.catchLongline"); - n("observe.common.tdr"); - } + @Override public ObserveNode createNode(String data, NavDataProvider dataProvider) { - ObserveNode result = new ObserveNode( - getBeanType(), - getDecoratorService().getPropertyLabel(data), - data, - null, - false - ); + ObserveNode result = ObserveTreeHelper.createStringNode(data); return result; + } } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java index b41cae7..3fc38e5 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java @@ -24,11 +24,14 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; import java.util.List; +import static org.nuiton.i18n.I18n.n; + /** * Le chargeur des noeuds de marees. * @@ -39,6 +42,16 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<String> { private static final long serialVersionUID = 1L; + static { + n("observe.tree.schoolEstimate"); + n("observe.tree.targetCatch"); + n("observe.tree.targetDiscarded"); + n("observe.tree.targetSample"); + n("observe.tree.targetSampleCapture"); + n("observe.tree.nonTargetCatch"); + n("observe.tree.nonTargetSample"); + } + public SetSeineNodeChildLoador() { super(String.class); } @@ -62,13 +75,8 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<String> { @Override public ObserveNode createNode(String data, NavDataProvider dataProvider) { - ObserveNode result = new ObserveNode( - getBeanType(), - getDecoratorService().getPropertyLabel(data), - data, - null, - false - ); + ObserveNode result = ObserveTreeHelper.createStringNode(data); return result; + } } diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties index faeabf7..3a979a0 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties @@ -713,8 +713,6 @@ observe.common.acquisitionMode.individu= observe.common.activities=Activities observe.common.activities.list=List of activities observe.common.activity=Activity -observe.common.activityLongline.unsaved=New activity -observe.common.activitySeine.unsaved=New activity observe.common.baitObservation= observe.common.birdsObservation=Birds observe.common.boolean.false= @@ -727,7 +725,6 @@ observe.common.capacity= observe.common.capacityLabel= observe.common.captain= observe.common.caracteristics= -observe.common.catchLongline= observe.common.catchWeight= observe.common.catchWeightComputed.computed.tip= observe.common.catchWeightComputed.observed.tip= @@ -755,7 +752,6 @@ observe.common.description= observe.common.detailledActivitiesObservation= observe.common.detectionMode= observe.common.directory= -observe.common.encounter= observe.common.endDate= observe.common.endLogValue= observe.common.equation= @@ -763,11 +759,8 @@ observe.common.ersId= observe.common.file= observe.common.firstName= observe.common.flagCountry= -observe.common.floatingObject.unsaved=New DCP observe.common.formsUrl= observe.common.gaugeLabel= -observe.common.gear=Gear -observe.common.gearCaracteristic=Gear caracteristic observe.common.gearType=Gear caracteristic type observe.common.generateReport= observe.common.global.progression.description= @@ -793,8 +786,6 @@ observe.common.length.observed.tip= observe.common.lengthMeasureType= observe.common.lengthWeightFormula= observe.common.libelles= -observe.common.longlineDetailComposition=Detailed composition -observe.common.longlineGlobalComposition=Global composition observe.common.lowerValueUpperValue= observe.common.mammalsObservation= observe.common.meanLength= @@ -845,13 +836,8 @@ observe.common.program.observation.value.7= observe.common.program.observation.value.8= observe.common.program.observation.value.9= observe.common.reasonForDiscard= -observe.common.reference.common= -observe.common.reference.longline= -observe.common.reference.seine= observe.common.reportsUrl= observe.common.resume= -observe.common.route.unsaved=New route -observe.common.routes=Routes observe.common.routes.list=List of routes observe.common.samplesObservation= observe.common.schoolEstimate= @@ -859,9 +845,6 @@ observe.common.schoolType= observe.common.scientificLabel= observe.common.seaSurfaceTemperature= observe.common.searchMaximum= -observe.common.seineBallastWeight= -observe.common.seineCircumference= -observe.common.seineDepth= observe.common.select.gps.import.file= observe.common.select.gps.import.file.tip= observe.common.select.gps.maxDelay= @@ -877,10 +860,6 @@ observe.common.select.validate.mode.tip= observe.common.select.validate.scope= observe.common.select.validate.scope.tip= observe.common.selected.validators= -observe.common.senne= -observe.common.sensorUsed=Sensor used -observe.common.setLongline.unsaved=New fishing operation -observe.common.setSeine.unsaved=New set observe.common.sex= observe.common.species=Species observe.common.speciesFate= @@ -905,7 +884,6 @@ observe.common.targetDiscarded= observe.common.targetDiscardsObservation= observe.common.targetSample= observe.common.targetSampleCapture= -observe.common.tdr= observe.common.topiaCreateDate= observe.common.topiaId= observe.common.topiaVersion= @@ -915,8 +893,6 @@ observe.common.totalCountComputed.observed.tip= observe.common.totalWeight= observe.common.transmittingBuoyOperation= observe.common.transmittingBuoyType= -observe.common.tripLongline.unsaved=New trip -observe.common.tripSeine.unsaved=New trip observe.common.trips.list=List of trips observe.common.typeTransmittingBuoyOperation= observe.common.undefined= @@ -1965,6 +1941,95 @@ observe.title.unique.key=Unique keys used in a referentiel observe.title.validate=Validate datas observe.title.validate.tip=Validate datas of a storage observe.title.welcome.admin=Observe Admin +observe.tree.activityLongline=Activity +observe.tree.activityLongline.unsaved=New activity +observe.tree.activitySeine=Activity +observe.tree.activitySeine.unsaved=New activity +observe.tree.baitHaulingStatus=Bait hauling status +observe.tree.baitSettingStatus=Bait setting status +observe.tree.baitType=Bait type +observe.tree.catchFateLongline=Catch fate +observe.tree.catchLongline=Catches +observe.tree.country=Country +observe.tree.detectionMode=Detection mode +observe.tree.encounter=Encounter +observe.tree.encounterType= +observe.tree.floatingObject.unsaved=New DCP +observe.tree.fpaZone=Fpa zone +observe.tree.gear=Gear +observe.tree.gearCaracteristic=Gear caracteristic +observe.tree.gearCaracteristicType=Gear caracteristic type +observe.tree.gearUseFeaturesSeine=GearUseFeaturesSeine +observe.tree.harbour=Harbour +observe.tree.healthness=Healthness +observe.tree.hookPosition=Hook position +observe.tree.hookSize=Hook size +observe.tree.hookType=Hook type +observe.tree.itemHorizontalPosition=Item horizontal position +observe.tree.itemVerticalPosition=Item vertical position +observe.tree.lengthWeightParameter=Length-weight relationship +observe.tree.lightsticksColor=Lightsticks color +observe.tree.lightsticksType=Lightsticks type +observe.tree.lineType=Line type +observe.tree.longlineDetailComposition=Detailed composition +observe.tree.longlineGlobalComposition=Global composition +observe.tree.maturityStatus=Maturity status +observe.tree.mitigationType=Mitigation type +observe.tree.nonTargetCatch=Non target catch +observe.tree.nonTargetSample=Non target sample +observe.tree.objectFate=ObjectFate +observe.tree.objectObservedSpecies=Object observed species +observe.tree.objectOperation=Object operation +observe.tree.objectSchoolEstimate=Object school estimate +observe.tree.objectType=Object type +observe.tree.observedSystem=Observed system +observe.tree.ocean=Ocean +observe.tree.organism=Organisme +observe.tree.person=Person +observe.tree.program=Program +observe.tree.reasonForDiscard=Reason for discard +observe.tree.reasonForNoFishing=Reason for no fishing +observe.tree.reasonForNullSet=Reason for null set +observe.tree.reference.common=Common Referential +observe.tree.reference.longline=Longline Referential +observe.tree.reference.seine=Seine Referential +observe.tree.route=Road +observe.tree.route.unsaved=New route +observe.tree.schoolEstimate=School estimate +observe.tree.sensorBrand=Sensor brand +observe.tree.sensorDataFormat=Sensor data format +observe.tree.sensorType=Sensor type +observe.tree.sensorUsed=Sensor used +observe.tree.setLongline.unsaved=New fishing operation +observe.tree.setSeine.unsaved=New set +observe.tree.settingShape=Setting shape +observe.tree.sex=Sex +observe.tree.sizeMeasureType=Size measure type +observe.tree.species=Species +observe.tree.speciesFate=Species fate +observe.tree.speciesGroup=Species group +observe.tree.speciesList=Species list +observe.tree.speciesStatus=Species status +observe.tree.stomacFullness=Stomac fullness +observe.tree.surroundingActivity=Surrounding activity +observe.tree.targetCatch=Target catch +observe.tree.targetDiscarded=Target discarded +observe.tree.targetSample=Target sample +observe.tree.targetSampleCapture=Target sample capture +observe.tree.tdr=TDR +observe.tree.transmittingBuoyOperation=Transmitting buoy operation +observe.tree.transmittingBuoyType=Transmitting buoy type +observe.tree.tripLongline.unsaved=New trip +observe.tree.tripSeine.unsaved=New trip +observe.tree.tripType=Trip type +observe.tree.vessel=Boat +observe.tree.vesselActivityLongline=Boat activity +observe.tree.vesselActivitySeine=Boat Activity +observe.tree.vesselSizeCategory=Boat size category +observe.tree.vesselType=Boat type +observe.tree.weightCategory=Weight category +observe.tree.weightMeasureType=Weight measure type +observe.tree.wind=Wind observe.tripLongline.captain=Capitain observe.tripLongline.dataEntryOperator=Data entry operator observe.tripLongline.endDate=End date @@ -1988,8 +2053,6 @@ observe.tripSeine.message.creating=Creating a trip observe.tripSeine.message.no.active.found=No opened trip found, you can create a new one or open an existing one. observe.tripSeine.message.not.open=Current trip is not opened, no edit possible. observe.tripSeine.message.updating=Updating a trip -observe.tripSeine.tab.caracteristics=Other caracteristics -observe.tripSeine.tab.general=General caracteristics observe.tripSeine.title=Trip observe.validation.report.contextName= observe.validation.report.entities.with.messages= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties index a47492c..574d445 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties @@ -1,4 +1,3 @@ -observe.GearUseFeaturesSeine.usedInTrip= observe.about.message=<h3>ObServe</h3><a href\="http\://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, d'Observation et de Suivi des pêches thonières tropicales de surface.</a><hr/><p>Aplicación de adquisición Application de datos de observadores y de consulta de estos datos desde una base <i>Obstuna</i>.</p> <p>Este projecto se ha iniciado en 2009 por la unidad US 007-OSIRIS del <a href\="http\://www.ird.fr">IRD</a> dentro del marco de <a href\="http\://ww [...] observe.about.translate.content=<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">observe-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur avec les options suivantes \: <ul><li>caractère séparateur \: <strong><i>|</i></strong></li><li>encoding <strong><i>UTF-8</i></strong></li><li>texte encapsulé par des <strong><i>"</i></strong></li></ul></li><li>Traduisez, Améliore [...] observe.about.translate.title=Traducir ObServe @@ -714,8 +713,6 @@ observe.common.acquisitionMode.individu=Entrada por individuo observe.common.activities=Actividades observe.common.activities.list= observe.common.activity=Actividad -observe.common.activityLongline.unsaved= -observe.common.activitySeine.unsaved= observe.common.baitObservation=Carnada observe.common.birdsObservation=Pájaros observe.common.boolean.false=No @@ -728,7 +725,6 @@ observe.common.capacity=Capacidad de transporte observe.common.capacityLabel=Texto capacidad observe.common.captain= observe.common.caracteristics=Características -observe.common.catchLongline= observe.common.catchWeight=Peso estimado (en t) observe.common.catchWeightComputed.computed.tip=Peso estimado calculado observe.common.catchWeightComputed.observed.tip=Peso estimado observado @@ -756,7 +752,6 @@ observe.common.description=Descripción observe.common.detailledActivitiesObservation=Actividades detalladas observe.common.detectionMode=Modo de detección observe.common.directory=Carpeta -observe.common.encounter= observe.common.endDate=Fecha de fin observe.common.endLogValue=Corredera de tarde (millas) observe.common.equation=Relación talla-peso @@ -764,10 +759,8 @@ observe.common.ersId=Id ERS observe.common.file=Archivo observe.common.firstName=Número observe.common.flagCountry=Badera -observe.common.floatingObject.unsaved=Nuevo DCP observe.common.formsUrl=URL de los formularios observe.common.gaugeLabel=Texto «Capacidad» -observe.common.gearCaracteristic= observe.common.gearType= observe.common.generateReport=Generar un informe de validación observe.common.global.progression.description=Progresión global @@ -793,8 +786,6 @@ observe.common.length.observed.tip=Longitud observada observe.common.lengthMeasureType=Tipo de medida observe.common.lengthWeightFormula=Relación de peso observe.common.libelles=Textos -observe.common.longlineDetailComposition= -observe.common.longlineGlobalComposition= observe.common.lowerValueUpperValue= observe.common.mammalsObservation=Mamiferos observe.common.meanLength=Talla media (en cm) @@ -845,13 +836,8 @@ observe.common.program.observation.value.7=valor 7 no definido observe.common.program.observation.value.8=valor 8 no definido observe.common.program.observation.value.9=valor 9 no definido observe.common.reasonForDiscard=Razon de descarte -observe.common.reference.common= -observe.common.reference.longline= -observe.common.reference.seine= observe.common.reportsUrl=URL del informe observe.common.resume=Resumen de la configuración -observe.common.route.unsaved=Nueva ruta -observe.common.routes=Rutas observe.common.routes.list=Lista de rutas observe.common.samplesObservation=Medidas observe.common.schoolEstimate=Estimación del banco @@ -859,9 +845,6 @@ observe.common.schoolType=Tipo de banco observe.common.scientificLabel=Texto científico observe.common.seaSurfaceTemperature=Temperatura en superficie (°) observe.common.searchMaximum=Velocidad máxima de prospección -observe.common.seineBallastWeight=Lastre (en Kg) -observe.common.seineCircumference=Circunferencia (en m) -observe.common.seineDepth=Profundidad (en m) observe.common.select.gps.import.file=Importar archivo observe.common.select.gps.import.file.tip=Elegir el archivo de trace GPS a importar observe.common.select.gps.maxDelay=Tiempos máximos (mn) @@ -877,10 +860,6 @@ observe.common.select.validate.mode.tip=Elegir el tipo de datos a validar observe.common.select.validate.scope=Nivel de validación observe.common.select.validate.scope.tip=Elegir el o los niveles de validación observe.common.selected.validators=Número de validadores detectados \: %1$s -observe.common.senne=Cerco -observe.common.sensorUsed= -observe.common.setLongline.unsaved=Nuevo Lance -observe.common.setSeine.unsaved=Nuevo Lance observe.common.sex=Sexo observe.common.species=Especie observe.common.speciesFate=Devenir de fauna @@ -905,7 +884,6 @@ observe.common.targetDiscarded=Descarte de atún observe.common.targetDiscardsObservation=Descartes de atún observe.common.targetSample=Muestreo atún descartado observe.common.targetSampleCapture=Muestreo atún capturado -observe.common.tdr= observe.common.topiaCreateDate=Fecha de creación observe.common.topiaId=Técnicas de identificación observe.common.topiaVersion=Versión @@ -915,8 +893,6 @@ observe.common.totalCountComputed.observed.tip=El número estimado se observo observe.common.totalWeight= observe.common.transmittingBuoyOperation= observe.common.transmittingBuoyType= -observe.common.tripLongline.unsaved=Nueva marea -observe.common.tripSeine.unsaved=Nueva marea observe.common.trips.list=Lista de mareas observe.common.typeTransmittingBuoyOperation=Tipo de operación sobre baliza observe.common.undefined=- @@ -1060,14 +1036,11 @@ observe.gear.tab.general= observe.gear.unit= observe.gearUseFeaturesSeine.comment= observe.gearUseFeaturesSeine.gear= -observe.gearUseFeaturesSeine.gearCaracteristic= observe.gearUseFeaturesSeine.number= observe.gearUseFeaturesSeine.table.comment= observe.gearUseFeaturesSeine.table.comment.tip= observe.gearUseFeaturesSeine.table.gear= observe.gearUseFeaturesSeine.table.gear.tip= -observe.gearUseFeaturesSeine.table.gearCaracteristic= -observe.gearUseFeaturesSeine.table.gearCaracteristic.tip= observe.gearUseFeaturesSeine.table.number= observe.gearUseFeaturesSeine.table.number.tip= observe.gearUseFeaturesSeine.table.usedInTrip= @@ -1968,6 +1941,95 @@ observe.title.unique.key= observe.title.validate= observe.title.validate.tip= observe.title.welcome.admin= +observe.tree.activityLongline=Actividad +observe.tree.activityLongline.unsaved= +observe.tree.activitySeine=Actividad +observe.tree.activitySeine.unsaved= +observe.tree.baitHaulingStatus= +observe.tree.baitSettingStatus= +observe.tree.baitType= +observe.tree.catchFateLongline= +observe.tree.catchLongline= +observe.tree.country=País +observe.tree.detectionMode=Modo de detección +observe.tree.encounter= +observe.tree.encounterType= +observe.tree.floatingObject.unsaved=Nuevo DCP +observe.tree.fpaZone= +observe.tree.gear= +observe.tree.gearCaracteristic= +observe.tree.gearCaracteristicType= +observe.tree.gearUseFeaturesSeine= +observe.tree.harbour=Puerto +observe.tree.healthness= +observe.tree.hookPosition= +observe.tree.hookSize= +observe.tree.hookType= +observe.tree.itemHorizontalPosition= +observe.tree.itemVerticalPosition= +observe.tree.lengthWeightParameter= +observe.tree.lightsticksColor= +observe.tree.lightsticksType= +observe.tree.lineType= +observe.tree.longlineDetailComposition= +observe.tree.longlineGlobalComposition= +observe.tree.maturityStatus= +observe.tree.mitigationType= +observe.tree.nonTargetCatch=Fauna asociada conservada o descartada +observe.tree.nonTargetSample=Muestreo fauna asociada +observe.tree.objectFate=Devenir de objeto +observe.tree.objectObservedSpecies= +observe.tree.objectOperation=Operación sobre la baliza +observe.tree.objectSchoolEstimate= +observe.tree.objectType=Tipo de objeto +observe.tree.observedSystem=Sistema observado +observe.tree.ocean=Océano +observe.tree.organism=Organismo +observe.tree.person=Observador +observe.tree.program=Programa +observe.tree.reasonForDiscard=Razon de descarte +observe.tree.reasonForNoFishing=Razón de no lance de Cerco +observe.tree.reasonForNullSet=Causa de lance nulo +observe.tree.reference.common= +observe.tree.reference.longline= +observe.tree.reference.seine= +observe.tree.route=Ruta +observe.tree.route.unsaved=Nueva ruta +observe.tree.schoolEstimate=Estimación del banco +observe.tree.sensorBrand= +observe.tree.sensorDataFormat= +observe.tree.sensorType= +observe.tree.sensorUsed= +observe.tree.setLongline.unsaved=Nuevo Lance +observe.tree.setSeine.unsaved=Nuevo Lance +observe.tree.settingShape= +observe.tree.sex=Sexo +observe.tree.sizeMeasureType= +observe.tree.species=Especie +observe.tree.speciesFate=Devenir de fauna +observe.tree.speciesGroup=Grupo de especie de fauna +observe.tree.speciesList= +observe.tree.speciesStatus=Estado de especie +observe.tree.stomacFullness= +observe.tree.surroundingActivity=Actividad circundante +observe.tree.targetCatch=Captura de atún +observe.tree.targetDiscarded=Descarte de atún +observe.tree.targetSample=Muestreo atún descartado +observe.tree.targetSampleCapture=Muestreo atún capturado +observe.tree.tdr= +observe.tree.transmittingBuoyOperation= +observe.tree.transmittingBuoyType= +observe.tree.tripLongline.unsaved=Nueva marea +observe.tree.tripSeine.unsaved=Nueva marea +observe.tree.tripType= +observe.tree.vessel=Barco +observe.tree.vesselActivityLongline= +observe.tree.vesselActivitySeine=Actividad del barco +observe.tree.vesselSizeCategory=Capacidad +observe.tree.vesselType=Pesquería +observe.tree.weightCategory=Categoría de peso +observe.tree.weightMeasureType= +observe.tree.wind=Fuerza del viento observe.tripLongline.captain= observe.tripLongline.dataEntryOperator= observe.tripLongline.endDate= @@ -1991,8 +2053,6 @@ observe.tripSeine.message.creating= observe.tripSeine.message.no.active.found= observe.tripSeine.message.not.open= observe.tripSeine.message.updating= -observe.tripSeine.tab.caracteristics= -observe.tripSeine.tab.general= observe.tripSeine.title= observe.validation.report.contextName= observe.validation.report.entities.with.messages= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index 09225ea..7d435d4 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -713,8 +713,6 @@ observe.common.acquisitionMode.individu=Saisie par individu observe.common.activities=Activités observe.common.activities.list=Liste des activités observe.common.activity=Activité -observe.common.activityLongline.unsaved=Nouvelle activité -observe.common.activitySeine.unsaved=Nouvelle activité observe.common.baitObservation=Gleure observe.common.birdsObservation=Oiseaux observe.common.boolean.false=Non @@ -727,7 +725,6 @@ observe.common.capacity=Capacité transport (m³) observe.common.capacityLabel=Libellé capacité observe.common.captain=Capitaine observe.common.caracteristics=Caractéristiques -observe.common.catchLongline= observe.common.catchWeight=Poids estimé (en t) observe.common.catchWeightComputed.computed.tip=Le poids estimé a été calculé (%s) observe.common.catchWeightComputed.observed.tip=Le poids estimé a été observé @@ -755,7 +752,6 @@ observe.common.description=Description observe.common.detailledActivitiesObservation=Activités détaillées observe.common.detectionMode=Mode détection observe.common.directory=Répertoire -observe.common.encounter= observe.common.endDate=Fin de validité observe.common.endLogValue=Loch du soir (milles) observe.common.equation=Relation taille poids @@ -763,10 +759,8 @@ observe.common.ersId=Id ERS observe.common.file=Fichier observe.common.firstName=Prénom observe.common.flagCountry=Pavillon -observe.common.floatingObject.unsaved=Nouveau DCP observe.common.formsUrl=URL des formulaires observe.common.gaugeLabel=Libellé jauge -observe.common.gearCaracteristic=Caractétistique d'un équipement observe.common.gearType=Type d'engin observe.common.generateReport=Générer un rapport de validation observe.common.global.progression.description=Progression globale @@ -792,8 +786,6 @@ observe.common.length.observed.tip=La longueur a été observée observe.common.lengthMeasureType=Type de mensuration observe.common.lengthWeightFormula=Relation Poids observe.common.libelles=Libellés -observe.common.longlineDetailComposition=Composition détaillée -observe.common.longlineGlobalComposition=Composition globale observe.common.lowerValueUpperValue=Borne min-max observe.common.mammalsObservation=Mammifères observe.common.meanLength=Taille moyenne (en cm) @@ -844,13 +836,8 @@ observe.common.program.observation.value.7=valeur 7 non définie observe.common.program.observation.value.8=valeur 8 non définie observe.common.program.observation.value.9=valeur 9 non définie observe.common.reasonForDiscard=Raison rejet -observe.common.reference.common=Référentiel commun -observe.common.reference.longline=Référentiel Palangre -observe.common.reference.seine=Référentiel Senne observe.common.reportsUrl=URL de rapport observe.common.resume=Résumé de la configuration -observe.common.route.unsaved=Nouvelle route -observe.common.routes=Routes observe.common.routes.list=Liste des routes observe.common.samplesObservation=Mensurations observe.common.schoolEstimate=Estimation banc @@ -858,9 +845,6 @@ observe.common.schoolType=Type de banc observe.common.scientificLabel=Libellé scientifique observe.common.seaSurfaceTemperature=Température surface (°) observe.common.searchMaximum=Vitesse maximale -observe.common.seineBallastWeight=Poids du lest (en Kg) -observe.common.seineCircumference=Circonférence (en m) -observe.common.seineDepth=Profondeur (en m) observe.common.select.gps.import.file=Fichier à importer observe.common.select.gps.import.file.tip=Choisir le fichier de trace GPS à importer observe.common.select.gps.maxDelay=Temps maximum (mn) @@ -876,10 +860,6 @@ observe.common.select.validate.mode.tip=Choisir le type de données à valider observe.common.select.validate.scope=Niveau de validation observe.common.select.validate.scope.tip=Choisir le ou les niveaux de validation observe.common.selected.validators=Nombre de validateurs détectés \: %1$s -observe.common.senne=Senne -observe.common.sensorUsed= -observe.common.setLongline.unsaved=Nouvelle opération de pêche -observe.common.setSeine.unsaved=Nouvelle calée observe.common.sex=Sexe observe.common.species=Espèce observe.common.speciesFate=Devenir espèce @@ -904,7 +884,6 @@ observe.common.targetDiscarded=Rejet de thon observe.common.targetDiscardsObservation=Rejets thon observe.common.targetSample=Echantillon thon rejeté observe.common.targetSampleCapture=Echantillon thon capturé -observe.common.tdr= observe.common.topiaCreateDate=Date de création observe.common.topiaId=Identifiant technique observe.common.topiaVersion=Version @@ -914,8 +893,6 @@ observe.common.totalCountComputed.observed.tip=Le nombre estimé a été observ observe.common.totalWeight=Poids observe.common.transmittingBuoyOperation=Opération balise observe.common.transmittingBuoyType=Type de balise -observe.common.tripLongline.unsaved=Nouvelle marée -observe.common.tripSeine.unsaved=Nouvelle marée observe.common.trips.list=Liste des marées observe.common.typeTransmittingBuoyOperation=Type d'opération sur balise observe.common.undefined=< non défini > @@ -1068,7 +1045,7 @@ observe.gearUseFeaturesSeine.table.number=Nombre observe.gearUseFeaturesSeine.table.number.tip=Nombre observe.gearUseFeaturesSeine.table.usedInTrip=Utilisé observe.gearUseFeaturesSeine.table.usedInTrip.tip=Utilisé dans la marée -observe.gearUseFeaturesSeine.title= +observe.gearUseFeaturesSeine.title=Équipements observe.gearUseFeaturesSeine.usedInTrip=Utilisé dans la marée observe.harbour.coordinates=Nom observe.harbour.locode=Locode @@ -1964,6 +1941,95 @@ observe.title.unique.key=Clefs métier du référentiel %1$s observe.title.validate=Validation des données observe.title.validate.tip=Valider les données d'une source de données observe.title.welcome.admin=Observe Administrateur +observe.tree.activityLongline=Activités +observe.tree.activityLongline.unsaved=Nouvelle activité +observe.tree.activitySeine=Activités +observe.tree.activitySeine.unsaved=Nouvelle activité +observe.tree.baitHaulingStatus=Status de l'appât au virage +observe.tree.baitSettingStatus=Status de l'appât au filage +observe.tree.baitType=Type d'appât +observe.tree.catchFateLongline=Devenir capture +observe.tree.catchLongline=Capture +observe.tree.country=Pays +observe.tree.detectionMode=Mode détection +observe.tree.encounter=Rencontre +observe.tree.encounterType=Type de rencontre +observe.tree.floatingObject.unsaved=Nouveau DCP +observe.tree.fpaZone=Zone FPA +observe.tree.gear=Équipement +observe.tree.gearCaracteristic=Caractéristique d'un équipement +observe.tree.gearCaracteristicType=Type de caractéristique d'équipement +observe.tree.gearUseFeaturesSeine=Équipements +observe.tree.harbour=Port +observe.tree.healthness=État de santé +observe.tree.hookPosition=Position du hameçon +observe.tree.hookSize=Taille +observe.tree.hookType=Type d'hameçon +observe.tree.itemHorizontalPosition=Localisation de l'élément sur la ligne mère +observe.tree.itemVerticalPosition=Localisation de l'élément sur l'avançon +observe.tree.lengthWeightParameter=Relation Taille-Poids +observe.tree.lightsticksColor=Couleur de baton lumineux +observe.tree.lightsticksType=Type de baton lumineux +observe.tree.lineType=Type de ligne +observe.tree.longlineDetailComposition=Composition détaillée +observe.tree.longlineGlobalComposition=Composition globale +observe.tree.maturityStatus=Maturité +observe.tree.mitigationType=Type de mesure d'atténuation +observe.tree.nonTargetCatch=Faune accessoire conservée ou rejetée +observe.tree.nonTargetSample=Echantillon faune accessoire +observe.tree.objectFate=Devenir de l'objet +observe.tree.objectObservedSpecies=Faune observée +observe.tree.objectOperation=Opération sur l'objet +observe.tree.objectSchoolEstimate=Estimation banc objet +observe.tree.objectType=Type d'objet +observe.tree.observedSystem=Système observé +observe.tree.ocean=Océan +observe.tree.organism=Organisme +observe.tree.person=Personne +observe.tree.program=Programme +observe.tree.reasonForDiscard=Raison rejet +observe.tree.reasonForNoFishing=Raison de non coup de Senne +observe.tree.reasonForNullSet=Cause coup nul +observe.tree.reference.common=Référentiel commun +observe.tree.reference.longline=Référentiel Palangre +observe.tree.reference.seine=Référentiel Senne +observe.tree.route=Routes +observe.tree.route.unsaved=Nouvelle route +observe.tree.schoolEstimate=Estimation banc +observe.tree.sensorBrand=Marque de capteur +observe.tree.sensorDataFormat=Format de données de capteur +observe.tree.sensorType=Type de capteur +observe.tree.sensorUsed=Capteur utilisé +observe.tree.setLongline.unsaved=Nouvelle opération de pêche +observe.tree.setSeine.unsaved=Nouvelle calée +observe.tree.settingShape=Forme au filage +observe.tree.sex=Sexe +observe.tree.sizeMeasureType=Type de mesure de taille +observe.tree.species=Espèce +observe.tree.speciesFate=Devenir espèce +observe.tree.speciesGroup=Groupe espèce +observe.tree.speciesList=Liste d'espèces +observe.tree.speciesStatus=Statut faune observée +observe.tree.stomacFullness=Niveau de remplissage de l'estomac +observe.tree.surroundingActivity=Activité environnante +observe.tree.targetCatch=Capture cible +observe.tree.targetDiscarded=Rejet de thon +observe.tree.targetSample=Echantillon thon rejeté +observe.tree.targetSampleCapture=Echantillon thon capturé +observe.tree.tdr=Enregistreur de profondeur +observe.tree.transmittingBuoyOperation=Opération balise +observe.tree.transmittingBuoyType=Type de balise +observe.tree.tripLongline.unsaved=Nouvelle marée +observe.tree.tripSeine.unsaved=Nouvelle marée +observe.tree.tripType=Type de marée +observe.tree.vessel=Bateau +observe.tree.vesselActivityLongline=Activité bateau +observe.tree.vesselActivitySeine=Activité bateau +observe.tree.vesselSizeCategory=Catégorie de bateau +observe.tree.vesselType=Type de pêcherie +observe.tree.weightCategory=Catégorie de poids +observe.tree.weightMeasureType=Type de mesure de poids +observe.tree.wind=Vent Beaufort observe.tripLongline.captain=Capitaine observe.tripLongline.dataEntryOperator=Opérateur de saisie observe.tripLongline.endDate=Date fin @@ -1987,8 +2053,6 @@ observe.tripSeine.message.creating=La marée est en cours de création. observe.tripSeine.message.no.active.found=Aucune marée ouverte, vous pouvez soit en créer une nouvelle, soit en réouvrir une. observe.tripSeine.message.not.open=La marée courante n'est pas ouverte, aucune modification possible. observe.tripSeine.message.updating=La maréee est en cours de modification. -observe.tripSeine.tab.caracteristics=Autres caractéristiques -observe.tripSeine.tab.general=Caractéristiques générales observe.tripSeine.title=Marée observe.validation.report.contextName=Context de validation utilisé \: %1$s observe.validation.report.entities.with.messages=Nombre d'entités avec des messages \: %1$s -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit 8980667643dcc4611476b8be71ecf16a2291e961 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:15:39 2015 +0200 i18n --- .../src/main/resources/i18n/observe-validation_en_GB.properties | 4 ++++ .../src/main/resources/i18n/observe-validation_es_ES.properties | 4 ++++ .../src/main/resources/i18n/observe-validation_fr_FR.properties | 7 ++++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties b/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties index b1df383..8f93857 100644 --- a/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties +++ b/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties @@ -355,6 +355,7 @@ validator.tdr.desactivated.sensorBrand= validator.tdr.fishingEnd.before.deployementEnd= validator.tdr.fishingStart.before.fishingEnd= validator.tdr.required.position= +validator.transmittingBuoy.desactivated.country= validator.transmittingBuoy.desactivated.transmittingBuoyOperation= validator.transmittingBuoy.desactivated.transmittingBuoyType= validator.transmittingBuoy.null.code= @@ -364,6 +365,7 @@ validator.trip.comment.tobig= validator.trip.desactivated.captain= validator.trip.desactivated.dataEntryOperator= validator.trip.desactivated.departureHarbour= +validator.trip.desactivated.gear= validator.trip.desactivated.landingHarbour= validator.trip.desactivated.observer= validator.trip.desactivated.ocean= @@ -379,6 +381,7 @@ validator.trip.invalid.startDate= validator.trip.null.captain= validator.trip.null.dataEntryOperator= validator.trip.null.departureHarbour= +validator.trip.null.gearUseFeature= validator.trip.null.landingHarbour= validator.trip.required.comment.for.captain= validator.trip.required.comment.for.dataEntryOperator= @@ -390,6 +393,7 @@ validator.trip.required.comment.for.tripType= validator.trip.required.comment.for.vessel= validator.trip.required.departureHarbour= validator.trip.required.endDate= +validator.trip.required.gear= validator.trip.required.observer= validator.trip.required.ocean= validator.trip.required.startDate= diff --git a/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties b/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties index 0665513..17ad72d 100644 --- a/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties +++ b/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties @@ -355,6 +355,7 @@ validator.tdr.desactivated.sensorBrand= validator.tdr.fishingEnd.before.deployementEnd= validator.tdr.fishingStart.before.fishingEnd= validator.tdr.required.position= +validator.transmittingBuoy.desactivated.country= validator.transmittingBuoy.desactivated.transmittingBuoyOperation= validator.transmittingBuoy.desactivated.transmittingBuoyType= validator.transmittingBuoy.null.code=El código de baliza no ha sido especificado. @@ -364,6 +365,7 @@ validator.trip.comment.tobig=La longitud del campo de comentarios está limitado validator.trip.desactivated.captain= validator.trip.desactivated.dataEntryOperator= validator.trip.desactivated.departureHarbour= +validator.trip.desactivated.gear= validator.trip.desactivated.landingHarbour= validator.trip.desactivated.observer= validator.trip.desactivated.ocean=El oceano seleccionado está desactivado. @@ -379,6 +381,7 @@ validator.trip.invalid.startDate=La fecha de comienzo de marea debe ser inferior validator.trip.null.captain= validator.trip.null.dataEntryOperator= validator.trip.null.departureHarbour= +validator.trip.null.gearUseFeature= validator.trip.null.landingHarbour= validator.trip.required.comment.for.captain= validator.trip.required.comment.for.dataEntryOperator= @@ -390,6 +393,7 @@ validator.trip.required.comment.for.tripType= validator.trip.required.comment.for.vessel= validator.trip.required.departureHarbour= validator.trip.required.endDate=La fecha de fin de marea es obligatoria. +validator.trip.required.gear= validator.trip.required.observer= validator.trip.required.ocean=No se ha seleccionado océano. validator.trip.required.startDate=La fecha de comienzo de marea es obligatoria. diff --git a/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties b/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties index 58ef142..e010a5b 100644 --- a/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties +++ b/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties @@ -17,7 +17,6 @@ validator.activity.invalid.quadrant=Le quadrant n'est pas cohérent par rapport validator.activity.invalid.seaSurfaceTemperature=La température surface (%1$s) ne peut pas varier de plus de 12° par rapport à la température surface (%2$s) de l'activité précédente %3$s. validator.activity.invalid.speed=La vitesse de l'activité courante est de %s nd, alors que la vitesse maximale autorisée est %s nd validator.activity.null.dcp=Aucun objet flottant saisi. -validator.trip.null.gearUseFeature=Vous n'avez pas saisi d'équipement (Senne conseillée). validator.activity.null.fpaZone=La sélection d'une zone FPA est obligatoire. validator.activity.null.observedSystem=Aucun système observé sélectionné. validator.activity.null.observedSystemDistance=La distance au système observé n'est pas renseignée. @@ -356,6 +355,7 @@ validator.tdr.desactivated.sensorBrand=La marque sélectionnée est déasactivé validator.tdr.fishingEnd.before.deployementEnd=L'horodatage de fin de déploiement doit être après le début de celui de fin de pêche. validator.tdr.fishingStart.before.fishingEnd=L'horodatage de fin de pêche doit être après le début de celui de début de pêche. validator.tdr.required.position=Pas de position renseignée sur la palangre. +validator.transmittingBuoy.desactivated.country=Le pays sélectionné est désactivé. validator.transmittingBuoy.desactivated.transmittingBuoyOperation=L'operation balise sélectionnée est désactivée. validator.transmittingBuoy.desactivated.transmittingBuoyType=Le type de balise sélectionné est désactivé. validator.transmittingBuoy.null.code=Le code de la balise n'est pas renseigné. @@ -365,6 +365,7 @@ validator.trip.comment.tobig=La taille du commentaire est limitée à 1024 carac validator.trip.desactivated.captain=Le capitaine sélectionné est désactivé. validator.trip.desactivated.dataEntryOperator=Le saisisseur sélectionné est désactivé. validator.trip.desactivated.departureHarbour=Le port de départ sélectionné est désactivé. +validator.trip.desactivated.gear=L'équipement sélectionné est désactivé. validator.trip.desactivated.landingHarbour=Le port d'arrivée sélectionné est désactivé. validator.trip.desactivated.observer=L'observateur sélectionné est désactivé. validator.trip.desactivated.ocean=L'ocean sélectionné est désactivé. @@ -380,6 +381,7 @@ validator.trip.invalid.startDate=La date de début de marée doit être inférie validator.trip.null.captain=Pas de capitaine sélectionné. validator.trip.null.dataEntryOperator=Pas de saisisseur sélectionné. validator.trip.null.departureHarbour=Pas de port de départ sélectionné. +validator.trip.null.gearUseFeature=Vous n'avez pas saisi d'équipement (Senne conseillée). validator.trip.null.landingHarbour=Pas de port d'arrivée sélectionné. validator.trip.required.comment.for.captain=Un commentaire est requis pour le captiaine sélectionné. validator.trip.required.comment.for.dataEntryOperator=Un commentaire est requis pour le saisisseur sélectionné. @@ -389,10 +391,9 @@ validator.trip.required.comment.for.observer=Un commentaire est requis pour l'ob validator.trip.required.comment.for.ocean=Un commentaire est requis pour l'ocean sélectionné. validator.trip.required.comment.for.tripType=Un commentaire est requis pour le type de marée sélectionné. validator.trip.required.comment.for.vessel=Un commentaire est requis pour le navire sélectionné. -validator.trip.required.gear=L'équipement est obligatoire. -validator.trip.desactivated.gear=L'équipement sélectionné est désactivé. validator.trip.required.departureHarbour=La sélection d'un port de départ est obligatoire. validator.trip.required.endDate=La date de fin de marée est obligatoire. +validator.trip.required.gear=L'équipement est obligatoire. validator.trip.required.observer=La sélection d'un observateur est obligatoire. validator.trip.required.ocean=La sélection d'un océan est obligatoire. validator.trip.required.startDate=La date de début est obligatoire. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.