Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e1f874d3 by Tony Chemit at 2024-10-01T10:53:48+02:00 Labels à améliorer - Closes #2893 - - - - - 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: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx ===================================== @@ -140,7 +140,7 @@ </row> <row> <cell anchor='west' fill="both"> - <JLabel id='templateInformation' styleClass="information"/> + <JLabel id='templateInformation' styleClass="information skipI18n"/> </cell> </row> <!-- sectionTemplates --> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java ===================================== @@ -36,6 +36,7 @@ import fr.ird.observe.dto.data.ll.observation.SectionTemplateDto; import fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto; import fr.ird.observe.dto.form.Form; import io.ultreia.java4all.i18n.I18n; +import io.ultreia.java4all.jaxx.widgets.length.nautical.NauticalLengthFormat; import io.ultreia.java4all.lang.Strings; import io.ultreia.java4all.util.TimeLog; import org.apache.logging.log4j.LogManager; @@ -93,7 +94,11 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition @Override public void onInit(SetDetailCompositionUI ui) { super.onInit(ui); - ui.getTemplateInformation().setText(I18n.t("observe.data.ll.observation.SetDetailComposition.templateInformation")); + List<String> formatsBuilder = new ArrayList<>(NauticalLengthFormat.values().length); + for (NauticalLengthFormat format : NauticalLengthFormat.values()) { + formatsBuilder.add(String.format("<code>%s</code> (%s)", format.getLabel(), format.getDescription())); + } + ui.getTemplateInformation().setText(I18n.t("observe.data.ll.observation.SetDetailComposition.templateInformation", String.join(", ",formatsBuilder))); ui.getTemplateInformation().setToolTipText(ui.getTemplateInformation().getText()); SetDetailCompositionUIModel model = getModel(); model.getStates().addPropertyChangeListener(SetDetailCompositionUIModelStates.PROPERTY_CAN_GENERATE, modelCanGenerateChanged); ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -248,7 +248,7 @@ observe.data.Data.type=<html><body>Data of type <i>%s</i> observe.data.ll.common.Trip.departureLandingHarbour=Departure / Landing Port observe.data.ll.common.Trip.homeIdErsId=HomeId / ERS Id observe.data.ll.common.Trip.startEndDate=Start / end date -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> +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> observe.data.ll.observation.SetDetailComposition.validation.invalid.templates=Templates are not valid, see tooltip on error cells observe.data.ll.observation.SetDetailCompositionUI.generateTabValid=Templates observe.data.message.will.delete.sub.data=If you confirm save, some data could be deleted\!\n\nFollowing data need to be removed\: ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -248,7 +248,7 @@ observe.data.Data.type=<html><body>Dato de tipo <i>%s</i> observe.data.ll.common.Trip.departureLandingHarbour=Departure / Landing harbour observe.data.ll.common.Trip.homeIdErsId=HomeId / ERS Id observe.data.ll.common.Trip.startEndDate=Date de début / fin -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 +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 observe.data.ll.observation.SetDetailComposition.validation.invalid.templates=Templates are not valid, see tooltip on error cells observe.data.ll.observation.SetDetailCompositionUI.generateTabValid=Templates \#TODO observe.data.message.will.delete.sub.data=If you confirm save, following data will be deleted\!\: ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -248,7 +248,7 @@ observe.data.Data.type=<html><body>Donnée de type <i>%s</i> observe.data.ll.common.Trip.departureLandingHarbour=Port de départ / d'arrivée observe.data.ll.common.Trip.homeIdErsId=Identifiant / Id ERS observe.data.ll.common.Trip.startEndDate=Date de début / fin -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>) +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) observe.data.ll.observation.SetDetailComposition.validation.invalid.templates=Les templates ne sont pas valides, passer en revue les cellules en erreur observe.data.ll.observation.SetDetailCompositionUI.generateTabValid=Templates observe.data.message.will.delete.sub.data=En confirmant la sauvegarde les données suivantes seront supprimées \: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e1f874d3376d27a0d60ac1a892... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e1f874d3376d27a0d60ac1a892... You're receiving this email because of your account on gitlab.com.