[Git][ultreiaio/ird-observe][develop] pb traduction pop up activité observée associée - Closes #1289 - Observe-commits

21 May 2019


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


Commits:
be2ea0d2 by tchemit at 2019-05-21T16:02:41Z
pb traduction pop up activité observée associée - Closes #1289

- - - - -


9 changed files:

- client-core/src/main/i18n/getters/java.getter
- client-core/src/main/i18n/getters/jaxx.getter
- client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingConfigUI.jcss
- 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
- services/src/main/i18n/getters/java.getter
- services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItem.java
- services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItemDecorator.java


Changes:

=====================================
client-core/src/main/i18n/getters/java.getter
=====================================
@@ -999,6 +999,7 @@ observe.ui.tree.longline.encounter
 observe.ui.tree.longline.logbook.activity.list
 observe.ui.tree.longline.logbook.activity.unsaved
 observe.ui.tree.longline.logbook.landing.list
+observe.ui.tree.longline.logbook.landing.unsaved
 observe.ui.tree.longline.logbook.sample.list
 observe.ui.tree.longline.logbook.sample.unsaved
 observe.ui.tree.longline.logbook.set.unsaved


=====================================
client-core/src/main/i18n/getters/jaxx.getter
=====================================
@@ -100,10 +100,6 @@ observe.common.ActivityLonglineObsDto.timeStamp
 observe.common.ActivityLonglineObsDto.title
 observe.common.ActivityLonglineObsDto.titles
 observe.common.ActivityLonglineObsDto.vesselActivityLongline
-observe.common.ActivityLonglinePairingResultItemDto.computedDistance
-observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue
-observe.common.ActivityLonglinePairingResultItemDto.computedTime
-observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue
 observe.common.ActivitySeineDto.availableObservedSystem
 observe.common.ActivitySeineDto.comment
 observe.common.ActivitySeineDto.coordinate
@@ -899,6 +895,10 @@ observe.common.WithFormula.coefficientsInformation
 observe.common.WithFormula.equation
 observe.common.WithFormula.source
 observe.common.acquisitionMode
+observe.common.activityLonglinePairingResultItem.computedDistance
+observe.common.activityLonglinePairingResultItem.computedDistanceValue
+observe.common.activityLonglinePairingResultItem.computedTime
+observe.common.activityLonglinePairingResultItem.computedTimeValue
 observe.common.description
 observe.common.directory
 observe.common.file


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingConfigUI.jcss
=====================================
@@ -25,7 +25,7 @@
 }
 
 #longlineActivityPairingMaxTimeLabel {
-  text:"observe.common.ActivityLonglinePairingResultItemDto.computedTime";
+  text:"observe.common.activityLonglinePairingResultItem.computedTime";
 }
 
 #longlineActivityPairingMaxTime {
@@ -35,7 +35,7 @@
 }
 
 #longlineActivityPairingMaxDistanceLabel {
-  text:"observe.common.ActivityLonglinePairingResultItemDto.computedDistance";
+  text:"observe.common.activityLonglinePairingResultItem.computedDistance";
 }
 
 #longlineActivityPairingMaxDistance {


=====================================
observe-i18n/src/main/i18n/translations/observe_en_GB.properties
=====================================
@@ -465,12 +465,6 @@ observe.common.ActivityLonglineObsDto.types=Activities
 observe.common.ActivityLonglineObsDto.vesselActivityLongline=Vessel activity
 observe.common.ActivityLonglineObsEncounterDto.comment=Comment
 observe.common.ActivityLonglineObsSensorUsedDto.comment=Comment
-observe.common.ActivityLonglinePairingResultItemDto.computedDistance=Distance (km)
-observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue=Distance (%s kms)
-observe.common.ActivityLonglinePairingResultItemDto.computedTime=Time (minutes)
-observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue=Time (%s minutes)
-observe.common.ActivityLonglinePairingResultItemDto.observationActivity=Observed activity
-observe.common.ActivityLonglinePairingResultItemDto.type=Observed activity
 observe.common.ActivityObsDto.action.goToOpen.short=Observations - Open activity
 observe.common.ActivityObsDto.action.goToOpen.tip=Go to open activity (Observations)
 observe.common.ActivitySeineDto.action.addFloatingObject=Add FAD
@@ -2570,6 +2564,12 @@ observe.common.action.selectFirst.tip=Select first entry
 observe.common.action.selectLast.tip=Select last entry
 observe.common.action.selectNext.tip=Select next entry
 observe.common.action.selectPrevious.tip=Select previous entry
+observe.common.activityLonglinePairingResultItem=Observed activity
+observe.common.activityLonglinePairingResultItem.computedDistance=Distance (km)
+observe.common.activityLonglinePairingResultItem.computedDistanceValue=Distance (%s kms)
+observe.common.activityLonglinePairingResultItem.computedTime=Time (minutes)
+observe.common.activityLonglinePairingResultItem.computedTimeValue=Time (%s minutes)
+observe.common.activityLonglinePairingResultItem.observationActivity=Observed activity
 observe.common.boolean.false=No
 observe.common.boolean.null=Undefined
 observe.common.boolean.true=Yes


=====================================
observe-i18n/src/main/i18n/translations/observe_es_ES.properties
=====================================
@@ -465,12 +465,6 @@ observe.common.ActivityLonglineObsDto.types=Actividades
 observe.common.ActivityLonglineObsDto.vesselActivityLongline=Actividad barco
 observe.common.ActivityLonglineObsEncounterDto.comment=Comentarios
 observe.common.ActivityLonglineObsSensorUsedDto.comment=Comentarios
-observe.common.ActivityLonglinePairingResultItemDto.computedDistance=Distance (km) \#TODO
-observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue=Distance (%s kms) \#TODO
-observe.common.ActivityLonglinePairingResultItemDto.computedTime=Time (minutes) \#TODO
-observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue=Time (%s minutes) \#TODO
-observe.common.ActivityLonglinePairingResultItemDto.observationActivity=Observed activity \#TODO
-observe.common.ActivityLonglinePairingResultItemDto.type=Observed activity \#TODO
 observe.common.ActivityObsDto.action.goToOpen.short=Observations - Open activity \#TODO
 observe.common.ActivityObsDto.action.goToOpen.tip=Go to open activity (Observations) \#TODO
 observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un FOB
@@ -2570,6 +2564,12 @@ observe.common.action.selectFirst.tip=Select first entry
 observe.common.action.selectLast.tip=Select last entry
 observe.common.action.selectNext.tip=Select next entry
 observe.common.action.selectPrevious.tip=Select previous entry
+observe.common.activityLonglinePairingResultItem=Observed activity \#TODO
+observe.common.activityLonglinePairingResultItem.computedDistance=Distance (km) \#TODO
+observe.common.activityLonglinePairingResultItem.computedDistanceValue=Distance (%s kms) \#TODO
+observe.common.activityLonglinePairingResultItem.computedTime=Time (minutes) \#TODO
+observe.common.activityLonglinePairingResultItem.computedTimeValue=Time (%s minutes) \#TODO
+observe.common.activityLonglinePairingResultItem.observationActivity=Observed activity \#TODO
 observe.common.boolean.false=No
 observe.common.boolean.null=Indeterminado
 observe.common.boolean.true=Si


=====================================
observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
=====================================
@@ -465,12 +465,6 @@ observe.common.ActivityLonglineObsDto.types=Activités
 observe.common.ActivityLonglineObsDto.vesselActivityLongline=Activité bateau
 observe.common.ActivityLonglineObsEncounterDto.comment=Commentaire
 observe.common.ActivityLonglineObsSensorUsedDto.comment=Commentaire
-observe.common.ActivityLonglinePairingResultItemDto.computedDistance=Distance (km)
-observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue=Distance (%s kms)
-observe.common.ActivityLonglinePairingResultItemDto.computedTime=Temps (minutes)
-observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue=Temps (%s minutes)
-observe.common.ActivityLonglinePairingResultItemDto.observationActivity=Activité observée
-observe.common.ActivityLonglinePairingResultItemDto.type=Activité observée
 observe.common.ActivityObsDto.action.goToOpen.short=Observations - Activité ouverte
 observe.common.ActivityObsDto.action.goToOpen.tip=Accéder à l'activité ouverte (Observations)
 observe.common.ActivitySeineDto.action.addFloatingObject=Ajouter un DCP
@@ -2570,6 +2564,12 @@ observe.common.action.selectFirst.tip=Sélectionner la première entrée
 observe.common.action.selectLast.tip=Sélectionner la dernière entrée
 observe.common.action.selectNext.tip=Sélectionner l'entrée suivante
 observe.common.action.selectPrevious.tip=Sélectionner l'entrée précédente
+observe.common.activityLonglinePairingResultItem=Activité observée
+observe.common.activityLonglinePairingResultItem.computedDistance=Distance (km)
+observe.common.activityLonglinePairingResultItem.computedDistanceValue=Distance (%s kms)
+observe.common.activityLonglinePairingResultItem.computedTime=Temps (minutes)
+observe.common.activityLonglinePairingResultItem.computedTimeValue=Temps (%s minutes)
+observe.common.activityLonglinePairingResultItem.observationActivity=Activité observée
 observe.common.boolean.false=Non
 observe.common.boolean.null=Indéterminé
 observe.common.boolean.true=Oui


=====================================
services/src/main/i18n/getters/java.getter
=====================================
@@ -1,6 +1,6 @@
-observe.common.ActivityLonglinePairingResultItemDto.computedDistance
-observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue
-observe.common.ActivityLonglinePairingResultItemDto.computedTime
-observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue
-observe.common.ActivityLonglinePairingResultItemDto.observationActivity
-observe.common.ActivityLonglinePairingResultItemDto.type
+observe.common.activityLonglinePairingResultItem
+observe.common.activityLonglinePairingResultItem.computedDistance
+observe.common.activityLonglinePairingResultItem.computedDistanceValue
+observe.common.activityLonglinePairingResultItem.computedTime
+observe.common.activityLonglinePairingResultItem.computedTimeValue
+observe.common.activityLonglinePairingResultItem.observationActivity


=====================================
services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItem.java
=====================================
@@ -28,6 +28,8 @@ import io.ultreia.java4all.lang.Numbers;
 
 import java.util.Objects;
 
+import static io.ultreia.java4all.i18n.I18n.n;
+
 /**
  * Created by tchemit on 15/10/2018.
  *
@@ -35,6 +37,10 @@ import java.util.Objects;
  */
 public class ActivityLonglinePairingResultItem implements ObserveDto {
 
+    static {
+        n("observe.common.activityLonglinePairingResultItem");
+
+    }
     private final ActivityLonglineObsReference observationActivity;
     private final long computedTime;
     private final double computedDistance;


=====================================
services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItemDecorator.java
=====================================
@@ -41,10 +41,10 @@ import static io.ultreia.java4all.i18n.I18n.n;
 public class ActivityLonglinePairingResultItemDecorator extends ObserveDecorator<ActivityLonglinePairingResultItem> {
 
     static {
-        n("observe.common.ActivityLonglinePairingResultItemDto.type");
-        n("observe.common.ActivityLonglinePairingResultItemDto.observationActivity");
-        n("observe.common.ActivityLonglinePairingResultItemDto.computedTime");
-        n("observe.common.ActivityLonglinePairingResultItemDto.computedDistance");
+        n("observe.common.activityLonglinePairingResultItem");
+        n("observe.common.activityLonglinePairingResultItem.observationActivity");
+        n("observe.common.activityLonglinePairingResultItem.computedTime");
+        n("observe.common.activityLonglinePairingResultItem.computedDistance");
     }
 
     private final Locale locale;
@@ -62,9 +62,9 @@ public class ActivityLonglinePairingResultItemDecorator extends ObserveDecorator
         Object value0 = jxcontext.getValue(token);
         switch (token) {
             case "computedTime":
-                return (Comparable) l(locale, "observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue", value0);
+                return (Comparable) l(locale, "observe.common.activityLonglinePairingResultItem.computedTimeValue", value0);
             case "computedDistance":
-                return (Comparable) l(locale, "observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue", value0);
+                return (Comparable) l(locale, "observe.common.activityLonglinePairingResultItem.computedDistanceValue", value0);
             case "observationActivity":
                 return (Comparable) activityDecorator.toString(value0);
         }



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/be2ea0d2b81eee06774fc64a3723...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/be2ea0d2b81eee06774fc64a3723...
You're receiving this email because of your account on gitlab.com.

    

[Git][ultreiaio/ird-observe][develop] pb traduction pop up activité observée associée - Closes #1289

Tony CHEMIT

tags

participants (1)