Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe

Commits:

7 changed files:

Changes:

  • client-core/src/main/i18n/getters/java.getter
    ... ... @@ -977,7 +977,7 @@ observe.ui.tree.data.ps.floatingObject.unsaved
    977 977
     observe.ui.tree.data.ps.nonTargetCatchRelease
    
    978 978
     observe.ui.tree.data.ps.objectObservedSpecies
    
    979 979
     observe.ui.tree.data.ps.objectSchoolEstimate
    
    980
    -observe.ui.tree.data.ps.route.list
    
    980
    +observe.ui.tree.data.ps.obs.route.list
    
    981 981
     observe.ui.tree.data.ps.route.unsaved
    
    982 982
     observe.ui.tree.data.ps.sample
    
    983 983
     observe.ui.tree.data.ps.schoolEstimate
    

  • client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/RouteSeineListNavigationTreeNode.javaclient-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;
    42 42
      * @author Tony Chemit - dev@tchemit.fr
    
    43 43
      * @since 6.0
    
    44 44
      */
    
    45
    -public class RouteSeineListNavigationTreeNode extends ClassNavigationTreeNode<RouteDto> implements WithChildsToReload, MultipleReferenceContainerNode<RouteDto, RouteReference> {
    
    45
    +public class RouteSeineObsListNavigationTreeNode extends ClassNavigationTreeNode<RouteDto> implements WithChildsToReload, MultipleReferenceContainerNode<RouteDto, RouteReference> {
    
    46 46
     
    
    47
    -    RouteSeineListNavigationTreeNode() {
    
    48
    -        super(RouteDto.class, true, t("observe.ui.tree.data.ps.route.list"));
    
    47
    +    RouteSeineObsListNavigationTreeNode() {
    
    48
    +        super(RouteDto.class, true, t("observe.ui.tree.data.ps.obs.route.list"));
    
    49 49
         }
    
    50 50
     
    
    51 51
         @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
    43 43
             super(data, ObserveSeineTripSelectNode.class, ObserveSeineTripEditNode.class, true);
    
    44 44
             if (isPersisted()) {
    
    45 45
                 add(new GearUseFeaturesSeineNavigationTreeNode());
    
    46
    -            add(new RouteSeineListNavigationTreeNode());
    
    46
    +            add(new RouteSeineObsListNavigationTreeNode());
    
    47 47
             }
    
    48 48
         }
    
    49 49
     
    

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -3187,7 +3187,7 @@ observe.ui.tree.data.ps.keptTargetSample=Target sample catch
    3187 3187
     observe.ui.tree.data.ps.nonTargetCatchRelease=Non target released catches
    
    3188 3188
     observe.ui.tree.data.ps.objectObservedSpecies=Object observed species
    
    3189 3189
     observe.ui.tree.data.ps.objectSchoolEstimate=Object school estimates
    
    3190
    -observe.ui.tree.data.ps.route.list=Routes
    
    3190
    +observe.ui.tree.data.ps.obs.route.list=Observations
    
    3191 3191
     observe.ui.tree.data.ps.route.unsaved=New route
    
    3192 3192
     observe.ui.tree.data.ps.routes=Routes
    
    3193 3193
     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
    3187 3187
     observe.ui.tree.data.ps.nonTargetCatchRelease=Modo de liberación
    
    3188 3188
     observe.ui.tree.data.ps.objectObservedSpecies=Fauna observada
    
    3189 3189
     observe.ui.tree.data.ps.objectSchoolEstimate=Estimaciones banco de objetos
    
    3190
    -observe.ui.tree.data.ps.route.list=Rutas
    
    3190
    +observe.ui.tree.data.ps.obs.route.list=Observations \#TODO
    
    3191 3191
     observe.ui.tree.data.ps.route.unsaved=Nueva ruta
    
    3192 3192
     observe.ui.tree.data.ps.routes=Rutas
    
    3193 3193
     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
    3187 3187
     observe.ui.tree.data.ps.nonTargetCatchRelease=Modes de libération
    
    3188 3188
     observe.ui.tree.data.ps.objectObservedSpecies=Faune observée
    
    3189 3189
     observe.ui.tree.data.ps.objectSchoolEstimate=Estimations banc objet
    
    3190
    -observe.ui.tree.data.ps.route.list=Routes
    
    3190
    +observe.ui.tree.data.ps.obs.route.list=Observations
    
    3191 3191
     observe.ui.tree.data.ps.route.unsaved=Nouvelle route
    
    3192 3192
     observe.ui.tree.data.ps.routes=Routes
    
    3193 3193
     observe.ui.tree.data.ps.sample=Échantillons
    

  • validation/src/main/i18n/getters/validation-messages.getter
    ... ... @@ -27,7 +27,6 @@ observe.validation.lengthWeightParameter.invalid.lengthWeightFormula
    27 27
     observe.validation.lengthWeightParameter.invalid.uniqueKey
    
    28 28
     observe.validation.lengthWeightParameter.invalid.weightLengthFormula
    
    29 29
     observe.validation.objectMaterial.invalid.validation
    
    30
    -observe.validation.objectObservedSpecies.positive.count
    
    31 30
     observe.validation.referential.disabled
    
    32 31
     observe.validation.referential.label1.untranslated
    
    33 32
     observe.validation.referential.label3.untranslated