Tony CHEMIT pushed to branch develop-9.3.x at ultreiaio / ird-observe
Commits:
-
89c0bf00
by Tony Chemit at 2024-10-01T10:54:06+02:00
5 changed files:
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java
- client/runner/src/main/i18n/translations/client-runner_en_GB.properties
- client/runner/src/main/i18n/translations/client-runner_es_ES.properties
- client/runner/src/main/i18n/translations/client-runner_fr_FR.properties
Changes:
| ... | ... | @@ -140,7 +140,7 @@ |
| 140 | 140 | </row>
|
| 141 | 141 | <row>
|
| 142 | 142 | <cell anchor='west' fill="both">
|
| 143 | - <JLabel id='templateInformation' styleClass="information"/>
|
|
| 143 | + <JLabel id='templateInformation' styleClass="information skipI18n"/>
|
|
| 144 | 144 | </cell>
|
| 145 | 145 | </row>
|
| 146 | 146 | <!-- sectionTemplates -->
|
| ... | ... | @@ -36,6 +36,7 @@ import fr.ird.observe.dto.data.ll.observation.SectionTemplateDto; |
| 36 | 36 | import fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto;
|
| 37 | 37 | import fr.ird.observe.dto.form.Form;
|
| 38 | 38 | import io.ultreia.java4all.i18n.I18n;
|
| 39 | +import io.ultreia.java4all.jaxx.widgets.length.nautical.NauticalLengthFormat;
|
|
| 39 | 40 | import io.ultreia.java4all.lang.Strings;
|
| 40 | 41 | import io.ultreia.java4all.util.TimeLog;
|
| 41 | 42 | import org.apache.logging.log4j.LogManager;
|
| ... | ... | @@ -93,7 +94,11 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition |
| 93 | 94 | @Override
|
| 94 | 95 | public void onInit(SetDetailCompositionUI ui) {
|
| 95 | 96 | super.onInit(ui);
|
| 96 | - ui.getTemplateInformation().setText(I18n.t("observe.data.ll.observation.SetDetailComposition.templateInformation"));
|
|
| 97 | + List<String> formatsBuilder = new ArrayList<>(NauticalLengthFormat.values().length);
|
|
| 98 | + for (NauticalLengthFormat format : NauticalLengthFormat.values()) {
|
|
| 99 | + formatsBuilder.add(String.format("<code>%s</code> (%s)", format.getLabel(), format.getDescription()));
|
|
| 100 | + }
|
|
| 101 | + ui.getTemplateInformation().setText(I18n.t("observe.data.ll.observation.SetDetailComposition.templateInformation", String.join(", ",formatsBuilder)));
|
|
| 97 | 102 | ui.getTemplateInformation().setToolTipText(ui.getTemplateInformation().getText());
|
| 98 | 103 | SetDetailCompositionUIModel model = getModel();
|
| 99 | 104 | model.getStates().addPropertyChangeListener(SetDetailCompositionUIModelStates.PROPERTY_CAN_GENERATE, modelCanGenerateChanged);
|
| ... | ... | @@ -247,7 +247,7 @@ observe.data.Data.type=<html><body>Data of type <i>%s</i> |
| 247 | 247 | observe.data.ll.common.Trip.departureLandingHarbour=Departure / Landing Port
|
| 248 | 248 | observe.data.ll.common.Trip.homeIdErsId=HomeId / ERS Id
|
| 249 | 249 | observe.data.ll.common.Trip.startEndDate=Start / end date
|
| 250 | -observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body>Templates must conform to syntax <strong><code>L1/L2/L3/Ln\:u</code></strong> where <ul><li>L1..Ln are floatlines length</li><li>u is the selected length unit (among values\: <code>m km nm</code> or <code>fmt</code>)</li></ul>
|
|
| 250 | +observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body>Templates must conform to syntax <strong><code>L1/L2/L3/Ln\:u</code></strong> where <ul><li>L1..Ln are floatlines length</li><li>u is the selected length unit (among values\: %s)</li></ul>
|
|
| 251 | 251 | observe.data.ll.observation.SetDetailComposition.validation.invalid.templates=Templates are not valid, see tooltip on error cells
|
| 252 | 252 | observe.data.ll.observation.SetDetailCompositionUI.generateTabValid=Templates
|
| 253 | 253 | observe.data.message.will.delete.sub.data=If you confirm save, some data could be deleted\!\n\nFollowing data need to be removed\:
|
| ... | ... | @@ -247,7 +247,7 @@ observe.data.Data.type=<html><body>Dato de tipo <i>%s</i> |
| 247 | 247 | observe.data.ll.common.Trip.departureLandingHarbour=Departure / Landing harbour
|
| 248 | 248 | observe.data.ll.common.Trip.homeIdErsId=HomeId / ERS Id
|
| 249 | 249 | observe.data.ll.common.Trip.startEndDate=Date de début / fin
|
| 250 | -observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body>Templates must conform to syntax <strong><code>L1/L2/L3/Ln\:u</code></strong> where <ul><li>L1..Ln are floatlines length</li><li>u is the selected length unit (among values\: <code>m km nm</code> or <code>fmt</code>)</li></ul>\#TODO
|
|
| 250 | +observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body>Templates must conform to syntax <strong><code>L1/L2/L3/Ln\:u</code></strong> where <ul><li>L1..Ln are floatlines length</li><li>u is the selected length unit (among values\: %s)</li></ul>\#TODO
|
|
| 251 | 251 | observe.data.ll.observation.SetDetailComposition.validation.invalid.templates=Templates are not valid, see tooltip on error cells
|
| 252 | 252 | observe.data.ll.observation.SetDetailCompositionUI.generateTabValid=Templates \#TODO
|
| 253 | 253 | observe.data.message.will.delete.sub.data=If you confirm save, following data will be deleted\!\:
|
| ... | ... | @@ -247,7 +247,7 @@ observe.data.Data.type=<html><body>Donnée de type <i>%s</i> |
| 247 | 247 | observe.data.ll.common.Trip.departureLandingHarbour=Port de départ / d'arrivée
|
| 248 | 248 | observe.data.ll.common.Trip.homeIdErsId=Identifiant / Id ERS
|
| 249 | 249 | observe.data.ll.common.Trip.startEndDate=Date de début / fin
|
| 250 | -observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body>Les patrons doivent se conformer à la syntaxe <strong><code>L1/L2/L3/Ln\:u</code></strong> où <ul><li><strong>L1..Ln</strong> sont les longueurs des orins</li><li><strong>u</strong> est l'unité de longueur sélectionnée (valeurs possibles \: <code>m km nm</code> ou <code>fmt</code>)
|
|
| 250 | +observe.data.ll.observation.SetDetailComposition.templateInformation=<html><body>Les patrons doivent se conformer à la syntaxe <strong><code>L1/L2/L3/Ln\:u</code></strong> où <ul><li><strong>L1..Ln</strong> sont les longueurs des orins</li><li><strong>u</strong> est l'unité de longueur sélectionnée (valeurs possibles \: %s)
|
|
| 251 | 251 | observe.data.ll.observation.SetDetailComposition.validation.invalid.templates=Les templates ne sont pas valides, passer en revue les cellules en erreur
|
| 252 | 252 | observe.data.ll.observation.SetDetailCompositionUI.generateTabValid=Templates
|
| 253 | 253 | observe.data.message.will.delete.sub.data=En confirmant la sauvegarde les données suivantes seront supprimées \:
|