This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 440123c30b0947388af39cce27689ffa7cd130eb Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 14 17:51:23 2015 +0200 traduction des types de bancs (refs #7598) --- .../ird/observe/db/constantes/ConstantsI18n.java | 23 ++++++++++++++++++++++ .../ui/content/impl/seine/SetSeineUIHandler.java | 9 ++++----- .../observe-application-swing_en_GB.properties | 3 +++ .../observe-application-swing_es_ES.properties | 3 +++ .../observe-application-swing_fr_FR.properties | 3 +++ 5 files changed, 36 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/constantes/ConstantsI18n.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constantes/ConstantsI18n.java new file mode 100644 index 0000000..34e8663 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constantes/ConstantsI18n.java @@ -0,0 +1,23 @@ +package fr.ird.observe.db.constantes; + +import fr.ird.observe.services.dto.constants.seine.SchoolType; + +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class ConstantsI18n { + + static { + n("observe.schoolType.undefined"); + n("observe.schoolType.objet"); + n("observe.schoolType.libre"); + } + + public static String getLabel(SchoolType schoolType) { + return t("observe.schoolType." + schoolType.name()); + } + +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java index 37fe34e..91a9cd4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java @@ -25,6 +25,7 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.db.constantes.ConstantsI18n; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; @@ -101,12 +102,10 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { } public String updateTypeValue(SchoolType schoolType) { - //FIXME -// if (schoolType == null) { + if (schoolType == null) { return t("observe.setSeine.schoolType.not.fill"); -// } - //FIXME -// return t(schoolType.getI18nKey()); + } + return ConstantsI18n.getLabel(schoolType); } @Override 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 659cd71..96bae25 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 @@ -1632,6 +1632,9 @@ observe.schoolEstimate.table.speciesThon= observe.schoolEstimate.table.speciesThon.tip= observe.schoolEstimate.table.weight= observe.schoolEstimate.table.weight.tip= +observe.schoolType.libre=Free school type +observe.schoolType.objet=Object school type +observe.schoolType.undefined=Undefined school type observe.section.cant.delete.message=The current section can not be deleted since it used by other data. observe.section.cant.delete.title=Can't delete section observe.sectionTemplate.delete.message=Confirm to delete current template. 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 e2f9403..177eba8 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 @@ -1634,6 +1634,9 @@ observe.schoolEstimate.table.speciesThon=Especie observe.schoolEstimate.table.speciesThon.tip=Especie de atún (no se puede modificar una vez se haya creado la estimación) observe.schoolEstimate.table.weight=Peso (en t) observe.schoolEstimate.table.weight.tip=Peso (en t) +observe.schoolType.libre=Banco libre +observe.schoolType.objet=Banco a objeto +observe.schoolType.undefined=Banco indeterminado observe.section.cant.delete.message= observe.section.cant.delete.title= observe.sectionTemplate.delete.message= 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 1803bd3..cd98046 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 @@ -1627,6 +1627,9 @@ observe.schoolEstimate.table.speciesThon=Espèce de thon observe.schoolEstimate.table.speciesThon.tip=Espèce de thon (ne peut pas être modifié une fois l'estimation crée) observe.schoolEstimate.table.weight=Poids (en t) observe.schoolEstimate.table.weight.tip=Poids (en t) +observe.schoolType.libre=Banc libre +observe.schoolType.objet=Banc objet +observe.schoolType.undefined=Banc indéterminé observe.section.cant.delete.message=La section ne peut pas être supprimée car elle est utilisée dans des données. observe.section.cant.delete.title=Impossible de supprimer la section observe.sectionTemplate.delete.message=Confirmer la suppression de la template sélectionnée. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.