Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 2d4fc8a1 by tchemit at 2019-06-25T13:30:47Z Stash observations - - - - - 7 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/RouteSeineListNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/RouteSeineObsListNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -977,7 +977,7 @@ observe.ui.tree.data.ps.floatingObject.unsaved observe.ui.tree.data.ps.nonTargetCatchRelease observe.ui.tree.data.ps.objectObservedSpecies observe.ui.tree.data.ps.objectSchoolEstimate -observe.ui.tree.data.ps.route.list +observe.ui.tree.data.ps.obs.route.list observe.ui.tree.data.ps.route.unsaved observe.ui.tree.data.ps.sample observe.ui.tree.data.ps.schoolEstimate ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/RouteSeineListNavigationTreeNode.java → client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/RouteSeineObsListNavigationTreeNode.java ===================================== @@ -42,10 +42,10 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev@tchemit.fr * @since 6.0 */ -public class RouteSeineListNavigationTreeNode extends ClassNavigationTreeNode<RouteDto> implements WithChildsToReload, MultipleReferenceContainerNode<RouteDto, RouteReference> { +public class RouteSeineObsListNavigationTreeNode extends ClassNavigationTreeNode<RouteDto> implements WithChildsToReload, MultipleReferenceContainerNode<RouteDto, RouteReference> { - RouteSeineListNavigationTreeNode() { - super(RouteDto.class, true, t("observe.ui.tree.data.ps.route.list")); + RouteSeineObsListNavigationTreeNode() { + super(RouteDto.class, true, t("observe.ui.tree.data.ps.obs.route.list")); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java ===================================== @@ -43,7 +43,7 @@ public class TripSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSupp super(data, ObserveSeineTripSelectNode.class, ObserveSeineTripEditNode.class, true); if (isPersisted()) { add(new GearUseFeaturesSeineNavigationTreeNode()); - add(new RouteSeineListNavigationTreeNode()); + add(new RouteSeineObsListNavigationTreeNode()); } } ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -3187,7 +3187,7 @@ observe.ui.tree.data.ps.keptTargetSample=Target sample catch observe.ui.tree.data.ps.nonTargetCatchRelease=Non target released catches observe.ui.tree.data.ps.objectObservedSpecies=Object observed species observe.ui.tree.data.ps.objectSchoolEstimate=Object school estimates -observe.ui.tree.data.ps.route.list=Routes +observe.ui.tree.data.ps.obs.route.list=Observations observe.ui.tree.data.ps.route.unsaved=New route observe.ui.tree.data.ps.routes=Routes observe.ui.tree.data.ps.sample=Samples ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -3187,7 +3187,7 @@ observe.ui.tree.data.ps.keptTargetSample=Muestreo atún capturado observe.ui.tree.data.ps.nonTargetCatchRelease=Modo de liberación observe.ui.tree.data.ps.objectObservedSpecies=Fauna observada observe.ui.tree.data.ps.objectSchoolEstimate=Estimaciones banco de objetos -observe.ui.tree.data.ps.route.list=Rutas +observe.ui.tree.data.ps.obs.route.list=Observations \#TODO observe.ui.tree.data.ps.route.unsaved=Nueva ruta observe.ui.tree.data.ps.routes=Rutas observe.ui.tree.data.ps.sample=Muestreos \#TODO ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -3187,7 +3187,7 @@ observe.ui.tree.data.ps.keptTargetSample=Échantillons thons conservés observe.ui.tree.data.ps.nonTargetCatchRelease=Modes de libération observe.ui.tree.data.ps.objectObservedSpecies=Faune observée observe.ui.tree.data.ps.objectSchoolEstimate=Estimations banc objet -observe.ui.tree.data.ps.route.list=Routes +observe.ui.tree.data.ps.obs.route.list=Observations observe.ui.tree.data.ps.route.unsaved=Nouvelle route observe.ui.tree.data.ps.routes=Routes observe.ui.tree.data.ps.sample=Échantillons ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -27,7 +27,6 @@ observe.validation.lengthWeightParameter.invalid.lengthWeightFormula observe.validation.lengthWeightParameter.invalid.uniqueKey observe.validation.lengthWeightParameter.invalid.weightLengthFormula observe.validation.objectMaterial.invalid.validation -observe.validation.objectObservedSpecies.positive.count observe.validation.referential.disabled observe.validation.referential.label1.untranslated observe.validation.referential.label3.untranslated View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2d4fc8a1d318b381af3d68392224... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2d4fc8a1d318b381af3d68392224... You're receiving this email because of your account on gitlab.com.