Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 523cb26c by Tony CHEMIT at 2018-07-05T09:23:19Z [LL] Schéma de palangre -> libellé missing - Closes #1017 - - - - - 1a9cfc2b by Tony CHEMIT at 2018-07-05T09:35:52Z [LL] Schéma de palangre -> libellé doublonné - Closes #1018 - - - - - 5 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jaxx - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - dto/src/main/resources/i18n/dto_en_GB.properties - dto/src/main/resources/i18n/dto_es_ES.properties - dto/src/main/resources/i18n/dto_fr_FR.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jaxx @@ -119,17 +119,15 @@ public void edit(BranchlineDto branchline) { getHandler().edit(branchline); } <cell anchor='east'> <JCheckBox id='timer' styleClass="i18n"/> </cell> - <cell> - <JLabel id='timeSinceContactLabel'/> - </cell> - <cell> + <cell columns="2"> <TimeEditor id='timeSinceContact' constructorParams='this'/> </cell> </row> <!-- timerTimeOnBoard --> <row> - <cell columns="3"> + <cell/> + <cell columns="2"> <DateTimeEditor id='timerTimeOnBoard' constructorParams='this'/> </cell> </row> ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java @@ -46,6 +46,7 @@ public class ObserveI18nLabelsBuilder extends I18nLabelsBuilder { static { n("observe.common.I18nReferentialDto.label"); + n("observe.common.SetLonglineGlobalCompositionDto.type"); } private static final ObserveI18nLabelsBuilder INSTANCE = new ObserveI18nLabelsBuilder(null); ===================================== dto/src/main/resources/i18n/dto_en_GB.properties ===================================== --- a/dto/src/main/resources/i18n/dto_en_GB.properties +++ b/dto/src/main/resources/i18n/dto_en_GB.properties @@ -163,6 +163,7 @@ observe.common.SetLonglineDto.title=Fishing operation observe.common.SetLonglineDto.type=Set observe.common.SetLonglineDto.types=Sets observe.common.SetLonglineGlobalCompositionDto.title=Global composition +observe.common.SetLonglineGlobalCompositionDto.type=Global composition observe.common.SetSeineDto.title=Set observe.common.SetSeineDto.type=Set observe.common.SetSeineDto.types=Sets ===================================== dto/src/main/resources/i18n/dto_es_ES.properties ===================================== --- a/dto/src/main/resources/i18n/dto_es_ES.properties +++ b/dto/src/main/resources/i18n/dto_es_ES.properties @@ -161,6 +161,7 @@ observe.common.SetLonglineDto.title=Operación de pesca observe.common.SetLonglineDto.type=Operación de pesca observe.common.SetLonglineDto.types=Operaciones de pesca observe.common.SetLonglineGlobalCompositionDto.title=Composición global del palangre +observe.common.SetLonglineGlobalCompositionDto.type=Composición global del palangre observe.common.SetSeineDto.title=Lance observe.common.SetSeineDto.type=Lance observe.common.SetSeineDto.types=Lances ===================================== dto/src/main/resources/i18n/dto_fr_FR.properties ===================================== --- a/dto/src/main/resources/i18n/dto_fr_FR.properties +++ b/dto/src/main/resources/i18n/dto_fr_FR.properties @@ -163,6 +163,7 @@ observe.common.SetLonglineDto.title=Opération de pêche observe.common.SetLonglineDto.type=Opération de pêche observe.common.SetLonglineDto.types=Opérations de pêche observe.common.SetLonglineGlobalCompositionDto.title=Composition globale de la palangre +observe.common.SetLonglineGlobalCompositionDto.type=Composition globale de la palangre observe.common.SetSeineDto.title=Calée observe.common.SetSeineDto.type=Calée observe.common.SetSeineDto.types=Calées View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/dde1b60d70213fe398d2a937382... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/dde1b60d70213fe398d2a937382... You're receiving this email because of your account on gitlab.com.