Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
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:
| ... | ... | @@ -119,17 +119,15 @@ public void edit(BranchlineDto branchline) { getHandler().edit(branchline); } |
| 119 | 119 |
<cell anchor='east'>
|
| 120 | 120 |
<JCheckBox id='timer' styleClass="i18n"/>
|
| 121 | 121 |
</cell>
|
| 122 |
- <cell>
|
|
| 123 |
- <JLabel id='timeSinceContactLabel'/>
|
|
| 124 |
- </cell>
|
|
| 125 |
- <cell>
|
|
| 122 |
+ <cell columns="2">
|
|
| 126 | 123 |
<TimeEditor id='timeSinceContact' constructorParams='this'/>
|
| 127 | 124 |
</cell>
|
| 128 | 125 |
</row>
|
| 129 | 126 |
|
| 130 | 127 |
<!-- timerTimeOnBoard -->
|
| 131 | 128 |
<row>
|
| 132 |
- <cell columns="3">
|
|
| 129 |
+ <cell/>
|
|
| 130 |
+ <cell columns="2">
|
|
| 133 | 131 |
<DateTimeEditor id='timerTimeOnBoard' constructorParams='this'/>
|
| 134 | 132 |
</cell>
|
| 135 | 133 |
</row>
|
| ... | ... | @@ -46,6 +46,7 @@ public class ObserveI18nLabelsBuilder extends I18nLabelsBuilder { |
| 46 | 46 |
|
| 47 | 47 |
static {
|
| 48 | 48 |
n("observe.common.I18nReferentialDto.label");
|
| 49 |
+ n("observe.common.SetLonglineGlobalCompositionDto.type");
|
|
| 49 | 50 |
}
|
| 50 | 51 |
|
| 51 | 52 |
private static final ObserveI18nLabelsBuilder INSTANCE = new ObserveI18nLabelsBuilder(null);
|
| ... | ... | @@ -163,6 +163,7 @@ observe.common.SetLonglineDto.title=Fishing operation |
| 163 | 163 |
observe.common.SetLonglineDto.type=Set
|
| 164 | 164 |
observe.common.SetLonglineDto.types=Sets
|
| 165 | 165 |
observe.common.SetLonglineGlobalCompositionDto.title=Global composition
|
| 166 |
+observe.common.SetLonglineGlobalCompositionDto.type=Global composition
|
|
| 166 | 167 |
observe.common.SetSeineDto.title=Set
|
| 167 | 168 |
observe.common.SetSeineDto.type=Set
|
| 168 | 169 |
observe.common.SetSeineDto.types=Sets
|
| ... | ... | @@ -161,6 +161,7 @@ observe.common.SetLonglineDto.title=Operación de pesca |
| 161 | 161 |
observe.common.SetLonglineDto.type=Operación de pesca
|
| 162 | 162 |
observe.common.SetLonglineDto.types=Operaciones de pesca
|
| 163 | 163 |
observe.common.SetLonglineGlobalCompositionDto.title=Composición global del palangre
|
| 164 |
+observe.common.SetLonglineGlobalCompositionDto.type=Composición global del palangre
|
|
| 164 | 165 |
observe.common.SetSeineDto.title=Lance
|
| 165 | 166 |
observe.common.SetSeineDto.type=Lance
|
| 166 | 167 |
observe.common.SetSeineDto.types=Lances
|
| ... | ... | @@ -163,6 +163,7 @@ observe.common.SetLonglineDto.title=Opération de pêche |
| 163 | 163 |
observe.common.SetLonglineDto.type=Opération de pêche
|
| 164 | 164 |
observe.common.SetLonglineDto.types=Opérations de pêche
|
| 165 | 165 |
observe.common.SetLonglineGlobalCompositionDto.title=Composition globale de la palangre
|
| 166 |
+observe.common.SetLonglineGlobalCompositionDto.type=Composition globale de la palangre
|
|
| 166 | 167 |
observe.common.SetSeineDto.title=Calée
|
| 167 | 168 |
observe.common.SetSeineDto.type=Calée
|
| 168 | 169 |
observe.common.SetSeineDto.types=Calées
|