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

Commits:

19 changed files:

Changes:

  • client/pom.xml
    ... ... @@ -421,6 +421,10 @@
    421 421 
           <groupId>io.ultreia.java4all.jaxx</groupId>
    422 422 
           <artifactId>jaxx-widgets-config</artifactId>
    423 423 
         </dependency>
    424 
    +    <dependency>
    425 
    +      <groupId>io.ultreia.java4all.jaxx</groupId>
    426 
    +      <artifactId>jaxx-widgets-temperature</artifactId>
    427 
    +    </dependency>
    424 428
    425 429 
         <!-- commons dependencies -->
    426 430

  • client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss
    ... ... @@ -21,7 +21,7 @@
    21 21 
      */
    22 22
    23 23 
     JLabel {
    24 
    -  computeI18n:""
    24 
    +  computeI18n:"";
    25 25 
     }
    26 26
    27 27 
     JButton {
    ... ... @@ -30,10 +30,12 @@ JButton {
    30 30
    31 31 
     TimeEditor {
    32 32 
       bean:{bean};
    33 
    +  computeI18n:"";
    33 34 
     }
    34 35
    35 36 
     DateTimeEditor {
    36 37 
       bean:{bean};
    38 
    +  computeI18n:"";
    37 39 
     }
    38 40
    39 41 
     CoordinatesEditor {

  • client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java
    ... ... @@ -39,12 +39,12 @@ import fr.ird.observe.client.ui.actions.content.GoToTab5UIAction;
    39 39 
     import fr.ird.observe.client.ui.actions.content.GoToTab6UIAction;
    40 40 
     import fr.ird.observe.client.ui.actions.content.GoToTabUIActionSupport;
    41 41 
     import fr.ird.observe.client.ui.util.BooleanEditor;
    42 
    -import fr.ird.observe.services.decoration.ObserveI18nLabelsBuilder;
    43 42 
     import fr.ird.observe.client.ui.util.UIHelper;
    44 43 
     import fr.ird.observe.client.ui.util.tripMap.ObserveMapPane;
    45 44 
     import fr.ird.observe.client.validation.ObserveSwingValidator;
    46 45 
     import fr.ird.observe.services.decoration.DecoratorService;
    47 46 
     import fr.ird.observe.services.decoration.ObserveI18nDecoratorHelper;
    47 
    +import fr.ird.observe.services.decoration.ObserveI18nLabelsBuilder;
    48 48 
     import fr.ird.observe.services.decoration.decorators.DataReferenceDecorator;
    49 49 
     import fr.ird.observe.services.decoration.decorators.ReferentialReferenceDecorator;
    50 50 
     import fr.ird.observe.services.dto.DataDto;
    ... ... @@ -114,6 +114,9 @@ import org.nuiton.jaxx.widgets.select.BeanComboBox;
    114 114 
     import org.nuiton.jaxx.widgets.select.BeanListHeader;
    115 115 
     import org.nuiton.jaxx.widgets.select.BeanUIUtil;
    116 116 
     import org.nuiton.jaxx.widgets.select.FilterableDoubleList;
    117 
    +import org.nuiton.jaxx.widgets.temperature.TemperatureEditor;
    118 
    +import org.nuiton.jaxx.widgets.temperature.TemperatureEditorConfig;
    119 
    +import org.nuiton.jaxx.widgets.temperature.TemperatureFormat;
    117 120 
     import org.nuiton.util.DateUtil;
    118 121
    119 122
    ... ... @@ -309,6 +312,10 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>>
    309 312 
                 }
    310 313 
                 if (o instanceof JLabel) {
    311 314 
                     init((JLabel) o);
    315 
    +                continue;
    316 
    +            }
    317 
    +            if (o instanceof TemperatureEditor) {
    318 
    +                init((TemperatureEditor) o);
    312 319 
                 }
    313 320
    314 321 
             }
    ... ... @@ -322,6 +329,20 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>>
    322 329 
             }
    323 330 
         }
    324 331
    332 
    +    private void init(TemperatureEditor editor) {
    333 
    +        NumberEditor numberEditor = editor.getEditor();
    334 
    +        numberEditor.setShowReset(true);
    335 
    +        numberEditor.setAutoPopup(ui.getConfig().isAutoPopupNumberEditor());
    336 
    +        numberEditor.setShowPopupButton(ui.getConfig().isShowNumberEditorButton());
    337 
    +
    338 
    +        String propertyName = editor.getName();
    339 
    +        JLabel label = (JLabel) ui.getObjectById(propertyName + "Label");
    340 
    +        Objects.requireNonNull(label, "can't find label for temperatur editor " + editor);
    341 
    +        editor.setConfig(new TemperatureEditorConfig(TemperatureFormat.C, getBean(), label.getText(), propertyName));
    342 
    +        editor.init(label);
    343 
    +
    344 
    +    }
    345 
    +
    325 346 
         private void init(JLabel editor) {
    326 347 
             String editorName = StringUtils.removeEnd(editor.getName(), "Label");
    327 348 
             Object objectById = ui.getObjectById(editorName);

  • client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUI.jaxx
    ... ... @@ -41,6 +41,10 @@
    41 41 
         fr.ird.observe.client.ui.actions.main.global.NewNextDataGlobalUIAction
    42 42 
         fr.ird.observe.client.ui.util.JComment
    43 43
    44 
    +    org.nuiton.jaxx.widgets.temperature.TemperatureFormat
    45 
    +    org.nuiton.jaxx.widgets.temperature.TemperatureEditor
    46 
    +    org.nuiton.jaxx.widgets.temperature.TemperatureEditorConfig
    47 
    +
    44 48 
         org.nuiton.jaxx.widgets.number.NumberEditor
    45 49 
         org.nuiton.jaxx.widgets.select.BeanComboBox
    46 50
    ... ... @@ -76,7 +80,7 @@
    76 80 
           <!-- date - time -->
    77 81 
           <row>
    78 82 
             <cell columns="2" weightx="1">
    79 
    -          <DateTimeEditor id='timeStamp' constructorParams='this' styleClass="i18n"/>
    83 
    +          <DateTimeEditor id='timeStamp' constructorParams='this'/>
    80 84 
             </cell>
    81 85 
           </row>
    82 86
    ... ... @@ -114,7 +118,7 @@
    114 118 
               <JLabel id='seaSurfaceTemperatureLabel'/>
    115 119 
             </cell>
    116 120 
             <cell anchor='east' fill="both">
    117 
    -          <NumberEditor id='seaSurfaceTemperature' constructorParams='this' styleClass="float2"/>
    121 
    +          <TemperatureEditor id='seaSurfaceTemperature' constructorParams='this'/>
    118 122 
             </cell>
    119 123 
           </row>
    120 124

  • client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUI.jcss
    ... ... @@ -59,8 +59,8 @@
    59 59 
     }
    60 60
    61 61 
     #seaSurfaceTemperature {
    62 
    -  property:{ActivityLonglineDto.PROPERTY_SEA_SURFACE_TEMPERATURE};
    63 
    -  numberValue:{bean.getSeaSurfaceTemperature()};
    62 
    +  format:{TemperatureFormat.C};
    63 
    +  storageTemperature:{bean.getSeaSurfaceTemperature()};
    64 64 
     }
    65 65
    66 66 
     #reopen {

  • client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUIHandler.java
    ... ... @@ -211,7 +211,7 @@ class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglin
    211 211
    212 212 
             super.startEditUI(
    213 213 
                     ActivityLonglineUI.BINDING_TIME_STAMP_DATE,
    214 
    -                ActivityLonglineUI.BINDING_SEA_SURFACE_TEMPERATURE_NUMBER_VALUE,
    214 
    +                ActivityLonglineUI.BINDING_SEA_SURFACE_TEMPERATURE_STORAGE_TEMPERATURE,
    215 215 
                     ActivityLonglineUI.BINDING_COMMENT_MODEL,
    216 216 
                     ActivityLonglineUI.BINDING_VESSEL_ACTIVITY_LONGLINE_SELECTED_ITEM,
    217 217 
                     ActivityLonglineUI.BINDING_FPA_ZONE_SELECTED_ITEM,

  • client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUI.jaxx
    ... ... @@ -40,6 +40,10 @@
    40 40 
         fr.ird.observe.services.dto.referential.seine.DetectionModeDto
    41 41 
         fr.ird.observe.services.dto.referential.seine.WindDto
    42 42
    43 
    +    org.nuiton.jaxx.widgets.temperature.TemperatureFormat
    44 
    +    org.nuiton.jaxx.widgets.temperature.TemperatureEditor
    45 
    +    org.nuiton.jaxx.widgets.temperature.TemperatureEditorConfig
    46 
    +
    43 47 
         fr.ird.observe.client.ui.actions.content.DeleteDataUIAction
    44 48 
         fr.ird.observe.client.ui.actions.content.AddActivitySeineSetUIAction
    45 49 
         fr.ird.observe.client.ui.actions.content.AddActivitySeineFloatingObjectUIAction
    ... ... @@ -199,7 +203,7 @@
    199 203 
                         <JLabel id='seaSurfaceTemperatureLabel'/>
    200 204 
                       </cell>
    201 205 
                       <cell anchor='east' fill="both">
    202 
    -                    <NumberEditor id='seaSurfaceTemperature' constructorParams='this' styleClass="float2"/>
    206 
    +                    <TemperatureEditor id='seaSurfaceTemperature' constructorParams='this'/>
    203 207 
                       </cell>
    204 208 
                     </row>
    205 209

  • client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUI.jcss
    ... ... @@ -104,8 +104,8 @@
    104 104 
     }
    105 105
    106 106 
     #seaSurfaceTemperature {
    107 
    -  property:{ActivitySeineDto.PROPERTY_SEA_SURFACE_TEMPERATURE};
    108 
    -  numberValue:{bean.getSeaSurfaceTemperature()};
    107 
    +  format:{TemperatureFormat.C};
    108 
    +  storageTemperature:{bean.getSeaSurfaceTemperature()};
    109 109 
     }
    110 110
    111 111 
     #wind {

  • client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUIHandler.java
    ... ... @@ -264,7 +264,7 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto,
    264 264
    265 265 
             super.startEditUI(ActivitySeineUI.BINDING_TIME_TIME,
    266 266 
                               ActivitySeineUI.BINDING_VESSEL_SPEED_NUMBER_VALUE,
    267 
    -                          ActivitySeineUI.BINDING_SEA_SURFACE_TEMPERATURE_NUMBER_VALUE,
    267 
    +                          ActivitySeineUI.BINDING_SEA_SURFACE_TEMPERATURE_STORAGE_TEMPERATURE,
    268 268 
                               ActivitySeineUI.BINDING_COMMENT_MODEL,
    269 269 
                               ActivitySeineUI.BINDING_VESSEL_ACTIVITY_SEINE_SELECTED_ITEM,
    270 270 
                               ActivitySeineUI.BINDING_PREVIOUS_FPA_ZONE_SELECTED_ITEM,

  • client/src/main/java/fr/ird/observe/client/ui/content/simple/longline/BranchlineUI.jaxx
    ... ... @@ -135,7 +135,7 @@ public void edit(BranchlineDto branchline) { getHandler().edit(branchline); }
    135 135 
                       <!-- timerTimeOnBoard -->
    136 136 
                       <row>
    137 137 
                         <cell columns="3">
    138 
    -                      <DateTimeEditor id='timerTimeOnBoard' constructorParams='this' styleClass="i18n"/>
    138 
    +                      <DateTimeEditor id='timerTimeOnBoard' constructorParams='this'/>
    139 139 
                         </cell>
    140 140 
                       </row>
    141 141

  • client/src/main/java/fr/ird/observe/client/ui/content/simple/longline/SetLonglineUI.jaxx
    ... ... @@ -130,7 +130,7 @@
    130 130 
                             <!-- setting start timeStamp -->
    131 131 
                             <row>
    132 132 
                               <cell weightx="1">
    133 
    -                            <DateTimeEditor id='settingStartTimeStamp' constructorParams='this' styleClass="i18n"/>
    133 
    +                            <DateTimeEditor id='settingStartTimeStamp' constructorParams='this'/>
    134 134 
                               </cell>
    135 135 
                             </row>
    136 136
    ... ... @@ -144,7 +144,7 @@
    144 144 
                             <!-- setting end timeStamp -->
    145 145 
                             <row>
    146 146 
                               <cell>
    147 
    -                            <DateTimeEditor id='settingEndTimeStamp' constructorParams='this' styleClass="i18n"/>
    147 
    +                            <DateTimeEditor id='settingEndTimeStamp' constructorParams='this'/>
    148 148 
                               </cell>
    149 149 
                             </row>
    150 150
    ... ... @@ -354,7 +354,7 @@
    354 354 
                       <!-- hauling start timeStamp -->
    355 355 
                       <row>
    356 356 
                         <cell columns="2" weightx="1">
    357 
    -                      <DateTimeEditor id='haulingStartTimeStamp' constructorParams='this' styleClass="i18n"/>
    357 
    +                      <DateTimeEditor id='haulingStartTimeStamp' constructorParams='this'/>
    358 358 
                         </cell>
    359 359 
                       </row>
    360 360
    ... ... @@ -368,7 +368,7 @@
    368 368 
                       <!-- hauling end timeStamp -->
    369 369 
                       <row>
    370 370 
                         <cell columns="2" weightx="1">
    371 
    -                      <DateTimeEditor id='haulingEndTimeStamp' constructorParams='this' styleClass="i18n"/>
    371 
    +                      <DateTimeEditor id='haulingEndTimeStamp' constructorParams='this'/>
    372 372 
                         </cell>
    373 373 
                       </row>
    374 374

  • client/src/main/java/fr/ird/observe/client/ui/content/simple/seine/SetSeineUI.jaxx
    ... ... @@ -74,17 +74,17 @@
    74 74 
                   <Table fill="both">
    75 75 
                     <row>
    76 76 
                       <cell weightx="1" columns="2">
    77 
    -                    <DateTimeEditor id='startTime' constructorParams='this' styleClass="i18n"/>
    77 
    +                    <DateTimeEditor id='startTime' constructorParams='this'/>
    78 78 
                       </cell>
    79 79 
                     </row>
    80 80 
                     <row>
    81 81 
                       <cell weightx="1" columns="2">
    82 
    -                    <DateTimeEditor id='endPursingTimeStamp' constructorParams='this' styleClass="i18n"/>
    82 
    +                    <DateTimeEditor id='endPursingTimeStamp' constructorParams='this'/>
    83 83 
                       </cell>
    84 84 
                     </row>
    85 85 
                     <row>
    86 86 
                       <cell weightx="1" columns="2">
    87 
    -                    <DateTimeEditor id='endSetTimeStamp' constructorParams='this' styleClass="i18n"/>
    87 
    +                    <DateTimeEditor id='endSetTimeStamp' constructorParams='this'/>
    88 88 
                       </cell>
    89 89 
                     </row>
    90 90 
                     <row>

  • client/src/main/java/fr/ird/observe/client/ui/content/table/longline/TdrUI.jaxx
    ... ... @@ -265,25 +265,25 @@
    265 265 
                       <!-- deployementStart -->
    266 266 
                       <row>
    267 267 
                         <cell weightx="1" fill="both">
    268 
    -                      <DateTimeEditor id='deployementStart' constructorParams='this' styleClass="i18n"/>
    268 
    +                      <DateTimeEditor id='deployementStart' constructorParams='this'/>
    269 269 
                         </cell>
    270 270 
                       </row>
    271 271 
                       <!-- fishingStart -->
    272 272 
                       <row>
    273 273 
                         <cell>
    274 
    -                      <DateTimeEditor id='fishingStart' constructorParams='this' styleClass="i18n"/>
    274 
    +                      <DateTimeEditor id='fishingStart' constructorParams='this'/>
    275 275 
                         </cell>
    276 276 
                       </row>
    277 277 
                       <!-- fishingEnd -->
    278 278 
                       <row>
    279 279 
                         <cell>
    280 
    -                      <DateTimeEditor id='fishingEnd' constructorParams='this' styleClass="i18n"/>
    280 
    +                      <DateTimeEditor id='fishingEnd' constructorParams='this'/>
    281 281 
                         </cell>
    282 282 
                       </row>
    283 283 
                       <!-- deployementEnd -->
    284 284 
                       <row>
    285 285 
                         <cell>
    286 
    -                      <DateTimeEditor id='deployementEnd' constructorParams='this' styleClass="i18n"/>
    286 
    +                      <DateTimeEditor id='deployementEnd' constructorParams='this'/>
    287 287 
                         </cell>
    288 288 
                       </row>
    289 289 
                     </Table>

  • client/src/main/java/fr/ird/observe/client/ui/content/table/seine/NonTargetCatchReleaseUI.jaxx
    ... ... @@ -154,13 +154,13 @@
    154 154 
         <!-- detection time -->
    155 155 
         <row>
    156 156 
           <cell columns="2" weightx="1">
    157 
    -        <DateTimeEditor id='detectionTime' constructorParams='this' styleClass="i18n"/>
    157 
    +        <DateTimeEditor id='detectionTime' constructorParams='this'/>
    158 158 
           </cell>
    159 159 
         </row>
    160 160 
         <!-- release time -->
    161 161 
         <row>
    162 162 
           <cell columns="2" weightx="1">
    163 
    -        <DateTimeEditor id='releaseTime' constructorParams='this' styleClass="i18n"/>
    163 
    +        <DateTimeEditor id='releaseTime' constructorParams='this'/>
    164 164 
           </cell>
    165 165 
         </row>
    166 166

  • client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java
    ... ... @@ -93,65 +93,6 @@ public class UIHelper extends SwingUtil {
    93 93 
         static private final Log log = LogFactory.getLog(UIHelper.class);
    94 94
    95 95 
         /**
    96 
    -     * Pattern to use for short numeric values in editors with max 3 digits.
    97 
    -     *
    98 
    -     * @since 2.3
    99 
    -     */
    100 
    -    public static final String INT_3_DIGITS_PATTERN = "\\d{0,3}";
    101 
    -
    102 
    -    /**
    103 
    -     * Pattern to use for integer numeric values in editors with max 6 digits.
    104 
    -     *
    105 
    -     * @since 2.3
    106 
    -     */
    107 
    -    public static final String INT_6_DIGITS_PATTERN = "\\d{0,6}";
    108 
    -
    109 
    -    /**
    110 
    -     * Pattern to use for integer numeric values in editors with max 7 digits.
    111 
    -     *
    112 
    -     * @since 2.3
    113 
    -     */
    114 
    -    public static final String INT_7_DIGITS_PATTERN = "\\d{0,7}";
    115 
    -
    116 
    -    /**
    117 
    -     * Pattern to use for long numeric values in editors with max 10 digits.
    118 
    -     *
    119 
    -     * @since 3.7
    120 
    -     */
    121 
    -    public static final String LONG_10_DIGITS_PATTERN = "\\d{0,10}";
    122 
    -
    123 
    -    /**
    124 
    -     * Pattern to use for decimal numeric values with 1 decimal digits in
    125 
    -     * editors.
    126 
    -     *
    127 
    -     * @since 2.3
    128 
    -     */
    129 
    -    public static final String DECIMAL1_PATTERN = "\\d{0,6}|\\d{1,6}.\\d{0,1}";
    130 
    -
    131 
    -    /**
    132 
    -     * Pattern to use for decimal numeric values with 2 decimal digits in
    133 
    -     * editors.
    134 
    -     *
    135 
    -     * @since 2.3
    136 
    -     */
    137 
    -    public static final String DECIMAL2_PATTERN = "\\d{0,6}|\\d{1,6}.\\d{0,2}";
    138 
    -
    139 
    -    /**
    140 
    -     * Pattern to use for decimal numeric values with 3 decimal digits in
    141 
    -     * editors.
    142 
    -     *
    143 
    -     * @since 2.3
    144 
    -     */
    145 
    -    public static final String DECIMAL3_PATTERN = "\\d{0,6}|\\d{1,6}.\\d{0,3}";
    146 
    -    /**
    147 
    -     * Pattern to use for decimal numeric values with 4 decimal digits in
    148 
    -     * editors.
    149 
    -     *
    150 
    -     * @since 5.0.3
    151 
    -     */
    152 
    -    public static final String DECIMAL4_PATTERN = "\\d{0,6}|\\d{1,6}.\\d{0,4}";
    153 
    -
    154 
    -    /**
    155 96 
          * Components which must NOT be blocked by any layer in ui.
    156 97 
          *
    157 98 
          * @since 2.0
    ... ... @@ -508,17 +449,17 @@ public class UIHelper extends SwingUtil {
    508 449 
             clipboard.setContents(selection, selection);
    509 450 
         }
    510 451
    511 
    -    public static void setMainUIVisible(final ObserveMainUI ui) {
    512 
    -
    513 
    -        // force le redimensionnement du splitpane
    514 
    -        ui.getSplitpane().revalidate();
    515 
    -
    516 
    -        // force le redimensionnement du splitpane2
    517 
    -        ui.getSplitpane2().revalidate();
    518 
    -
    519 
    -        // affichage de l'interface graphique
    520 
    -        SwingUtilities.invokeLater(() -> ui.setVisible(true));
    521 
    -    }
    452 
    +//    public static void setMainUIVisible(final ObserveMainUI ui) {
    453 
    +//
    454 
    +//        // force le redimensionnement du splitpane
    455 
    +//        ui.getSplitpane().revalidate();
    456 
    +//
    457 
    +//        // force le redimensionnement du splitpane2
    458 
    +//        ui.getSplitpane2().revalidate();
    459 
    +//
    460 
    +//        // affichage de l'interface graphique
    461 
    +//        SwingUtilities.invokeLater(() -> ui.setVisible(true));
    462 
    +//    }
    522 463
    523 464 
         public static void stopEditing(JTable table) {
    524 465 
             TableCellEditor cellEditor = table.getCellEditor();
    ... ... @@ -600,7 +541,7 @@ public class UIHelper extends SwingUtil {
    600 541
    601 542 
         }
    602 543
    603 
    -    static protected <E extends Throwable> boolean containsExceptionInStack(Throwable e, Class<E> type) {
    544 
    +    private static <E extends Throwable> boolean containsExceptionInStack(Throwable e, Class<E> type) {
    604 545
    605 546 
             if (type.isInstance(e)) {
    606 547 
                 return true;

  • pom.xml
    ... ... @@ -168,7 +168,7 @@
    168 168 
         <eugenePluginVersion>3.0-alpha-11</eugenePluginVersion>
    169 169 
         <processorPluginVersion>1.3</processorPluginVersion>
    170 170
    171 
    -    <jaxxVersion>3.0-alpha-11</jaxxVersion>
    171 
    +    <jaxxVersion>3.0-alpha-12-SNAPSHOT</jaxxVersion>
    172 172 
         <nuitonI18nVersion>4.0-alpha-4</nuitonI18nVersion>
    173 173 
         <nuitonConfigVersion>3.2</nuitonConfigVersion>
    174 174 
         <topiaVersion>3.2.1</topiaVersion>
    ... ... @@ -568,6 +568,11 @@
    568 568 
               </exclusion>
    569 569 
             </exclusions>
    570 570 
           </dependency>
    571 
    +      <dependency>
    572 
    +        <groupId>io.ultreia.java4all.jaxx</groupId>
    573 
    +        <artifactId>jaxx-widgets-temperature</artifactId>
    574 
    +        <version>${jaxxVersion}</version>
    575 
    +      </dependency>
    571 576
    572 577 
           <!--swingX -->
    573 578 
           <dependency>

  • validation/src/main/resources/i18n/validation_en_GB.properties
    ... ... @@ -4,7 +4,7 @@ observe.common.ActivityLonglineDto.fpaZone=FPA Zone
    4 4 
     observe.common.ActivityLonglineDto.latitude=Latitude
    5 5 
     observe.common.ActivityLonglineDto.longitude=Longitude
    6 6 
     observe.common.ActivityLonglineDto.quadrant=Quadrant
    7 
    -observe.common.ActivityLonglineDto.seaSurfaceTemperature=SST (°c)
    7 
    +observe.common.ActivityLonglineDto.seaSurfaceTemperature=SST
    8 8 
     observe.common.ActivityLonglineDto.time=Time
    9 9 
     observe.common.ActivityLonglineDto.vesselActivityLongline=Vessel activity
    10 10 
     observe.common.ActivityLonglineEncounterDto.comment=Comment

  • validation/src/main/resources/i18n/validation_es_ES.properties
    ... ... @@ -4,7 +4,7 @@ observe.common.ActivityLonglineDto.fpaZone=Zona FPA
    4 4 
     observe.common.ActivityLonglineDto.latitude=Latitud
    5 5 
     observe.common.ActivityLonglineDto.longitude=Longitude
    6 6 
     observe.common.ActivityLonglineDto.quadrant=Quadrant
    7 
    -observe.common.ActivityLonglineDto.seaSurfaceTemperature=Temperatura de la superficie (°c)
    7 
    +observe.common.ActivityLonglineDto.seaSurfaceTemperature=Temperatura de la superficie
    8 8 
     observe.common.ActivityLonglineDto.time=Hora
    9 9 
     observe.common.ActivityLonglineDto.vesselActivityLongline=Actividad barco
    10 10 
     observe.common.ActivityLonglineEncounterDto.comment=Comentarios
    ... ... @@ -21,7 +21,7 @@ observe.common.ActivitySeineDto.observedSystemDistance=Distancia al sistema obse
    21 21 
     observe.common.ActivitySeineDto.previousFpaZone=La zona FPA de que se salió
    22 22 
     observe.common.ActivitySeineDto.quadrant=Quadrant
    23 23 
     observe.common.ActivitySeineDto.reasonForNoFishing=Razón de no pesca Senne
    24 
    -observe.common.ActivitySeineDto.seaSurfaceTemperature=Temperatura en superficie (°)
    24 
    +observe.common.ActivitySeineDto.seaSurfaceTemperature=Temperatura en superficie
    25 25 
     observe.common.ActivitySeineDto.surroundingActivity=Actividad circundante
    26 26 
     observe.common.ActivitySeineDto.time=Hora de la observación
    27 27 
     observe.common.ActivitySeineDto.vesselActivitySeine=Actividad buque

  • validation/src/main/resources/i18n/validation_fr_FR.properties
    ... ... @@ -4,7 +4,7 @@ observe.common.ActivityLonglineDto.fpaZone=Zone FPA
    4 4 
     observe.common.ActivityLonglineDto.latitude=Latitude
    5 5 
     observe.common.ActivityLonglineDto.longitude=Longitude
    6 6 
     observe.common.ActivityLonglineDto.quadrant=Quadrant
    7 
    -observe.common.ActivityLonglineDto.seaSurfaceTemperature=Température surface (°c)
    7 
    +observe.common.ActivityLonglineDto.seaSurfaceTemperature=Température surface
    8 8 
     observe.common.ActivityLonglineDto.time=Heure
    9 9 
     observe.common.ActivityLonglineDto.vesselActivityLongline=Activité bateau
    10 10 
     observe.common.ActivityLonglineEncounterDto.comment=Commentaire
    ... ... @@ -21,7 +21,7 @@ observe.common.ActivitySeineDto.observedSystemDistance=Distance système observ
    21 21 
     observe.common.ActivitySeineDto.previousFpaZone=Zone FPA quittée
    22 22 
     observe.common.ActivitySeineDto.quadrant=Quadrant
    23 23 
     observe.common.ActivitySeineDto.reasonForNoFishing=Raison de non coup de Senne
    24 
    -observe.common.ActivitySeineDto.seaSurfaceTemperature=Température surface (°)
    24 
    +observe.common.ActivitySeineDto.seaSurfaceTemperature=Température surface
    25 25 
     observe.common.ActivitySeineDto.surroundingActivity=Activité environnante
    26 26 
     observe.common.ActivitySeineDto.time=Heure d'observation
    27 27 
     observe.common.ActivitySeineDto.vesselActivitySeine=Activité bateau

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.