This is an automated email from the git hooks/post-receive script. New commit to branch feature/5973 in repository wao. See http://git.codelutin.com/wao.git commit be716c0c1830dab6dcd0ccf123d68a8594173a36 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Dec 2 17:33:56 2014 +0100 Déclaration du programme Sclérochronologie --- .../src/main/java/fr/ifremer/wao/entity/ObsProgram.java | 7 ++++++- .../src/main/resources/i18n/wao-persistence_en_GB.properties | 1 + .../src/main/resources/i18n/wao-persistence_fr_FR.properties | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java index 68a8f7d..92052f1 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java @@ -27,7 +27,8 @@ import static org.nuiton.i18n.I18n.n; public enum ObsProgram implements I18nAble { OBSMER("M", n("ObsProgram.OBSMER")), - OBSVENTE("V", n("ObsProgram.OBSVENTE")); + OBSVENTE("V", n("ObsProgram.OBSVENTE")), + SCLEROCHRONOLOGY("S", n("ObsProgram.SCLEROCHRONOLOGY")); protected String i18nKey; @@ -59,6 +60,10 @@ public enum ObsProgram implements I18nAble { return OBSVENTE == this; } + public boolean isSclerochronology() { + return SCLEROCHRONOLOGY == this; + } + @Override public String getI18nKey() { return i18nKey; diff --git a/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties b/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties index 75d34a3..4334ea7 100644 --- a/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties +++ b/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties @@ -27,6 +27,7 @@ LocationType.PORT=Port LocationType.REGION=Region ObsProgram.OBSMER=ObsMer ObsProgram.OBSVENTE=ObsVente +ObsProgram.SCLEROCHRONOLOGY=Sclerochronology ObservationType.FIELD_WORK_OBSERVATION=Field work observation ObservationType.FIELD_WORK_SURVEY=Field work survey ObservationType.PHONE_CALL=Survey by phone diff --git a/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties b/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties index b174041..cf72839 100644 --- a/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties +++ b/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties @@ -27,6 +27,7 @@ LocationType.PORT=Port LocationType.REGION=Région Ifremer ObsProgram.OBSMER=ObsMer ObsProgram.OBSVENTE=ObsVente +ObsProgram.SCLEROCHRONOLOGY=Sclérochronologie ObservationType.FIELD_WORK_OBSERVATION=Observation de terrain ObservationType.FIELD_WORK_SURVEY=Enquête de terrain ObservationType.PHONE_CALL=Enquête téléphonique -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.