Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a5b592a6 by Tony CHEMIT at 2017-08-25T17:40:31+02:00 Ajout d'un nouvel éditeur de température qui permet les conversions °C/°F (See #860) - - - - - 19 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/simple/longline/BranchlineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/simple/longline/SetLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/simple/seine/SetSeineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/table/longline/TdrUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/table/seine/NonTargetCatchReleaseUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java - pom.xml - validation/src/main/resources/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties Changes: ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -421,6 +421,10 @@ <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-config</artifactId> </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-temperature</artifactId> + </dependency> <!-- commons dependencies --> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss @@ -21,7 +21,7 @@ */ JLabel { - computeI18n:"" + computeI18n:""; } JButton { @@ -30,10 +30,12 @@ JButton { TimeEditor { bean:{bean}; + computeI18n:""; } DateTimeEditor { bean:{bean}; + computeI18n:""; } CoordinatesEditor { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java +++ b/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; import fr.ird.observe.client.ui.actions.content.GoToTab6UIAction; import fr.ird.observe.client.ui.actions.content.GoToTabUIActionSupport; import fr.ird.observe.client.ui.util.BooleanEditor; -import fr.ird.observe.services.decoration.ObserveI18nLabelsBuilder; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.client.ui.util.tripMap.ObserveMapPane; import fr.ird.observe.client.validation.ObserveSwingValidator; import fr.ird.observe.services.decoration.DecoratorService; import fr.ird.observe.services.decoration.ObserveI18nDecoratorHelper; +import fr.ird.observe.services.decoration.ObserveI18nLabelsBuilder; import fr.ird.observe.services.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.services.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.services.dto.DataDto; @@ -114,6 +114,9 @@ import org.nuiton.jaxx.widgets.select.BeanComboBox; import org.nuiton.jaxx.widgets.select.BeanListHeader; import org.nuiton.jaxx.widgets.select.BeanUIUtil; import org.nuiton.jaxx.widgets.select.FilterableDoubleList; +import org.nuiton.jaxx.widgets.temperature.TemperatureEditor; +import org.nuiton.jaxx.widgets.temperature.TemperatureEditorConfig; +import org.nuiton.jaxx.widgets.temperature.TemperatureFormat; import org.nuiton.util.DateUtil; @@ -309,6 +312,10 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } if (o instanceof JLabel) { init((JLabel) o); + continue; + } + if (o instanceof TemperatureEditor) { + init((TemperatureEditor) o); } } @@ -322,6 +329,20 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } } + private void init(TemperatureEditor editor) { + NumberEditor numberEditor = editor.getEditor(); + numberEditor.setShowReset(true); + numberEditor.setAutoPopup(ui.getConfig().isAutoPopupNumberEditor()); + numberEditor.setShowPopupButton(ui.getConfig().isShowNumberEditorButton()); + + String propertyName = editor.getName(); + JLabel label = (JLabel) ui.getObjectById(propertyName + "Label"); + Objects.requireNonNull(label, "can't find label for temperatur editor " + editor); + editor.setConfig(new TemperatureEditorConfig(TemperatureFormat.C, getBean(), label.getText(), propertyName)); + editor.init(label); + + } + private void init(JLabel editor) { String editorName = StringUtils.removeEnd(editor.getName(), "Label"); Object objectById = ui.getObjectById(editorName); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUI.jaxx @@ -41,6 +41,10 @@ fr.ird.observe.client.ui.actions.main.global.NewNextDataGlobalUIAction fr.ird.observe.client.ui.util.JComment + org.nuiton.jaxx.widgets.temperature.TemperatureFormat + org.nuiton.jaxx.widgets.temperature.TemperatureEditor + org.nuiton.jaxx.widgets.temperature.TemperatureEditorConfig + org.nuiton.jaxx.widgets.number.NumberEditor org.nuiton.jaxx.widgets.select.BeanComboBox @@ -76,7 +80,7 @@ <!-- date - time --> <row> <cell columns="2" weightx="1"> - <DateTimeEditor id='timeStamp' constructorParams='this' styleClass="i18n"/> + <DateTimeEditor id='timeStamp' constructorParams='this'/> </cell> </row> @@ -114,7 +118,7 @@ <JLabel id='seaSurfaceTemperatureLabel'/> </cell> <cell anchor='east' fill="both"> - <NumberEditor id='seaSurfaceTemperature' constructorParams='this' styleClass="float2"/> + <TemperatureEditor id='seaSurfaceTemperature' constructorParams='this'/> </cell> </row> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUI.jcss @@ -59,8 +59,8 @@ } #seaSurfaceTemperature { - property:{ActivityLonglineDto.PROPERTY_SEA_SURFACE_TEMPERATURE}; - numberValue:{bean.getSeaSurfaceTemperature()}; + format:{TemperatureFormat.C}; + storageTemperature:{bean.getSeaSurfaceTemperature()}; } #reopen { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/longline/ActivityLonglineUIHandler.java @@ -211,7 +211,7 @@ class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglin super.startEditUI( ActivityLonglineUI.BINDING_TIME_STAMP_DATE, - ActivityLonglineUI.BINDING_SEA_SURFACE_TEMPERATURE_NUMBER_VALUE, + ActivityLonglineUI.BINDING_SEA_SURFACE_TEMPERATURE_STORAGE_TEMPERATURE, ActivityLonglineUI.BINDING_COMMENT_MODEL, ActivityLonglineUI.BINDING_VESSEL_ACTIVITY_LONGLINE_SELECTED_ITEM, ActivityLonglineUI.BINDING_FPA_ZONE_SELECTED_ITEM, ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUI.jaxx @@ -40,6 +40,10 @@ fr.ird.observe.services.dto.referential.seine.DetectionModeDto fr.ird.observe.services.dto.referential.seine.WindDto + org.nuiton.jaxx.widgets.temperature.TemperatureFormat + org.nuiton.jaxx.widgets.temperature.TemperatureEditor + org.nuiton.jaxx.widgets.temperature.TemperatureEditorConfig + fr.ird.observe.client.ui.actions.content.DeleteDataUIAction fr.ird.observe.client.ui.actions.content.AddActivitySeineSetUIAction fr.ird.observe.client.ui.actions.content.AddActivitySeineFloatingObjectUIAction @@ -199,7 +203,7 @@ <JLabel id='seaSurfaceTemperatureLabel'/> </cell> <cell anchor='east' fill="both"> - <NumberEditor id='seaSurfaceTemperature' constructorParams='this' styleClass="float2"/> + <TemperatureEditor id='seaSurfaceTemperature' constructorParams='this'/> </cell> </row> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUI.jcss @@ -104,8 +104,8 @@ } #seaSurfaceTemperature { - property:{ActivitySeineDto.PROPERTY_SEA_SURFACE_TEMPERATURE}; - numberValue:{bean.getSeaSurfaceTemperature()}; + format:{TemperatureFormat.C}; + storageTemperature:{bean.getSeaSurfaceTemperature()}; } #wind { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/seine/ActivitySeineUIHandler.java @@ -264,7 +264,7 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto, super.startEditUI(ActivitySeineUI.BINDING_TIME_TIME, ActivitySeineUI.BINDING_VESSEL_SPEED_NUMBER_VALUE, - ActivitySeineUI.BINDING_SEA_SURFACE_TEMPERATURE_NUMBER_VALUE, + ActivitySeineUI.BINDING_SEA_SURFACE_TEMPERATURE_STORAGE_TEMPERATURE, ActivitySeineUI.BINDING_COMMENT_MODEL, ActivitySeineUI.BINDING_VESSEL_ACTIVITY_SEINE_SELECTED_ITEM, ActivitySeineUI.BINDING_PREVIOUS_FPA_ZONE_SELECTED_ITEM, ===================================== client/src/main/java/fr/ird/observe/client/ui/content/simple/longline/BranchlineUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/simple/longline/BranchlineUI.jaxx +++ b/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); } <!-- timerTimeOnBoard --> <row> <cell columns="3"> - <DateTimeEditor id='timerTimeOnBoard' constructorParams='this' styleClass="i18n"/> + <DateTimeEditor id='timerTimeOnBoard' constructorParams='this'/> </cell> </row> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/simple/longline/SetLonglineUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/simple/longline/SetLonglineUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/simple/longline/SetLonglineUI.jaxx @@ -130,7 +130,7 @@ <!-- setting start timeStamp --> <row> <cell weightx="1"> - <DateTimeEditor id='settingStartTimeStamp' constructorParams='this' styleClass="i18n"/> + <DateTimeEditor id='settingStartTimeStamp' constructorParams='this'/> </cell> </row> @@ -144,7 +144,7 @@ <!-- setting end timeStamp --> <row> <cell> - <DateTimeEditor id='settingEndTimeStamp' constructorParams='this' styleClass="i18n"/> + <DateTimeEditor id='settingEndTimeStamp' constructorParams='this'/> </cell> </row> @@ -354,7 +354,7 @@ <!-- hauling start timeStamp --> <row> <cell columns="2" weightx="1"> - <DateTimeEditor id='haulingStartTimeStamp' constructorParams='this' styleClass="i18n"/> + <DateTimeEditor id='haulingStartTimeStamp' constructorParams='this'/> </cell> </row> @@ -368,7 +368,7 @@ <!-- hauling end timeStamp --> <row> <cell columns="2" weightx="1"> - <DateTimeEditor id='haulingEndTimeStamp' constructorParams='this' styleClass="i18n"/> + <DateTimeEditor id='haulingEndTimeStamp' constructorParams='this'/> </cell> </row> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/simple/seine/SetSeineUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/simple/seine/SetSeineUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/simple/seine/SetSeineUI.jaxx @@ -74,17 +74,17 @@ <Table fill="both"> <row> <cell weightx="1" columns="2"> - <DateTimeEditor id='startTime' constructorParams='this' styleClass="i18n"/> + <DateTimeEditor id='startTime' constructorParams='this'/> </cell> </row> <row> <cell weightx="1" columns="2"> - <DateTimeEditor id='endPursingTimeStamp' constructorParams='this' styleClass="i18n"/> + <DateTimeEditor id='endPursingTimeStamp' constructorParams='this'/> </cell> </row> <row> <cell weightx="1" columns="2"> - <DateTimeEditor id='endSetTimeStamp' constructorParams='this' styleClass="i18n"/> + <DateTimeEditor id='endSetTimeStamp' constructorParams='this'/> </cell> </row> <row> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/longline/TdrUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/longline/TdrUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/longline/TdrUI.jaxx @@ -265,25 +265,25 @@ <!-- deployementStart --> <row> <cell weightx="1" fill="both"> - <DateTimeEditor id='deployementStart' constructorParams='this' styleClass="i18n"/> + <DateTimeEditor id='deployementStart' constructorParams='this'/> </cell> </row> <!-- fishingStart --> <row> <cell> - <DateTimeEditor id='fishingStart' constructorParams='this' styleClass="i18n"/> + <DateTimeEditor id='fishingStart' constructorParams='this'/> </cell> </row> <!-- fishingEnd --> <row> <cell> - <DateTimeEditor id='fishingEnd' constructorParams='this' styleClass="i18n"/> + <DateTimeEditor id='fishingEnd' constructorParams='this'/> </cell> </row> <!-- deployementEnd --> <row> <cell> - <DateTimeEditor id='deployementEnd' constructorParams='this' styleClass="i18n"/> + <DateTimeEditor id='deployementEnd' constructorParams='this'/> </cell> </row> </Table> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/seine/NonTargetCatchReleaseUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/seine/NonTargetCatchReleaseUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/seine/NonTargetCatchReleaseUI.jaxx @@ -154,13 +154,13 @@ <!-- detection time --> <row> <cell columns="2" weightx="1"> - <DateTimeEditor id='detectionTime' constructorParams='this' styleClass="i18n"/> + <DateTimeEditor id='detectionTime' constructorParams='this'/> </cell> </row> <!-- release time --> <row> <cell columns="2" weightx="1"> - <DateTimeEditor id='releaseTime' constructorParams='this' styleClass="i18n"/> + <DateTimeEditor id='releaseTime' constructorParams='this'/> </cell> </row> ===================================== client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java +++ b/client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java @@ -93,65 +93,6 @@ public class UIHelper extends SwingUtil { static private final Log log = LogFactory.getLog(UIHelper.class); /** - * Pattern to use for short numeric values in editors with max 3 digits. - * - * @since 2.3 - */ - public static final String INT_3_DIGITS_PATTERN = "\\d{0,3}"; - - /** - * Pattern to use for integer numeric values in editors with max 6 digits. - * - * @since 2.3 - */ - public static final String INT_6_DIGITS_PATTERN = "\\d{0,6}"; - - /** - * Pattern to use for integer numeric values in editors with max 7 digits. - * - * @since 2.3 - */ - public static final String INT_7_DIGITS_PATTERN = "\\d{0,7}"; - - /** - * Pattern to use for long numeric values in editors with max 10 digits. - * - * @since 3.7 - */ - public static final String LONG_10_DIGITS_PATTERN = "\\d{0,10}"; - - /** - * Pattern to use for decimal numeric values with 1 decimal digits in - * editors. - * - * @since 2.3 - */ - public static final String DECIMAL1_PATTERN = "\\d{0,6}|\\d{1,6}.\\d{0,1}"; - - /** - * Pattern to use for decimal numeric values with 2 decimal digits in - * editors. - * - * @since 2.3 - */ - public static final String DECIMAL2_PATTERN = "\\d{0,6}|\\d{1,6}.\\d{0,2}"; - - /** - * Pattern to use for decimal numeric values with 3 decimal digits in - * editors. - * - * @since 2.3 - */ - public static final String DECIMAL3_PATTERN = "\\d{0,6}|\\d{1,6}.\\d{0,3}"; - /** - * Pattern to use for decimal numeric values with 4 decimal digits in - * editors. - * - * @since 5.0.3 - */ - public static final String DECIMAL4_PATTERN = "\\d{0,6}|\\d{1,6}.\\d{0,4}"; - - /** * Components which must NOT be blocked by any layer in ui. * * @since 2.0 @@ -508,17 +449,17 @@ public class UIHelper extends SwingUtil { clipboard.setContents(selection, selection); } - public static void setMainUIVisible(final ObserveMainUI ui) { - - // force le redimensionnement du splitpane - ui.getSplitpane().revalidate(); - - // force le redimensionnement du splitpane2 - ui.getSplitpane2().revalidate(); - - // affichage de l'interface graphique - SwingUtilities.invokeLater(() -> ui.setVisible(true)); - } +// public static void setMainUIVisible(final ObserveMainUI ui) { +// +// // force le redimensionnement du splitpane +// ui.getSplitpane().revalidate(); +// +// // force le redimensionnement du splitpane2 +// ui.getSplitpane2().revalidate(); +// +// // affichage de l'interface graphique +// SwingUtilities.invokeLater(() -> ui.setVisible(true)); +// } public static void stopEditing(JTable table) { TableCellEditor cellEditor = table.getCellEditor(); @@ -600,7 +541,7 @@ public class UIHelper extends SwingUtil { } - static protected <E extends Throwable> boolean containsExceptionInStack(Throwable e, Class<E> type) { + private static <E extends Throwable> boolean containsExceptionInStack(Throwable e, Class<E> type) { if (type.isInstance(e)) { return true; ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -168,7 +168,7 @@ <eugenePluginVersion>3.0-alpha-11</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>3.0-alpha-11</jaxxVersion> + <jaxxVersion>3.0-alpha-12-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>4.0-alpha-4</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> @@ -568,6 +568,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-widgets-temperature</artifactId> + <version>${jaxxVersion}</version> + </dependency> <!--swingX --> <dependency> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== --- a/validation/src/main/resources/i18n/validation_en_GB.properties +++ b/validation/src/main/resources/i18n/validation_en_GB.properties @@ -4,7 +4,7 @@ observe.common.ActivityLonglineDto.fpaZone=FPA Zone observe.common.ActivityLonglineDto.latitude=Latitude observe.common.ActivityLonglineDto.longitude=Longitude observe.common.ActivityLonglineDto.quadrant=Quadrant -observe.common.ActivityLonglineDto.seaSurfaceTemperature=SST (°c) +observe.common.ActivityLonglineDto.seaSurfaceTemperature=SST observe.common.ActivityLonglineDto.time=Time observe.common.ActivityLonglineDto.vesselActivityLongline=Vessel activity observe.common.ActivityLonglineEncounterDto.comment=Comment ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== --- a/validation/src/main/resources/i18n/validation_es_ES.properties +++ b/validation/src/main/resources/i18n/validation_es_ES.properties @@ -4,7 +4,7 @@ observe.common.ActivityLonglineDto.fpaZone=Zona FPA observe.common.ActivityLonglineDto.latitude=Latitud observe.common.ActivityLonglineDto.longitude=Longitude observe.common.ActivityLonglineDto.quadrant=Quadrant -observe.common.ActivityLonglineDto.seaSurfaceTemperature=Temperatura de la superficie (°c) +observe.common.ActivityLonglineDto.seaSurfaceTemperature=Temperatura de la superficie observe.common.ActivityLonglineDto.time=Hora observe.common.ActivityLonglineDto.vesselActivityLongline=Actividad barco observe.common.ActivityLonglineEncounterDto.comment=Comentarios @@ -21,7 +21,7 @@ observe.common.ActivitySeineDto.observedSystemDistance=Distancia al sistema obse observe.common.ActivitySeineDto.previousFpaZone=La zona FPA de que se salió observe.common.ActivitySeineDto.quadrant=Quadrant observe.common.ActivitySeineDto.reasonForNoFishing=Razón de no pesca Senne -observe.common.ActivitySeineDto.seaSurfaceTemperature=Temperatura en superficie (°) +observe.common.ActivitySeineDto.seaSurfaceTemperature=Temperatura en superficie observe.common.ActivitySeineDto.surroundingActivity=Actividad circundante observe.common.ActivitySeineDto.time=Hora de la observación observe.common.ActivitySeineDto.vesselActivitySeine=Actividad buque ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== --- a/validation/src/main/resources/i18n/validation_fr_FR.properties +++ b/validation/src/main/resources/i18n/validation_fr_FR.properties @@ -4,7 +4,7 @@ observe.common.ActivityLonglineDto.fpaZone=Zone FPA observe.common.ActivityLonglineDto.latitude=Latitude observe.common.ActivityLonglineDto.longitude=Longitude observe.common.ActivityLonglineDto.quadrant=Quadrant -observe.common.ActivityLonglineDto.seaSurfaceTemperature=Température surface (°c) +observe.common.ActivityLonglineDto.seaSurfaceTemperature=Température surface observe.common.ActivityLonglineDto.time=Heure observe.common.ActivityLonglineDto.vesselActivityLongline=Activité bateau observe.common.ActivityLonglineEncounterDto.comment=Commentaire @@ -21,7 +21,7 @@ observe.common.ActivitySeineDto.observedSystemDistance=Distance système observ observe.common.ActivitySeineDto.previousFpaZone=Zone FPA quittée observe.common.ActivitySeineDto.quadrant=Quadrant observe.common.ActivitySeineDto.reasonForNoFishing=Raison de non coup de Senne -observe.common.ActivitySeineDto.seaSurfaceTemperature=Température surface (°) +observe.common.ActivitySeineDto.seaSurfaceTemperature=Température surface observe.common.ActivitySeineDto.surroundingActivity=Activité environnante observe.common.ActivitySeineDto.time=Heure d'observation observe.common.ActivitySeineDto.vesselActivitySeine=Activité bateau View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a5b592a6e0330a062285fb17b858... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a5b592a6e0330a062285fb17b858... You're receiving this email because of your account on gitlab.com.