This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 3be88bae180046539b53cd4ccdaeff8428fea467 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 28 13:45:53 2016 +0200 Optimize i18n --- .../swing/decoration/DecoratorService.java | 1 + ...e-application-swing-decoration_fr_FR.properties | 3 +- .../application/swing/ui/admin/AdminTabUI.jcss | 2 +- .../swing/ui/admin/resume/ShowResumeUI.jcss | 2 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 32 +++++----- .../list/impl/longline/ActivityLonglinesUI.jcss | 4 +- .../content/list/impl/seine/ActivitySeinesUI.jcss | 4 +- .../application/swing/ui/util/FloatConverter.java | 9 +-- .../ObserveValidationMessageTableRenderer.java | 6 +- .../observe-application-swing_en_GB.properties | 32 ++++------ .../observe-application-swing_es_ES.properties | 32 ++++------ .../observe-application-swing_fr_FR.properties | 68 +++++++++++----------- ...erve-services-topia-validation_fr_FR.properties | 12 ++-- 13 files changed, 89 insertions(+), 118 deletions(-) diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java index 40aff1d..23fba1e 100644 --- a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java @@ -401,6 +401,7 @@ public class DecoratorService extends DecoratorProvider { n("observe.common.tracelineLength"); n("observe.common.gearUseFeaturesMeasurementSeine"); + n("observe.common.gearUseFeaturesMeasurementLongline"); } diff --git a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_fr_FR.properties b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_fr_FR.properties index 9dc2fca..ac5769e 100644 --- a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_fr_FR.properties +++ b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_fr_FR.properties @@ -25,7 +25,8 @@ observe.common.gear=Équipement observe.common.gearCaracteristic=Caractéristique d'un équipement observe.common.gearCaracteristicType=Type de caractéristique d'équipement observe.common.gearUseFeaturesLongline=Équipement -observe.common.gearUseFeaturesMeasurementSeine= +observe.common.gearUseFeaturesMeasurementLongline=Mesure +observe.common.gearUseFeaturesMeasurementSeine=Mesure observe.common.gearUseFeaturesSeine=Équipement observe.common.gender=Sexe observe.common.gps.activity=Activité diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jcss index 097a9ed..859c38e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jcss @@ -78,7 +78,7 @@ actionIcon:"wizard-message"; } #progressionTopCopyCliptBoard { - toolTipText:"ui.main.body.synchro.action.copy.to.clipBoard"; + toolTipText:"observe.action.copy.to.clipBoard"; actionIcon:"report-copy"; mnemonic:C; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUI.jcss index 61a9ea1..ee304ee 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUI.jcss @@ -57,7 +57,7 @@ } #globalProgressionCopyToClipBoard { - toolTipText:"ui.main.body.synchro.action.copy.to.clipBoard"; + toolTipText:"observe.action.copy.to.clipBoard"; actionIcon:"report-copy"; mnemonic:C; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java index 4d3fb30..fb7bcca 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java @@ -126,12 +126,12 @@ public class ValidateUIHandler extends AdminTabUIHandler { Collections.singletonList(new RowSorter.SortKey(0, SortOrder.ASCENDING))); SwingUtil.setI18nTableHeaderRenderer( messageTable, - n("validator.scope.header"), - n("validator.scope.header.tip"), - n("validator.field.header"), - n("validator.field.header.tip"), - n("validator.message.header"), - n("validator.message.header.tip")); + n("observe.actions.validate.validator.scope.header"), + n("observe.actions.validate.validator.scope.header.tip"), + n("observe.actions.validate.validator.field.header"), + n("observe.actions.validate.validator.field.header.tip"), + n("observe.actions.validate.validator.message.header"), + n("observe.actions.validate.validator.message.header.tip")); SwingUtil.fixTableColumnWidth(messageTable, 0, 25); ValidateEntityListCellRenderer listRenderer = @@ -226,8 +226,6 @@ public class ValidateUIHandler extends AdminTabUIHandler { tabUI.refModel.clear(); tabUI.messagesModel.clear(); } - if (newState == WizardState.SUCCESSED) { - } } public void updateTypes() { @@ -344,14 +342,14 @@ public class ValidateUIHandler extends AdminTabUIHandler { // pas de validation ou bien pas d'erreurs rencontrées - sendMessage(t("observe.actions.validation.message.nothing.to.do")); - sendMessage(t("observe.actions.validation.message.operation.done", new Date())); + sendMessage(t("observe.actions.validate.message.nothing.to.do")); + sendMessage(t("observe.actions.validate.message.operation.done", new Date())); return WizardState.SUCCESSED; } sendMessage( - t("observe.actions.validation.message.operation.needFix", new Date())); + t("observe.actions.validate.message.operation.needFix", new Date())); return WizardState.NEED_FIX; } @@ -375,10 +373,10 @@ public class ValidateUIHandler extends AdminTabUIHandler { ValidateModel validationModel = model.getValidateModel(); Set<ValidatorDto> validators = validationModel.getValidators(); - sendMessage(t("observe.actions.validation.message.use.storage", + sendMessage(t("observe.actions.validate.message.use.storage", source.getLabel())); - sendMessage(t("observe.actions.validation.message.prepare.validators")); + sendMessage(t("observe.actions.validate.message.prepare.validators")); if (!validators.isEmpty()) { @@ -386,10 +384,10 @@ public class ValidateUIHandler extends AdminTabUIHandler { for (ValidatorDto v : validators) { String label = t(DecoratorService.getEntityLabel(v.getDtoType())); - sendMessage(t("observe.actions.validation.message.detected", label)); + sendMessage(t("observe.actions.validate.message.detected", label)); } } else { - sendMessage(t("observe.message.no.validation.detected")); + sendMessage(t("observe.actions.validate.message.no.validation.detected")); } return null; @@ -456,12 +454,12 @@ public class ValidateUIHandler extends AdminTabUIHandler { if (validationModel.isGenerateReport()) { sendMessage( - t("observe.actions.validation.message.save.report", validationModel.getReportFile())); + t("observe.actions.validate.message.save.report", validationModel.getReportFile())); generateReportFile(validationModel); } else { sendMessage( - t("observe.actions.validation.message.not.save.report")); + t("observe.actions.validate.message.not.save.report")); } finalState = WizardState.SUCCESSED; } catch (Exception e) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jcss index 0cff01c..e53824b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jcss @@ -51,7 +51,7 @@ } #moveSelectedChildren { - text:"observe.content.action.move.activities"; - toolTipText:"observe.content.action.move.activities.tip"; + text:"observe.content.action.move.activities.longline"; + toolTipText:"observe.content.action.move.activities.longline.tip"; _observeAction:{MoveActivityLonglinesUIAction.ACTION_NAME}; } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jcss index 21da808..2fede4f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jcss @@ -51,7 +51,7 @@ } #moveSelectedChildren { - text:"observe.content.action.move.activities"; - toolTipText:"observe.content.action.move.activities.tip"; + text:"observe.content.action.move.activities.seine"; + toolTipText:"observe.content.action.move.activities.seine.tip"; _observeAction:{MoveActivitySeinesUIAction.ACTION_NAME}; } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/FloatConverter.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/FloatConverter.java index 321f6fd..4a1d66d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/FloatConverter.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/FloatConverter.java @@ -43,8 +43,7 @@ public class FloatConverter implements NuitonConverter { @Override public Object convert(Class aClass, Object value) { if (value == null) { - throw new ConversionException( - t("nuitonutil.error.convertor.noValue", this)); + throw new ConversionException(t("observe.converter.error.noValue", this)); } if (isEnabled(aClass)) { Object result; @@ -57,8 +56,7 @@ public class FloatConverter implements NuitonConverter { return result; } } - throw new ConversionException( - t("nuitonutil.error.no.convertor", aClass.getName(), value)); + throw new ConversionException(t("observe.converter.error.no.convertor", value, aClass.getName())); } protected Float valueOf(String value) { @@ -70,8 +68,7 @@ public class FloatConverter implements NuitonConverter { result = Float.valueOf(value); return result; } catch (NumberFormatException e) { - throw new ConversionException( - t("nuitonutil.error.float.convertor", value, this, e.getMessage())); + throw new ConversionException(t("observe.converter.error.float.format", value, this, e.getMessage())); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java index 3bad449..b69077b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java @@ -99,19 +99,19 @@ public class ObserveValidationMessageTableRenderer extends DefaultTableCellRende NuitonValidatorScope scope = (NuitonValidatorScope) value; icon = SwingValidatorUtil.getIcon(scope); String label = t(scope.getLabel()); - toolTipText = t("validator.scope.tip", label); + toolTipText = t("observe.validator.scope.tip", label); break; case 1: // field name text = getFieldName(table, (String) value, row); - toolTipText = t("validator.field.tip", text); + toolTipText = t("observe.validator.field.tip", text); break; case 2: // message text = getMessage(table, (String) value, row); - toolTipText = t("validator.message.tip", text); + toolTipText = t("observe.validator.message.tip", text); break; } diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 8d622b9..612c9b8 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -1,6 +1,3 @@ -nuitonutil.error.convertor.noValue= -nuitonutil.error.float.convertor= -nuitonutil.error.no.convertor= observe.about.message=<h3>ObServe</h3><a href\="http\://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, d'Observation et de Suivi des pêches thonières tropicales de surface.</a><hr/><p>Application de saisie des données observateurs et de consultation de telles données depuis une base <i>Obstuna</i>.</p> <p>Ce projet a été initiée en 2008 par l'unité US 007-OSIRIS de <a href\="http\://www.ird.fr">l'IRD</a> dans le cadre d'un <a href\="http\://www.ird.fr/infor [...] observe.about.translate.content=<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">observe-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur avec les options suivantes \: <ul><li>caractère séparateur \: <strong><i>|</i></strong></li><li>encoding <strong><i>UTF-8</i></strong></li><li>texte encapsulé par des <strong><i>"</i></strong></li></ul></li><li>Traduisez, Améliore [...] observe.about.translate.title=translate ObServe @@ -333,14 +330,14 @@ observe.actions.validate.step.description= observe.actions.validate.title=Validate datas observe.actions.validate.title.choose.report.directory= observe.actions.validate.title.tip=Validate datas of a storage -observe.actions.validation.message.detected= -observe.actions.validation.message.not.save.report= -observe.actions.validation.message.nothing.to.do= -observe.actions.validation.message.operation.done= -observe.actions.validation.message.operation.needFix= -observe.actions.validation.message.prepare.validators= -observe.actions.validation.message.save.report= -observe.actions.validation.message.use.storage= +observe.actions.validate.message.detected= +observe.actions.validate.message.not.save.report= +observe.actions.validate.message.nothing.to.do= +observe.actions.validate.message.operation.done= +observe.actions.validate.message.operation.needFix= +observe.actions.validate.message.prepare.validators= +observe.actions.validate.message.save.report= +observe.actions.validate.message.use.storage= observe.admin.resume.no.operation.done= observe.admin.resume.operation.canceled= observe.admin.resume.operation.done= @@ -1848,7 +1845,7 @@ observe.message.no.route.for.maree= observe.message.no.species.selected= observe.message.no.trip.for.program= observe.message.no.usage.for.entity= -observe.message.no.validation.detected= +observe.actions.validate.message.no.validation.detected= observe.message.quit.invalid.edit= observe.message.quit.valid.edit= observe.message.referentiel.editable= @@ -2225,13 +2222,4 @@ observe.view.navigation=Navigation observe.view.server= observe.warning.nimbus.landf=Could not use Look and Fell Nimbus, need at least version 1.6u10 of java. observe.warning.no.ui=No gui environment found -ui.main.body.synchro.action.copy.to.clipBoard= -validator.field.header= -validator.field.header.tip= -validator.field.tip= -validator.message.header= -validator.message.header.tip= -validator.message.tip= -validator.scope.header= -validator.scope.header.tip= -validator.scope.tip= +observe.action.copy.to.clipBoard= \ No newline at end of file diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 4d9d331..601d9e2 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -1,6 +1,3 @@ -nuitonutil.error.convertor.noValue= -nuitonutil.error.float.convertor= -nuitonutil.error.no.convertor= observe.about.message=<h3>ObServe</h3><a href\="http\://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, d'Observation et de Suivi des pêches thonières tropicales de surface.</a><hr/><p>Aplicación de adquisición Application de datos de observadores y de consulta de estos datos desde una base <i>Obstuna</i>.</p> <p>Este projecto se ha iniciado en 2009 por la unidad US 007-OSIRIS del <a href\="http\://www.ird.fr">IRD</a> dentro del marco de <a href\="http\://ww [...] observe.about.translate.content=<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">observe-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur avec les options suivantes \: <ul><li>caractère séparateur \: <strong><i>|</i></strong></li><li>encoding <strong><i>UTF-8</i></strong></li><li>texte encapsulé par des <strong><i>"</i></strong></li></ul></li><li>Traduisez, Améliore [...] observe.about.translate.title=Traducir ObServe @@ -333,14 +330,14 @@ observe.actions.validate.step.description= observe.actions.validate.title= observe.actions.validate.title.choose.report.directory= observe.actions.validate.title.tip= -observe.actions.validation.message.detected=Se ha encontrado el validador para el tipo %1$s -observe.actions.validation.message.not.save.report=No hay informe que guardar. -observe.actions.validation.message.nothing.to.do=Los datos son válidos y no necesitan corrección. -observe.actions.validation.message.operation.done=Ha terminado la operación de validación de %1$td/%1$tm/%1$tY à %1$tH\:%1$tM\:%1$ts. -observe.actions.validation.message.operation.needFix=Los datos no son válidos y necesitan ser corregidos. -observe.actions.validation.message.prepare.validators=Detección de validadores -observe.actions.validation.message.save.report=El informe de validación se ha guardado en el archivo %1$s -observe.actions.validation.message.use.storage=Se realizará la validación de %1$s +observe.actions.validate.message.detected=Se ha encontrado el validador para el tipo %1$s +observe.actions.validate.message.not.save.report=No hay informe que guardar. +observe.actions.validate.message.nothing.to.do=Los datos son válidos y no necesitan corrección. +observe.actions.validate.message.operation.done=Ha terminado la operación de validación de %1$td/%1$tm/%1$tY à %1$tH\:%1$tM\:%1$ts. +observe.actions.validate.message.operation.needFix=Los datos no son válidos y necesitan ser corregidos. +observe.actions.validate.message.prepare.validators=Detección de validadores +observe.actions.validate.message.save.report=El informe de validación se ha guardado en el archivo %1$s +observe.actions.validate.message.use.storage=Se realizará la validación de %1$s observe.admin.resume.no.operation.done=Ninguna operación realizada observe.admin.resume.operation.canceled=operación cancelada observe.admin.resume.operation.done=operacion realizada @@ -1848,7 +1845,7 @@ observe.message.no.route.for.maree=Ninguna ruta en la marea actual observe.message.no.species.selected=Ninguna especie seleccionada observe.message.no.trip.for.program=Ninguna marea para el programa actual observe.message.no.usage.for.entity=Ningún usuario encontrado. -observe.message.no.validation.detected=Ningún validador encontrado. +observe.actions.validate.message.no.validation.detected=Ningún validador encontrado. observe.message.quit.invalid.edit=¡Datos no validos, no se pueden guardar\!\n\nNota\: Si continúa se cancelarán todas las modificaciones. observe.message.quit.valid.edit=¡Los datos han sido modificados y son válidos\! observe.message.referentiel.editable=El referencial es editable. @@ -2225,13 +2222,4 @@ observe.view.navigation= observe.view.server= observe.warning.nimbus.landf= observe.warning.no.ui= -ui.main.body.synchro.action.copy.to.clipBoard= -validator.field.header= -validator.field.header.tip= -validator.field.tip= -validator.message.header= -validator.message.header.tip= -validator.message.tip= -validator.scope.header= -validator.scope.header.tip= -validator.scope.tip= +observe.action.copy.to.clipBoard= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 6b1c3fc..b83eea0 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1,6 +1,3 @@ -nuitonutil.error.convertor.noValue= -nuitonutil.error.float.convertor= -nuitonutil.error.no.convertor= observe.about.message=<h3>ObServe</h3><a href\="http\://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, d'Observation et de Suivi des pêches thonières tropicales de surface.</a><hr/><p>Application de saisie des données observateurs et de consultation de telles données depuis une base <i>Obstuna</i>.</p> <p>Ce projet a été initiée en 2008 par l'unité US 007-OSIRIS de <a href\="http\://www.ird.fr">l'IRD</a> dans le cadre d'un <a href\="http\://www.ird.fr/infor [...] observe.about.translate.content=<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">observe-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur avec les options suivantes \: <ul><li>caractère séparateur \: <strong><i>|</i></strong></li><li>encoding <strong><i>UTF-8</i></strong></li><li>texte encapsulé par des <strong><i>"</i></strong></li></ul></li><li>Traduisez, Améliore [...] observe.about.translate.title=Traduire ObServe @@ -69,6 +66,7 @@ observe.action.copy.column.headers=Copier les entêtes de colonne observe.action.copy.column.headers.tip=Ajoute dans le résultat les entêtes de colonne (i.e la première ligne) observe.action.copy.row.headers=Copier les entêtes de ligne observe.action.copy.row.headers.tip=Ajoute dans le résultat les entêtes de ligne (i.e la première colonne) +observe.action.copy.to.clipBoard=Copier le contenu dans le presse-papier observe.action.create=Créer observe.action.db.locale.es.tip=Changer la langue du référentiel en espagnol observe.action.db.locale.fr.tip=Changer la langue du référentiel en français @@ -309,7 +307,16 @@ observe.actions.validate.config.report=Rapport de validation observe.actions.validate.continue.with.no.save.report=Continuer sans sauver de rapport observe.actions.validate.description=Valider les données de la base source observe.actions.validate.invalid.data.list=Liste des objets invalides +observe.actions.validate.message.detected=Validateur détecté pour le type %1$s observe.actions.validate.message.list=Liste des messages portant sur l'objet sélectionné +observe.actions.validate.message.no.validation.detected=Aucun validateur détecté. +observe.actions.validate.message.not.save.report=Pas de rapport à sauvegarder. +observe.actions.validate.message.nothing.to.do=Les données sont valides et ne nécessitent pas de correction. +observe.actions.validate.message.operation.done=L'opération de validation terminé le %1$td/%1$tm/%1$tY à %1$tH\:%1$tM\:%1$ts. +observe.actions.validate.message.operation.needFix=Vos données ne sont valides et nécessitent des corrections. +observe.actions.validate.message.prepare.validators=Détection des validateurs +observe.actions.validate.message.save.report=Le rapport de validation a été sauvegardé dans le fichier %1$s +observe.actions.validate.message.use.storage=La validation sera effectuée sur %1$s observe.actions.validate.model.type.all=Données et référentiels observe.actions.validate.model.type.all.description=Données et référentiels observe.actions.validate.model.type.data=Données observées @@ -333,14 +340,12 @@ observe.actions.validate.step.description=Validation des données d'une source d observe.actions.validate.title=Validation des données observe.actions.validate.title.choose.report.directory=Choisir le répertoire de destination des rapports observe.actions.validate.title.tip=Valider les données d'une source de données -observe.actions.validation.message.detected=Validateur détecté pour le type %1$s -observe.actions.validation.message.not.save.report=Pas de rapport à sauvegarder. -observe.actions.validation.message.nothing.to.do=Les données sont valides et ne nécessitent pas de correction. -observe.actions.validation.message.operation.done=L'opération de validation terminé le %1$td/%1$tm/%1$tY à %1$tH\:%1$tM\:%1$ts. -observe.actions.validation.message.operation.needFix=Vos données ne sont valides et nécessitent des corrections. -observe.actions.validation.message.prepare.validators=Détection des validateurs -observe.actions.validation.message.save.report=Le rapport de validation a été sauvegardé dans le fichier %1$s -observe.actions.validation.message.use.storage=La validation sera effectuée sur %1$s +observe.actions.validate.validator.field.header=Champ +observe.actions.validate.validator.field.header.tip=Le champ surquel intervient le message +observe.actions.validate.validator.message.header=Message +observe.actions.validate.validator.message.header.tip=Le texte du message +observe.actions.validate.validator.scope.header=... +observe.actions.validate.validator.scope.header.tip=Le type de message observe.admin.resume.no.operation.done=Aucune opération réalisée. observe.admin.resume.operation.canceled=opération annulée observe.admin.resume.operation.done=opération réussie @@ -582,12 +587,12 @@ observe.config.defaultBackupDirectory.description=Répertoire par défaut où sa observe.config.defaultCreationMode=Le mode de création de base locale par défaut observe.config.defaultDataDirectory.description=Répertoire par défault des resources utilisateurs de l'application observe.config.defaultDbMode=Le mode de connexion a créer par défaut -observe.config.defaultGpsMaxDelay=Le count par défaut de minutes maximum entre dexu points gps -observe.config.defaultGpsMaxSpeed=La vitesse maximum par défaut en tre dexu points gps -observe.config.defaultI18nDirectory.description=Répertoire par défault des resources de traduction de l'application +observe.config.defaultGpsMaxDelay=Le nombre par défaut de minutes maximum entre deux points gps +observe.config.defaultGpsMaxSpeed=La vitesse maximum par défaut en tre deux points gps +observe.config.defaultI18nDirectory.description=Répertoire par défaut des resources de traduction de l'application observe.config.defaultInitialDbDump.description=La base embarquée créee lors de le premier import d'une base distante. observe.config.defaultLocalDbDirectory.description=Le répertoire où est stockée la base locale. -observe.config.defaultMapDirectory.description= +observe.config.defaultMapDirectory.description=Le répertoire où sont stockées les cartes. observe.config.defaultReportDirectory.description=Répertoire par défaut des rapports de l'application observe.config.defaultResourcesDirectory.description=Le répertoire où sont stockées les resources de l'utilisateur comme les traductions ou les requètes de rapports. observe.config.defaultTmpDirectory.description=Le répertoire temporaire par défaut @@ -624,10 +629,10 @@ observe.config.obstuna.password.description=Le mote de passe pour se connecter observe.config.obstuna.url.description=L'url de connexion à la base Obstuna observe.config.obstuna.useSsl.description=Drapeau pour permettre l'utilisation du mode ssl pour la connexion à Obstuna observe.config.pg.can.migrate.description=Autoriser la mise à jour des bases distantes (il faut être propriétaire de la base) -observe.config.server.dataBaseName.description= -observe.config.server.login.description= -observe.config.server.password.description= -observe.config.server.url.description= +observe.config.server.dataBaseName.description=Le nom optionel de la base cible sur le serveur +observe.config.server.login.description=Identifiant de l'utilisateur +observe.config.server.password.description=Le mot de passe de l'utilisateur +observe.config.server.url.description=L'url du serveur observe.config.showMigrationProgression=Affichier dans les logs la progression de la mise à jour d'une base observe.config.showMigrationSql=Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base observe.config.showSql=Afficher dans les logs toutes les requêtes sql exétžs @@ -827,12 +832,10 @@ observe.content.action.mitigationType.delete.tip=Supprimer le type de mesure d'a observe.content.action.mitigationType.detail.tip=Voir les détails du type de mesure d'atténuation sélectionné observe.content.action.mitigationType.modify.tip=Modifier le type de mesure d'atténuation sélectionné observe.content.action.mitigationType.save.tip=Sauver les modifications du type de mesure d'atténuation -observe.content.action.move.activities= observe.content.action.move.activities.longline=Changer de marée observe.content.action.move.activities.longline.tip=Changer la marée des activités sélectionnées observe.content.action.move.activities.seine=Changer de route observe.content.action.move.activities.seine.tip=Changer la route des activités sélectionnées -observe.content.action.move.activities.tip= observe.content.action.move.routes=Changer de marée observe.content.action.move.routes.tip=Changer la marée des routes sélectionnées observe.content.action.move.trips=Changer de programme @@ -1583,7 +1586,7 @@ observe.content.setSeine.endPursingTimeStamp=Date - Heure de fin coulissage observe.content.setSeine.endSetTimeStamp=Date - Heure de fin de validité observe.content.setSeine.maxGearDepth=Profondeur maximum (m) observe.content.setSeine.message.creating=La calée est en cours de création. -observe.content.setSeine.message.information.schoolType= +observe.content.setSeine.message.information.schoolType=Type de banc observe.content.setSeine.message.no.nonTargetDiscarded=La calée n'a pas de rejet de faune observe.content.setSeine.message.no.targetCatch=Pour échantilloner les thons capturés, il faut au moins une capture. observe.content.setSeine.message.no.targetDiscarded=Pour échantilloner les thons, il faut au moins un rejet de thon monté sur le pont. @@ -1797,12 +1800,15 @@ observe.content.type.referential=<html><body>Référentiel de type <i>%s</i> observe.content.vessel.tab.general=Caractéristiques générales observe.content.vessel.tab.other=Autres caractéristiques observe.content.weightMeasure.delete.message=Confirmer la suppression de la mesure du poids sélectionnée. +observe.converter.error.float.format=Format de décimal incorrecte pour la valeur %s +observe.converter.error.no.convertor=Impossible de convertir le décimal %s depuis le convertisseur %s +observe.converter.error.noValue=Aucune valeur à convertir pour le convertisseur %s observe.entity.message.updating=L'objet '%1$s' est en cours de modification. observe.error.can.not.create.directory=Création du répertoire %1$s impossible\! observe.error.no.activity.6=L'activité de type 6 n'a pas été trouvée en base. observe.error.storage.could.not.backup.unsane.local.db=Impossible d'enregistrer une base non endommagée observe.error.storage.could.not.load.local.db=Impossible d'ouvrir la base locale pour la raison suivante \: %s -observe.generateHtml.error= +observe.generateHtml.error=Impossible de générer à partir de la template %s observe.info.selected.validators=Il faut au moins un validateur sélectionné pour continuer. observe.info.validation.credentials=Pour valider le référentiel (resp. les données), vous devez posséder les droits en lecture correspondants. observe.init.local.db.detected=%1$s détectée. @@ -1848,7 +1854,6 @@ observe.message.no.route.for.maree=< Aucune route pour la marée courante > observe.message.no.species.selected=Pas d'espèce sélectionnée observe.message.no.trip.for.program=< Aucune marée pour le programme courant > observe.message.no.usage.for.entity=Aucune utilisation trouvée. -observe.message.no.validation.detected=Aucun validateur détecté. observe.message.quit.invalid.edit=Les données ne sont pas valides et ne peuvent pas être sauvées\!\n\nNote\: le fait de continuer annulera toutes les modifications. observe.message.quit.valid.edit=Les données ont été modifiées et sont valides\! observe.message.referentiel.editable=Le référentiel est éditable. @@ -1896,7 +1901,7 @@ observe.runner.config.loaded=Configuration d'ObServe v. %1$s chargée. observe.runner.config.migrate.file=Le fichier de configuration %1$s a été déplacée de \n%2$s\nvers\n%3$s observe.runner.context.loaded=Initialisation du contexte terminée en %1$s. observe.runner.copy.default.logConfigurationFile.file=Création du fichier de configuration des logs %1$s. -observe.runner.copy.default.map.file= +observe.runner.copy.default.map.file=Création des cartes %1$s. observe.runner.copy.default.report.file=Création du fichier de reports %1$s. observe.runner.copy.default.ui.file=Création du fichier de cosmétique %1$s. observe.runner.create.directory=Création du répertoire %1$s @@ -2220,18 +2225,11 @@ observe.tree.vesselType=Type de pêcherie observe.tree.weightCategory=Catégorie de poids observe.tree.weightMeasureType=Type de mesure de poids observe.tree.wind=Vent Beaufort +observe.validator.field.tip=Propriété '%1$s' +observe.validator.message.tip=Message \: %1$s +observe.validator.scope.tip=Type de message \: '%1$s' observe.view.message=Messages observe.view.navigation=Navigation observe.view.server=Base locale en mode serveur observe.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java. observe.warning.no.ui=Aucun environnement graphique détecté -ui.main.body.synchro.action.copy.to.clipBoard=Copier le contenu dans le presse-papier -validator.field.header= -validator.field.header.tip= -validator.field.tip= -validator.message.header= -validator.message.header.tip= -validator.message.tip= -validator.scope.header= -validator.scope.header.tip= -validator.scope.tip= diff --git a/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_fr_FR.properties b/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_fr_FR.properties index 1a75691..5408536 100644 --- a/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_fr_FR.properties +++ b/observe-services-topia-validation/src/main/resources/i18n/observe-services-topia-validation_fr_FR.properties @@ -19,13 +19,13 @@ validator.service.activity.null.observedSystemDistance=La distance au système o validator.service.activity.null.seaSurfaceTemperature=Aucune température de surface saisie. validator.service.activity.null.surroundingActivity=Aucune activité environnante sélectionné. validator.service.activity.null.wind=Aucun vent Beaufort sélectionné. -validator.service.activity.required.comment.for.currentFpaZone= -validator.service.activity.required.comment.for.detectionMode= -validator.service.activity.required.comment.for.nextFpaZone= +validator.service.activity.required.comment.for.currentFpaZone=Un commentaire est requis pour la zone FPA courante sélectionnée. +validator.service.activity.required.comment.for.detectionMode=Un commentaire est requis pour le mode de détection sélectionné. +validator.service.activity.required.comment.for.nextFpaZone=Un commentaire est requis pour la zone FPA suivante sélectionnée. validator.service.activity.required.comment.for.observedSystem=Un commentaire est requis pour un des systèmes observés sélectionnés. -validator.service.activity.required.comment.for.previousFpaZone= -validator.service.activity.required.comment.for.reasonForNoFishing= -validator.service.activity.required.comment.for.vesselActivity= +validator.service.activity.required.comment.for.previousFpaZone=Un commentaire est requis pour la zone FPA précédente sélectionnée. +validator.service.activity.required.comment.for.reasonForNoFishing=Un commentaire est requis pour la raison de non pêche sélectionnée. +validator.service.activity.required.comment.for.vesselActivity=Un commentaire est requis pour le type d'activité sélectionné. validator.service.activity.required.date=La date d'observation de l'activité est obligatoire. validator.service.activity.required.latitude=La latitude doit être renseignée. validator.service.activity.required.longitude=La longitude doit être renseignée. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 51d4fbd6016c989a284620eafe7f2b0f9e78d627 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 28 14:48:00 2016 +0200 Remove i18n from service api module... --- ...e-application-swing-decoration_en_GB.properties | 1 + ...e-application-swing-decoration_es_ES.properties | 1 + observe-application-swing/pom.xml | 2 + .../swing/ui/content/ContentUIInitializer.java | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 2 +- .../application/swing/ui/util/I18nEnumUtil.java | 101 +++++++++++++++++++++ .../ui/util/tripMap/TripMapContentBuilder.java | 2 +- .../observe-application-swing_en_GB.properties | 68 +++++++++++--- .../observe-application-swing_es_ES.properties | 68 +++++++++++--- .../observe-application-swing_fr_FR.properties | 34 +++++++ observe-services-api/pom.xml | 12 --- .../ConsolidateActivitySeineDataResult.java | 49 +++++----- .../fr/ird/observe/services/util/I18nEnumUtil.java | 99 -------------------- .../i18n/observe-services-api_en_GB.properties | 40 -------- .../i18n/observe-services-api_es_ES.properties | 40 -------- .../i18n/observe-services-api_fr_FR.properties | 40 -------- .../ConsolidateActivitySeineDataResultBuilder.java | 18 ++-- pom.xml | 7 +- 18 files changed, 288 insertions(+), 298 deletions(-) diff --git a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_en_GB.properties b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_en_GB.properties index 7400508..ba2e84d 100644 --- a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_en_GB.properties +++ b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_en_GB.properties @@ -25,6 +25,7 @@ observe.common.gear= observe.common.gearCaracteristic= observe.common.gearCaracteristicType= observe.common.gearUseFeaturesLongline= +observe.common.gearUseFeaturesMeasurementLongline= observe.common.gearUseFeaturesMeasurementSeine= observe.common.gearUseFeaturesSeine= observe.common.gender= diff --git a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_es_ES.properties b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_es_ES.properties index b82dc63..61b2e38 100644 --- a/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_es_ES.properties +++ b/observe-application-swing-decoration/src/main/resources/i18n/observe-application-swing-decoration_es_ES.properties @@ -25,6 +25,7 @@ observe.common.gear= observe.common.gearCaracteristic= observe.common.gearCaracteristicType= observe.common.gearUseFeaturesLongline= +observe.common.gearUseFeaturesMeasurementLongline= observe.common.gearUseFeaturesMeasurementSeine= observe.common.gearUseFeaturesSeine= observe.common.gender= diff --git a/observe-application-swing/pom.xml b/observe-application-swing/pom.xml index b4bf07f..403d001 100644 --- a/observe-application-swing/pom.xml +++ b/observe-application-swing/pom.xml @@ -60,6 +60,8 @@ <i18n.bundleOutputName>${projectId}-i18n</i18n.bundleOutputName> <i18n.bundleCsvFile>${projectId}-i18n.csv</i18n.bundleCsvFile> <i18n.bundleCsvSeparator>|</i18n.bundleCsvSeparator> + <!-- FIXME remove this when i18n will be safe --> + <i18n.failsIfWarning>false</i18n.failsIfWarning> <!-- generate license bundled files --> <license.generateBundle>true</license.generateBundle> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java index 13dffdb..23e5b6d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java @@ -35,7 +35,7 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.util.I18nEnumUtil; +import fr.ird.observe.application.swing.ui.util.I18nEnumUtil; import fr.ird.observe.application.swing.ui.actions.shared.AbstractUIAction; import fr.ird.observe.application.swing.ui.util.BooleanEditor; import fr.ird.observe.application.swing.ui.util.tripMap.ObserveMapPane; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java index afa82ab..7d898ed 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java @@ -35,7 +35,7 @@ import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.SetSeineDtos; import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.services.service.seine.SetSeineService; -import fr.ird.observe.services.util.I18nEnumUtil; +import fr.ird.observe.application.swing.ui.util.I18nEnumUtil; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/I18nEnumUtil.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/I18nEnumUtil.java new file mode 100644 index 0000000..8778375 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/I18nEnumUtil.java @@ -0,0 +1,101 @@ +package fr.ird.observe.application.swing.ui.util; + +/*- + * #%L + * ObServe :: Services API + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import java.beans.Introspector; +import java.util.Locale; + +import static org.nuiton.i18n.I18n.l; +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** + * Pour gérer les traductions des énumérations (qu'elles viennent de la persistence ou du modèle de service). + * + * Created on 08/03/16. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class I18nEnumUtil { + + static { + + n("observe.enum.schoolType.undefined"); + n("observe.enum.schoolType.objet"); + n("observe.enum.schoolType.libre"); + + n("observe.enum.typeTransmittingBuoyOperation.pasDeBalise"); + n("observe.enum.typeTransmittingBuoyOperation.visite"); + n("observe.enum.typeTransmittingBuoyOperation.recuperation"); + n("observe.enum.typeTransmittingBuoyOperation.pose"); + n("observe.enum.typeTransmittingBuoyOperation.recuperationEtRemplacement"); + + n("observe.enum.ownership.unknown"); + n("observe.enum.ownership.ceVessel"); + n("observe.enum.ownership.autreVessel"); + + n("observe.enum.nonTargetCatchComputedValueSource.fromData"); + n("observe.enum.nonTargetCatchComputedValueSource.fromSample"); + n("observe.enum.nonTargetCatchComputedValueSource.fromReferentiel"); + + n("observe.enum.gearType.longline"); + n("observe.enum.gearType.seine"); + + n("observe.enum.referenceStatus.enabled"); + n("observe.enum.referenceStatus.disabled"); + + n("observe.enum.tripMapPointType.seineDepartureHarbour"); + n("observe.enum.tripMapPointType.seineLandingHarbour"); + n("observe.enum.tripMapPointType.seineActivity"); + n("observe.enum.tripMapPointType.seineActivityInHarbour"); + n("observe.enum.tripMapPointType.seineActivityWithFreeSchoolType"); + n("observe.enum.tripMapPointType.seineActivityWithObjectSchoolType"); + n("observe.enum.tripMapPointType.longlineActivity"); + n("observe.enum.tripMapPointType.longlineDepartureHarbour"); + n("observe.enum.tripMapPointType.longlineLandingHarbour"); + n("observe.enum.tripMapPointType.longlineActivityInHarbour"); + n("observe.enum.tripMapPointType.longlineActivityWithSettingStart"); + n("observe.enum.tripMapPointType.longlineActivityWithSettingEnd"); + n("observe.enum.tripMapPointType.longlineActivityWithHaulingStart"); + n("observe.enum.tripMapPointType.longlineActivityWithHaulingEnd"); + n("observe.enum.tripMapPointType.longlineActivityWithInteraction"); + n("observe.enum.tripMapPointType.longlineActivityWithStation"); + + } + + public static <E extends Enum<E>> String getLabel(E e) { + return t(getLabelKey(e)); + } + + public static <E extends Enum<E>> String getLabel(Locale locale, E e) { + return l(locale, getLabelKey(e)); + } + + protected static <E extends Enum<E>> String getLabelKey(E e) { + String simpleName = e.getClass().getSimpleName(); + simpleName = simpleName.replace("Persist", ""); + + return "observe.enum." + Introspector.decapitalize(simpleName) + "." + e.name(); + } + +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java index 52582be..42b8786 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java @@ -33,7 +33,7 @@ import com.vividsolutions.jts.geom.Polygon; import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.constants.TripMapPointType; -import fr.ird.observe.services.util.I18nEnumUtil; +import fr.ird.observe.application.swing.ui.util.I18nEnumUtil; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.geotools.data.FileDataStore; diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 612c9b8..64696e0 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -66,6 +66,7 @@ observe.action.copy.column.headers= observe.action.copy.column.headers.tip= observe.action.copy.row.headers= observe.action.copy.row.headers.tip= +observe.action.copy.to.clipBoard= observe.action.create=Create observe.action.db.locale.es.tip=Change database language in spanish observe.action.db.locale.fr.tip=Change database language in french @@ -306,7 +307,16 @@ observe.actions.validate.config.report= observe.actions.validate.continue.with.no.save.report= observe.actions.validate.description= observe.actions.validate.invalid.data.list= +observe.actions.validate.message.detected= observe.actions.validate.message.list= +observe.actions.validate.message.no.validation.detected= +observe.actions.validate.message.not.save.report= +observe.actions.validate.message.nothing.to.do= +observe.actions.validate.message.operation.done= +observe.actions.validate.message.operation.needFix= +observe.actions.validate.message.prepare.validators= +observe.actions.validate.message.save.report= +observe.actions.validate.message.use.storage= observe.actions.validate.model.type.all= observe.actions.validate.model.type.all.description= observe.actions.validate.model.type.data= @@ -330,14 +340,12 @@ observe.actions.validate.step.description= observe.actions.validate.title=Validate datas observe.actions.validate.title.choose.report.directory= observe.actions.validate.title.tip=Validate datas of a storage -observe.actions.validate.message.detected= -observe.actions.validate.message.not.save.report= -observe.actions.validate.message.nothing.to.do= -observe.actions.validate.message.operation.done= -observe.actions.validate.message.operation.needFix= -observe.actions.validate.message.prepare.validators= -observe.actions.validate.message.save.report= -observe.actions.validate.message.use.storage= +observe.actions.validate.validator.field.header= +observe.actions.validate.validator.field.header.tip= +observe.actions.validate.validator.message.header= +observe.actions.validate.validator.message.header.tip= +observe.actions.validate.validator.scope.header= +observe.actions.validate.validator.scope.header.tip= observe.admin.resume.no.operation.done= observe.admin.resume.operation.canceled= observe.admin.resume.operation.done= @@ -824,12 +832,10 @@ observe.content.action.mitigationType.delete.tip= observe.content.action.mitigationType.detail.tip= observe.content.action.mitigationType.modify.tip= observe.content.action.mitigationType.save.tip= -observe.content.action.move.activities= observe.content.action.move.activities.longline= observe.content.action.move.activities.longline.tip= observe.content.action.move.activities.seine= observe.content.action.move.activities.seine.tip= -observe.content.action.move.activities.tip= observe.content.action.move.routes= observe.content.action.move.routes.tip= observe.content.action.move.trips= @@ -1794,7 +1800,44 @@ observe.content.type.referential= observe.content.vessel.tab.general=General caracteristics observe.content.vessel.tab.other=Other caracteristics observe.content.weightMeasure.delete.message=Confirm to delete current weight measure. +observe.converter.error.float.format= +observe.converter.error.no.convertor= +observe.converter.error.noValue= observe.entity.message.updating= +observe.enum.gearType.longline=Longline gear type +observe.enum.gearType.seine=Senne gear type +observe.enum.nonTargetCatchComputedValueSource.fromData=Computed from data +observe.enum.nonTargetCatchComputedValueSource.fromReferentiel=Computed from referential +observe.enum.nonTargetCatchComputedValueSource.fromSample=Computed from samples +observe.enum.ownership.autreVessel=Other vessel +observe.enum.ownership.ceVessel=This vessel +observe.enum.ownership.unknown=Unknown +observe.enum.referenceStatus.disabled=Disabled +observe.enum.referenceStatus.enabled=Enabled +observe.enum.schoolType.libre=Free school type +observe.enum.schoolType.objet=Object school type +observe.enum.schoolType.undefined=Undefined school type +observe.enum.tripMapPointType.longlineActivity=Activity +observe.enum.tripMapPointType.longlineActivityInHarbour=Au Harbour +observe.enum.tripMapPointType.longlineActivityWithHaulingEnd=Hauling end +observe.enum.tripMapPointType.longlineActivityWithHaulingStart=Hauling start +observe.enum.tripMapPointType.longlineActivityWithInteraction=Encounter +observe.enum.tripMapPointType.longlineActivityWithSettingEnd=Setting end +observe.enum.tripMapPointType.longlineActivityWithSettingStart=Setting start +observe.enum.tripMapPointType.longlineActivityWithStation=Station +observe.enum.tripMapPointType.longlineDepartureHarbour=Harbour departure +observe.enum.tripMapPointType.longlineLandingHarbour=Harbour landing +observe.enum.tripMapPointType.seineActivity=Activity +observe.enum.tripMapPointType.seineActivityInHarbour=In harbour +observe.enum.tripMapPointType.seineActivityWithFreeSchoolType=Free School type +observe.enum.tripMapPointType.seineActivityWithObjectSchoolType=Object School type +observe.enum.tripMapPointType.seineDepartureHarbour=Harbour departure +observe.enum.tripMapPointType.seineLandingHarbour=Harbour landing +observe.enum.typeTransmittingBuoyOperation.pasDeBalise=No Beacon +observe.enum.typeTransmittingBuoyOperation.pose=Posing +observe.enum.typeTransmittingBuoyOperation.recuperation=Grab +observe.enum.typeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change +observe.enum.typeTransmittingBuoyOperation.visite=Visit observe.error.can.not.create.directory= observe.error.no.activity.6= observe.error.storage.could.not.backup.unsane.local.db= @@ -1845,7 +1888,6 @@ observe.message.no.route.for.maree= observe.message.no.species.selected= observe.message.no.trip.for.program= observe.message.no.usage.for.entity= -observe.actions.validate.message.no.validation.detected= observe.message.quit.invalid.edit= observe.message.quit.valid.edit= observe.message.referentiel.editable= @@ -2217,9 +2259,11 @@ observe.tree.vesselType=Boat type observe.tree.weightCategory=Weight category observe.tree.weightMeasureType=Weight measure type observe.tree.wind=Wind +observe.validator.field.tip= +observe.validator.message.tip= +observe.validator.scope.tip= observe.view.message=Messages observe.view.navigation=Navigation observe.view.server= observe.warning.nimbus.landf=Could not use Look and Fell Nimbus, need at least version 1.6u10 of java. observe.warning.no.ui=No gui environment found -observe.action.copy.to.clipBoard= \ No newline at end of file diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 601d9e2..1c2656e 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -66,6 +66,7 @@ observe.action.copy.column.headers=Copiar los encabezados de columnas observe.action.copy.column.headers.tip=Añadir al resultado las cabeceras de columna observe.action.copy.row.headers=Copiar las cabeceras de linea observe.action.copy.row.headers.tip=Añadir al resultado las cabeceras de linea (ej. la primera columna) +observe.action.copy.to.clipBoard= observe.action.create=Crear observe.action.db.locale.es.tip=Cambia el idioma del referencial al español observe.action.db.locale.fr.tip=Cambiar el idioma del referencial al francés @@ -306,7 +307,16 @@ observe.actions.validate.config.report=Informe de validación observe.actions.validate.continue.with.no.save.report=Continuar sin guardar el informe observe.actions.validate.description= observe.actions.validate.invalid.data.list= +observe.actions.validate.message.detected=Se ha encontrado el validador para el tipo %1$s observe.actions.validate.message.list= +observe.actions.validate.message.no.validation.detected=Ningún validador encontrado. +observe.actions.validate.message.not.save.report=No hay informe que guardar. +observe.actions.validate.message.nothing.to.do=Los datos son válidos y no necesitan corrección. +observe.actions.validate.message.operation.done=Ha terminado la operación de validación de %1$td/%1$tm/%1$tY à %1$tH\:%1$tM\:%1$ts. +observe.actions.validate.message.operation.needFix=Los datos no son válidos y necesitan ser corregidos. +observe.actions.validate.message.prepare.validators=Detección de validadores +observe.actions.validate.message.save.report=El informe de validación se ha guardado en el archivo %1$s +observe.actions.validate.message.use.storage=Se realizará la validación de %1$s observe.actions.validate.model.type.all=Datos y referenciales observe.actions.validate.model.type.all.description=Datos y referenciales observe.actions.validate.model.type.data=Datos del observador @@ -330,14 +340,12 @@ observe.actions.validate.step.description= observe.actions.validate.title= observe.actions.validate.title.choose.report.directory= observe.actions.validate.title.tip= -observe.actions.validate.message.detected=Se ha encontrado el validador para el tipo %1$s -observe.actions.validate.message.not.save.report=No hay informe que guardar. -observe.actions.validate.message.nothing.to.do=Los datos son válidos y no necesitan corrección. -observe.actions.validate.message.operation.done=Ha terminado la operación de validación de %1$td/%1$tm/%1$tY à %1$tH\:%1$tM\:%1$ts. -observe.actions.validate.message.operation.needFix=Los datos no son válidos y necesitan ser corregidos. -observe.actions.validate.message.prepare.validators=Detección de validadores -observe.actions.validate.message.save.report=El informe de validación se ha guardado en el archivo %1$s -observe.actions.validate.message.use.storage=Se realizará la validación de %1$s +observe.actions.validate.validator.field.header= +observe.actions.validate.validator.field.header.tip= +observe.actions.validate.validator.message.header= +observe.actions.validate.validator.message.header.tip= +observe.actions.validate.validator.scope.header= +observe.actions.validate.validator.scope.header.tip= observe.admin.resume.no.operation.done=Ninguna operación realizada observe.admin.resume.operation.canceled=operación cancelada observe.admin.resume.operation.done=operacion realizada @@ -824,12 +832,10 @@ observe.content.action.mitigationType.delete.tip= observe.content.action.mitigationType.detail.tip= observe.content.action.mitigationType.modify.tip= observe.content.action.mitigationType.save.tip= -observe.content.action.move.activities= observe.content.action.move.activities.longline= observe.content.action.move.activities.longline.tip= observe.content.action.move.activities.seine= observe.content.action.move.activities.seine.tip= -observe.content.action.move.activities.tip= observe.content.action.move.routes= observe.content.action.move.routes.tip= observe.content.action.move.trips= @@ -1794,7 +1800,44 @@ observe.content.type.referential= observe.content.vessel.tab.general= observe.content.vessel.tab.other= observe.content.weightMeasure.delete.message= +observe.converter.error.float.format= +observe.converter.error.no.convertor= +observe.converter.error.noValue= observe.entity.message.updating=Se está modificando el objeto actual '%1$s'. +observe.enum.gearType.longline=Palangre +observe.enum.gearType.seine=Senne +observe.enum.nonTargetCatchComputedValueSource.fromData=Calculado a partir de otros datos +observe.enum.nonTargetCatchComputedValueSource.fromReferentiel=Calculado a partir del Referencial +observe.enum.nonTargetCatchComputedValueSource.fromSample=Calculado a partir de las muestras +observe.enum.ownership.autreVessel=Barco ajeno +observe.enum.ownership.ceVessel=Este barco o un barco del mismo armador +observe.enum.ownership.unknown=Desconocido +observe.enum.referenceStatus.disabled= +observe.enum.referenceStatus.enabled= +observe.enum.schoolType.libre=Banco libre +observe.enum.schoolType.objet=Banco a objeto +observe.enum.schoolType.undefined=Banco indeterminado +observe.enum.tripMapPointType.longlineActivity=Activity +observe.enum.tripMapPointType.longlineActivityInHarbour=Au Harbour +observe.enum.tripMapPointType.longlineActivityWithHaulingEnd=Hauling end +observe.enum.tripMapPointType.longlineActivityWithHaulingStart=Hauling start +observe.enum.tripMapPointType.longlineActivityWithInteraction=Encounter +observe.enum.tripMapPointType.longlineActivityWithSettingEnd=Setting end +observe.enum.tripMapPointType.longlineActivityWithSettingStart=Setting start +observe.enum.tripMapPointType.longlineActivityWithStation=Station +observe.enum.tripMapPointType.longlineDepartureHarbour=Harbour departure +observe.enum.tripMapPointType.longlineLandingHarbour=Harbour landing +observe.enum.tripMapPointType.seineActivity=Activity +observe.enum.tripMapPointType.seineActivityInHarbour=In harbour +observe.enum.tripMapPointType.seineActivityWithFreeSchoolType=Banco libre +observe.enum.tripMapPointType.seineActivityWithObjectSchoolType=Banco a objeto +observe.enum.tripMapPointType.seineDepartureHarbour=Harbour departure +observe.enum.tripMapPointType.seineLandingHarbour=Harbour landing +observe.enum.typeTransmittingBuoyOperation.pasDeBalise=DCP sin balizar +observe.enum.typeTransmittingBuoyOperation.pose=Colocación de nueva baliza +observe.enum.typeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua +observe.enum.typeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza +observe.enum.typeTransmittingBuoyOperation.visite=Visita a la baliza observe.error.can.not.create.directory=¡Imposible crear el directorio %1$s\! observe.error.no.activity.6=La actividad con código 6 no se ha encontrado en la base de datos. observe.error.storage.could.not.backup.unsane.local.db= @@ -1845,7 +1888,6 @@ observe.message.no.route.for.maree=Ninguna ruta en la marea actual observe.message.no.species.selected=Ninguna especie seleccionada observe.message.no.trip.for.program=Ninguna marea para el programa actual observe.message.no.usage.for.entity=Ningún usuario encontrado. -observe.actions.validate.message.no.validation.detected=Ningún validador encontrado. observe.message.quit.invalid.edit=¡Datos no validos, no se pueden guardar\!\n\nNota\: Si continúa se cancelarán todas las modificaciones. observe.message.quit.valid.edit=¡Los datos han sido modificados y son válidos\! observe.message.referentiel.editable=El referencial es editable. @@ -2217,9 +2259,11 @@ observe.tree.vesselType=Pesquería observe.tree.weightCategory=Categoría de peso observe.tree.weightMeasureType= observe.tree.wind=Fuerza del viento +observe.validator.field.tip= +observe.validator.message.tip= +observe.validator.scope.tip= observe.view.message= observe.view.navigation= observe.view.server= observe.warning.nimbus.landf= observe.warning.no.ui= -observe.action.copy.to.clipBoard= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index b83eea0..47cd21f 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1804,6 +1804,40 @@ observe.converter.error.float.format=Format de décimal incorrecte pour la valeu observe.converter.error.no.convertor=Impossible de convertir le décimal %s depuis le convertisseur %s observe.converter.error.noValue=Aucune valeur à convertir pour le convertisseur %s observe.entity.message.updating=L'objet '%1$s' est en cours de modification. +observe.enum.gearType.longline=longline +observe.enum.gearType.seine=Seine +observe.enum.nonTargetCatchComputedValueSource.fromData=calculé à partir des autres données +observe.enum.nonTargetCatchComputedValueSource.fromReferentiel=calculé à partir du référentiel +observe.enum.nonTargetCatchComputedValueSource.fromSample=calculé à partir des échantillons +observe.enum.ownership.autreVessel=Navire d'un autre armement +observe.enum.ownership.ceVessel=Ce navire ou cet armement +observe.enum.ownership.unknown=Inconnue +observe.enum.referenceStatus.disabled=Désactivé +observe.enum.referenceStatus.enabled=Actif +observe.enum.schoolType.libre=Banc libre +observe.enum.schoolType.objet=Banc objet +observe.enum.schoolType.undefined=Banc indéterminé +observe.enum.tripMapPointType.longlineActivity=point d'activité +observe.enum.tripMapPointType.longlineActivityInHarbour=Au port +observe.enum.tripMapPointType.longlineActivityWithHaulingEnd=Fin de virage +observe.enum.tripMapPointType.longlineActivityWithHaulingStart=Début de virage +observe.enum.tripMapPointType.longlineActivityWithInteraction=Rencontre +observe.enum.tripMapPointType.longlineActivityWithSettingEnd=Fin de filage +observe.enum.tripMapPointType.longlineActivityWithSettingStart=Début de filage +observe.enum.tripMapPointType.longlineActivityWithStation=Station océanographique +observe.enum.tripMapPointType.longlineDepartureHarbour=Port de départ +observe.enum.tripMapPointType.longlineLandingHarbour=Port d'arrivée +observe.enum.tripMapPointType.seineActivity=point d'activité +observe.enum.tripMapPointType.seineActivityInHarbour=Au port +observe.enum.tripMapPointType.seineActivityWithFreeSchoolType=Banc libre +observe.enum.tripMapPointType.seineActivityWithObjectSchoolType=Banc objet +observe.enum.tripMapPointType.seineDepartureHarbour=Port de départ +observe.enum.tripMapPointType.seineLandingHarbour=Port d'arrivée +observe.enum.typeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP +observe.enum.typeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise +observe.enum.typeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau +observe.enum.typeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise +observe.enum.typeTransmittingBuoyOperation.visite=Simple visite de la balise observe.error.can.not.create.directory=Création du répertoire %1$s impossible\! observe.error.no.activity.6=L'activité de type 6 n'a pas été trouvée en base. observe.error.storage.could.not.backup.unsane.local.db=Impossible d'enregistrer une base non endommagée diff --git a/observe-services-api/pom.xml b/observe-services-api/pom.xml index 909ead0..fc8a592 100644 --- a/observe-services-api/pom.xml +++ b/observe-services-api/pom.xml @@ -119,18 +119,6 @@ </testResources> <plugins> <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java index cf15f73..6dc846a 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.actions.consolidate; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.ObserveDto; +import fr.ird.observe.services.dto.constants.seine.SchoolType; import java.io.Serializable; @@ -50,15 +51,15 @@ public class ConsolidateActivitySeineDataResult implements Serializable,ObserveD */ protected String activitySeineLabel; - /** - * L'ancien type de banc (si le type de banc a été modifié). - */ - protected String oldSchoolType; - - /** - * Le nouveau type de banc (s'il a été modifié). - */ - protected String newSchoolType; +// /** +// * L'ancien type de banc (si le type de banc a été modifié). +// */ +// protected String oldSchoolType; +// +// /** +// * Le nouveau type de banc (s'il a été modifié). +// */ +// protected String newSchoolType; /** * L'ensemble des modifications sur les échantillons cibles. @@ -74,6 +75,8 @@ public class ConsolidateActivitySeineDataResult implements Serializable,ObserveD * L'ensemble des modifications sur les captures non cibles. */ protected ImmutableSet<NonTargetCatchModification> nonTargetCatchModifications; + private SchoolType oldSchoolType; + private SchoolType newSchoolType; public String getActivitySeineId() { return activitySeineId; @@ -83,18 +86,6 @@ public class ConsolidateActivitySeineDataResult implements Serializable,ObserveD return activitySeineLabel; } - public boolean isSchoolTypeModified() { - return newSchoolType != null; - } - - public String getOldSchoolType() { - return oldSchoolType; - } - - public String getNewSchoolType() { - return newSchoolType; - } - public ImmutableSet<TargetLengthModification> getTargetLengthModifications() { return targetLengthModifications; } @@ -107,6 +98,14 @@ public class ConsolidateActivitySeineDataResult implements Serializable,ObserveD return nonTargetCatchModifications; } + public SchoolType getOldSchoolType() { + return oldSchoolType; + } + + public SchoolType getNewSchoolType() { + return newSchoolType; + } + public static class TargetLengthModification implements Serializable { private static final long serialVersionUID = 1L; @@ -179,8 +178,6 @@ public class ConsolidateActivitySeineDataResult implements Serializable,ObserveD protected Number newValue; - protected String computeValueSource; - public String getNonTargetCatchId() { return nonTargetCatchId; } @@ -197,10 +194,6 @@ public class ConsolidateActivitySeineDataResult implements Serializable,ObserveD return newValue; } - public String getComputeValueSource() { - return computeValueSource; - } - } void setActivitySeineId(String activitySeineId) { @@ -211,7 +204,7 @@ public class ConsolidateActivitySeineDataResult implements Serializable,ObserveD this.activitySeineLabel = activitySeineLabel; } - void setSchoolTypeChanged(String oldSchoolType, String newSchoolType) { + void setSchoolTypeChanged(SchoolType oldSchoolType, SchoolType newSchoolType) { this.oldSchoolType = oldSchoolType; this.newSchoolType = newSchoolType; } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/util/I18nEnumUtil.java b/observe-services-api/src/main/java/fr/ird/observe/services/util/I18nEnumUtil.java deleted file mode 100644 index 8c0a99f..0000000 --- a/observe-services-api/src/main/java/fr/ird/observe/services/util/I18nEnumUtil.java +++ /dev/null @@ -1,99 +0,0 @@ -package fr.ird.observe.services.util; - -/*- - * #%L - * ObServe :: Services API - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import java.util.Locale; - -import static org.nuiton.i18n.I18n.l; -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; - -/** - * Pour gérer les traductions des énumérations (qu'elles viennent de la persistence ou du modèle de service). - * - * Created on 08/03/16. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class I18nEnumUtil { - - static { - n("observe.service.enum.schoolType.undefined"); - n("observe.service.enum.schoolType.objet"); - n("observe.service.enum.schoolType.libre"); - - n("observe.service.enum.typeTransmittingBuoyOperation.pasDeBalise"); - n("observe.service.enum.typeTransmittingBuoyOperation.visite"); - n("observe.service.enum.typeTransmittingBuoyOperation.recuperation"); - n("observe.service.enum.typeTransmittingBuoyOperation.pose"); - n("observe.service.enum.typeTransmittingBuoyOperation.recuperationEtRemplacement"); - - n("observe.service.enum.ownership.unknown"); - n("observe.service.enum.ownership.ceVessel"); - n("observe.service.enum.ownership.autreVessel"); - - n("observe.service.enum.nonTargetCatchComputedValueSource.fromData"); - n("observe.service.enum.nonTargetCatchComputedValueSource.fromSample"); - n("observe.service.enum.nonTargetCatchComputedValueSource.fromReferentiel"); - - n("observe.service.enum.gearType.longline"); - n("observe.service.enum.gearType.seine"); - - n("observe.service.enum.referenceStatus.enabled"); - n("observe.service.enum.referenceStatus.disabled"); - - n("observe.service.enum.tripMapPointType.seineDepartureHarbour"); - n("observe.service.enum.tripMapPointType.seineLandingHarbour"); - n("observe.service.enum.tripMapPointType.seineActivity"); - n("observe.service.enum.tripMapPointType.seineActivityInHarbour"); - n("observe.service.enum.tripMapPointType.seineActivityWithFreeSchoolType"); - n("observe.service.enum.tripMapPointType.seineActivityWithObjectSchoolType"); - n("observe.service.enum.tripMapPointType.longlineActivity"); - n("observe.service.enum.tripMapPointType.longlineDepartureHarbour"); - n("observe.service.enum.tripMapPointType.longlineLandingHarbour"); - n("observe.service.enum.tripMapPointType.longlineActivityInHarbour"); - n("observe.service.enum.tripMapPointType.longlineActivityWithSettingStart"); - n("observe.service.enum.tripMapPointType.longlineActivityWithSettingEnd"); - n("observe.service.enum.tripMapPointType.longlineActivityWithHaulingStart"); - n("observe.service.enum.tripMapPointType.longlineActivityWithHaulingEnd"); - n("observe.service.enum.tripMapPointType.longlineActivityWithInteraction"); - n("observe.service.enum.tripMapPointType.longlineActivityWithStation"); - - } - - public static <E extends Enum<E>> String getLabel(E e) { - return t(getLabelKey(e)); - } - - public static <E extends Enum<E>> String getLabel(Locale locale, E e) { - return l(locale, getLabelKey(e)); - } - - protected static <E extends Enum<E>> String getLabelKey(E e) { - String simpleName = e.getClass().getSimpleName(); - simpleName = simpleName.replace("Persist", ""); - - return "observe.service.enum." + simpleName + "." + e.name(); - } - -} diff --git a/observe-services-api/src/main/resources/i18n/observe-services-api_en_GB.properties b/observe-services-api/src/main/resources/i18n/observe-services-api_en_GB.properties deleted file mode 100644 index 5adb0f9..0000000 --- a/observe-services-api/src/main/resources/i18n/observe-services-api_en_GB.properties +++ /dev/null @@ -1,40 +0,0 @@ -observe.service.enum.gearType.longline=Longline gear type -observe.service.enum.gearType.seine=Senne gear type -observe.service.enum.nonTargetCatchComputedValueSource.fromData=Computed from data -observe.service.enum.nonTargetCatchComputedValueSource.fromReferentiel=Computed from referential -observe.service.enum.nonTargetCatchComputedValueSource.fromSample=Computed from samples -observe.service.enum.ownership.autreVessel=Other vessel -observe.service.enum.ownership.ceVessel=This vessel -observe.service.enum.ownership.unknown=Unknown -observe.service.enum.referenceStatus.disabled=Disabled -observe.service.enum.referenceStatus.enabled=Enabled -observe.service.enum.schoolType.libre=Free school type -observe.service.enum.schoolType.objet=Object school type -observe.service.enum.schoolType.undefined=Undefined school type -observe.service.enum.synchro.referential.mode.both=Bi-directional -observe.service.enum.synchro.referential.mode.both.description=To authorize modifications of data in both data sources -observe.service.enum.synchro.referential.mode.fromLeftToRight=From left to right -observe.service.enum.synchro.referential.mode.fromLeftToRight.description=To authorize modifications only in right data source -observe.service.enum.synchro.referential.mode.fromRightToLeft=From right to left -observe.service.enum.synchro.referential.mode.fromRightToLeft.description=To authorize modifications only in left data source -observe.service.enum.tripMapPointType.longlineActivity=Activity -observe.service.enum.tripMapPointType.longlineActivityInHarbour=Au Harbour -observe.service.enum.tripMapPointType.longlineActivityWithHaulingEnd=Hauling end -observe.service.enum.tripMapPointType.longlineActivityWithHaulingStart=Hauling start -observe.service.enum.tripMapPointType.longlineActivityWithInteraction=Encounter -observe.service.enum.tripMapPointType.longlineActivityWithSettingEnd=Setting end -observe.service.enum.tripMapPointType.longlineActivityWithSettingStart=Setting start -observe.service.enum.tripMapPointType.longlineActivityWithStation=Station -observe.service.enum.tripMapPointType.longlineDepartureHarbour=Harbour departure -observe.service.enum.tripMapPointType.longlineLandingHarbour=Harbour landing -observe.service.enum.tripMapPointType.seineActivity=Activity -observe.service.enum.tripMapPointType.seineActivityInHarbour=In harbour -observe.service.enum.tripMapPointType.seineActivityWithFreeSchoolType=Free School type -observe.service.enum.tripMapPointType.seineActivityWithObjectSchoolType=Object School type -observe.service.enum.tripMapPointType.seineDepartureHarbour=Harbour departure -observe.service.enum.tripMapPointType.seineLandingHarbour=Harbour landing -observe.service.enum.typeTransmittingBuoyOperation.pasDeBalise=No Beacon -observe.service.enum.typeTransmittingBuoyOperation.pose=Posing -observe.service.enum.typeTransmittingBuoyOperation.recuperation=Grab -observe.service.enum.typeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change -observe.service.enum.typeTransmittingBuoyOperation.visite=Visit diff --git a/observe-services-api/src/main/resources/i18n/observe-services-api_es_ES.properties b/observe-services-api/src/main/resources/i18n/observe-services-api_es_ES.properties deleted file mode 100644 index 1af2f22..0000000 --- a/observe-services-api/src/main/resources/i18n/observe-services-api_es_ES.properties +++ /dev/null @@ -1,40 +0,0 @@ -observe.service.enum.gearType.longline=Palangre -observe.service.enum.gearType.seine=Senne -observe.service.enum.nonTargetCatchComputedValueSource.fromData=Calculado a partir de otros datos -observe.service.enum.nonTargetCatchComputedValueSource.fromReferentiel=Calculado a partir del Referencial -observe.service.enum.nonTargetCatchComputedValueSource.fromSample=Calculado a partir de las muestras -observe.service.enum.ownership.autreVessel=Barco ajeno -observe.service.enum.ownership.ceVessel=Este barco o un barco del mismo armador -observe.service.enum.ownership.unknown=Desconocido -observe.service.enum.referenceStatus.disabled= -observe.service.enum.referenceStatus.enabled= -observe.service.enum.schoolType.libre=Banco libre -observe.service.enum.schoolType.objet=Banco a objeto -observe.service.enum.schoolType.undefined=Banco indeterminado -observe.service.enum.synchro.referential.mode.both= -observe.service.enum.synchro.referential.mode.both.description= -observe.service.enum.synchro.referential.mode.fromLeftToRight= -observe.service.enum.synchro.referential.mode.fromLeftToRight.description= -observe.service.enum.synchro.referential.mode.fromRightToLeft= -observe.service.enum.synchro.referential.mode.fromRightToLeft.description= -observe.service.enum.tripMapPointType.longlineActivity=Activity -observe.service.enum.tripMapPointType.longlineActivityInHarbour=Au Harbour -observe.service.enum.tripMapPointType.longlineActivityWithHaulingEnd=Hauling end -observe.service.enum.tripMapPointType.longlineActivityWithHaulingStart=Hauling start -observe.service.enum.tripMapPointType.longlineActivityWithInteraction=Encounter -observe.service.enum.tripMapPointType.longlineActivityWithSettingEnd=Setting end -observe.service.enum.tripMapPointType.longlineActivityWithSettingStart=Setting start -observe.service.enum.tripMapPointType.longlineActivityWithStation=Station -observe.service.enum.tripMapPointType.longlineDepartureHarbour=Harbour departure -observe.service.enum.tripMapPointType.longlineLandingHarbour=Harbour landing -observe.service.enum.tripMapPointType.seineActivity=Activity -observe.service.enum.tripMapPointType.seineActivityInHarbour=In harbour -observe.service.enum.tripMapPointType.seineActivityWithFreeSchoolType=Banco libre -observe.service.enum.tripMapPointType.seineActivityWithObjectSchoolType=Banco a objeto -observe.service.enum.tripMapPointType.seineDepartureHarbour=Harbour departure -observe.service.enum.tripMapPointType.seineLandingHarbour=Harbour landing -observe.service.enum.typeTransmittingBuoyOperation.pasDeBalise=DCP sin balizar -observe.service.enum.typeTransmittingBuoyOperation.pose=Colocación de nueva baliza -observe.service.enum.typeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua -observe.service.enum.typeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza -observe.service.enum.typeTransmittingBuoyOperation.visite=Visita a la baliza diff --git a/observe-services-api/src/main/resources/i18n/observe-services-api_fr_FR.properties b/observe-services-api/src/main/resources/i18n/observe-services-api_fr_FR.properties deleted file mode 100644 index e0d7bde..0000000 --- a/observe-services-api/src/main/resources/i18n/observe-services-api_fr_FR.properties +++ /dev/null @@ -1,40 +0,0 @@ -observe.service.enum.gearType.longline=longline -observe.service.enum.gearType.seine=Seine -observe.service.enum.nonTargetCatchComputedValueSource.fromData=calculé à partir des autres données -observe.service.enum.nonTargetCatchComputedValueSource.fromReferentiel=calculé à partir du référentiel -observe.service.enum.nonTargetCatchComputedValueSource.fromSample=calculé à partir des échantillons -observe.service.enum.ownership.autreVessel=Navire d'un autre armement -observe.service.enum.ownership.ceVessel=Ce navire ou cet armement -observe.service.enum.ownership.unknown=Inconnue -observe.service.enum.referenceStatus.disabled=Désactivé -observe.service.enum.referenceStatus.enabled=Actif -observe.service.enum.schoolType.libre=Banc libre -observe.service.enum.schoolType.objet=Banc objet -observe.service.enum.schoolType.undefined=Banc indéterminé -observe.service.enum.synchro.referential.mode.both=Bi-directionnelle -observe.service.enum.synchro.referential.mode.both.description=Pour autoriser les modifications sur les deux sources. -observe.service.enum.synchro.referential.mode.fromLeftToRight=Uni-directionnelle de la gauche vers la droite -observe.service.enum.synchro.referential.mode.fromLeftToRight.description=Pour autoriser les modification que sur la base de droite. -observe.service.enum.synchro.referential.mode.fromRightToLeft=Uni-directionnelle de la droite vers la gauche -observe.service.enum.synchro.referential.mode.fromRightToLeft.description=Pour autoriser les modifications que sur la base de gauche. -observe.service.enum.tripMapPointType.longlineActivity=point d'activité -observe.service.enum.tripMapPointType.longlineActivityInHarbour=Au port -observe.service.enum.tripMapPointType.longlineActivityWithHaulingEnd=Fin de virage -observe.service.enum.tripMapPointType.longlineActivityWithHaulingStart=Début de virage -observe.service.enum.tripMapPointType.longlineActivityWithInteraction=Rencontre -observe.service.enum.tripMapPointType.longlineActivityWithSettingEnd=Fin de filage -observe.service.enum.tripMapPointType.longlineActivityWithSettingStart=Début de filage -observe.service.enum.tripMapPointType.longlineActivityWithStation=Station océanographique -observe.service.enum.tripMapPointType.longlineDepartureHarbour=Port de départ -observe.service.enum.tripMapPointType.longlineLandingHarbour=Port d'arrivée -observe.service.enum.tripMapPointType.seineActivity=point d'activité -observe.service.enum.tripMapPointType.seineActivityInHarbour=Au port -observe.service.enum.tripMapPointType.seineActivityWithFreeSchoolType=Banc libre -observe.service.enum.tripMapPointType.seineActivityWithObjectSchoolType=Banc objet -observe.service.enum.tripMapPointType.seineDepartureHarbour=Port de départ -observe.service.enum.tripMapPointType.seineLandingHarbour=Port d'arrivée -observe.service.enum.typeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP -observe.service.enum.typeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise -observe.service.enum.typeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau -observe.service.enum.typeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise -observe.service.enum.typeTransmittingBuoyOperation.visite=Simple visite de la balise diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java index 05244cb..311d15a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java @@ -35,7 +35,7 @@ import fr.ird.observe.entities.seine.NonTargetCatch; import fr.ird.observe.entities.seine.NonTargetLength; import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.util.I18nEnumUtil; +import fr.ird.observe.services.dto.constants.seine.SchoolType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -70,9 +70,9 @@ public class ConsolidateActivitySeineDataResultBuilder { protected final ActivitySeine activitySeine; - protected String oldSchoolType; + protected SchoolType oldSchoolType; - protected String newSchoolType; + protected SchoolType newSchoolType; protected final ImmutableSet.Builder<String> lengthWeightParameterNotFoundBuilder = new ImmutableSet.Builder<>(); @@ -151,7 +151,7 @@ public class ConsolidateActivitySeineDataResultBuilder { element.speciesLabel = speciesLabel; element.propertyName = NonTargetCatch.PROPERTY_MEAN_LENGTH; element.newValue = nonTargetCatch.getMeanLength(); - element.computeValueSource = I18nEnumUtil.getLabel(locale, nonTargetCatch.getMeanLengthComputedSource()); +// element.computeValueSource = I18nEnumUtil.getLabel(locale, nonTargetCatch.getMeanLengthComputedSource()); nonTargetCatchModificationBuilder.add(element); break; @@ -163,7 +163,7 @@ public class ConsolidateActivitySeineDataResultBuilder { element.speciesLabel = speciesLabel; element.propertyName = NonTargetCatch.PROPERTY_MEAN_WEIGHT; element.newValue = nonTargetCatch.getMeanWeight(); - element.computeValueSource = I18nEnumUtil.getLabel(locale, nonTargetCatch.getMeanWeightComputedSource()); +// element.computeValueSource = I18nEnumUtil.getLabel(locale, nonTargetCatch.getMeanWeightComputedSource()); nonTargetCatchModificationBuilder.add(element); break; @@ -175,7 +175,7 @@ public class ConsolidateActivitySeineDataResultBuilder { element.speciesLabel = speciesLabel; element.propertyName = NonTargetCatch.PROPERTY_CATCH_WEIGHT; element.newValue = nonTargetCatch.getCatchWeight(); - element.computeValueSource = I18nEnumUtil.getLabel(locale, nonTargetCatch.getCatchWeightComputedSource()); +// element.computeValueSource = I18nEnumUtil.getLabel(locale, nonTargetCatch.getCatchWeightComputedSource()); nonTargetCatchModificationBuilder.add(element); break; @@ -187,7 +187,7 @@ public class ConsolidateActivitySeineDataResultBuilder { element.speciesLabel = speciesLabel; element.propertyName = NonTargetCatch.PROPERTY_TOTAL_COUNT; element.newValue = nonTargetCatch.getTotalCount(); - element.computeValueSource = I18nEnumUtil.getLabel(locale, nonTargetCatch.getTotalCountComputedSource()); +// element.computeValueSource = I18nEnumUtil.getLabel(locale, nonTargetCatch.getTotalCountComputedSource()); nonTargetCatchModificationBuilder.add(element); break; @@ -210,8 +210,8 @@ public class ConsolidateActivitySeineDataResultBuilder { } public ConsolidateActivitySeineDataResultBuilder setSchoolTypeChanged(SchoolTypePersist oldSchoolType, SchoolTypePersist newSchoolType) { - this.oldSchoolType = l(locale, I18nEnumUtil.getLabel(oldSchoolType)); - this.newSchoolType = l(locale, I18nEnumUtil.getLabel(newSchoolType)); + this.oldSchoolType = SchoolType.valueOf(oldSchoolType.name()); + this.newSchoolType = SchoolType.valueOf(newSchoolType.name()); return this; } diff --git a/pom.xml b/pom.xml index d4055dd..5feaacc 100644 --- a/pom.xml +++ b/pom.xml @@ -148,11 +148,12 @@ <!-- i18n configuration --> <!--FIXME Traduire en es et en --> - <!--<i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles>--> - <i18n.bundles>fr_FR</i18n.bundles> + <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> + <!--<i18n.bundles>fr_FR</i18n.bundles>--> <i18n.silent>true</i18n.silent> - <i18n.failsIfWarning>true</i18n.failsIfWarning> + <i18n.failsIfWarning>false</i18n.failsIfWarning> <i18n.checkBundle>true</i18n.checkBundle> + <i18n.showEmpty>true</i18n.showEmpty> <!-- Site configuration --> <locales>fr</locales> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.