branch develop-4.x updated (b94c204 -> 1e657fa)
This is an automated email from the git hooks/post-receive script. New change to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git from b94c204 Mise à jour de codelutinpom et de la configuration du site technique new 6559979 Certains controles sur les espèces ne sont plus actifs (Fixes #7816) new 1e657fa Pour changer le libelle d'un champs à valider, il faut le traduire The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1e657fa431b716d372822bac515d7e1caafb1f3b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 13 11:15:58 2016 +0100 Pour changer le libelle d'un champs à valider, il faut le traduire commit 65599795df8f0cc3673be71feacdf0a81505fb9c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 13 11:15:24 2016 +0100 Certains controles sur les espèces ne sont plus actifs (Fixes #7816) Summary of changes: .../main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css | 2 +- .../src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css | 2 +- .../fr/ird/observe/ui/content/table/impl/seine/AbstractSampleUI.css | 2 +- .../fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css | 2 +- .../java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.css | 2 +- .../fr/ird/observe/validation/field/AbstractEspeceFieldValidator.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) -- 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-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 65599795df8f0cc3673be71feacdf0a81505fb9c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 13 11:15:24 2016 +0100 Certains controles sur les espèces ne sont plus actifs (Fixes #7816) --- .../fr/ird/observe/validation/field/AbstractEspeceFieldValidator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-validation/src/main/java/fr/ird/observe/validation/field/AbstractEspeceFieldValidator.java b/observe-validation/src/main/java/fr/ird/observe/validation/field/AbstractEspeceFieldValidator.java index 9194ff7..e9d1a90 100644 --- a/observe-validation/src/main/java/fr/ird/observe/validation/field/AbstractEspeceFieldValidator.java +++ b/observe-validation/src/main/java/fr/ird/observe/validation/field/AbstractEspeceFieldValidator.java @@ -117,7 +117,7 @@ public abstract class AbstractEspeceFieldValidator extends FieldValidatorSupport */ protected String expression; - protected String speciesField = "espece"; + protected String speciesField = "species"; public ValueStack getValueStack() { return valueStack; -- 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-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 1e657fa431b716d372822bac515d7e1caafb1f3b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 13 11:15:58 2016 +0100 Pour changer le libelle d'un champs à valider, il faut le traduire --- .../main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css | 2 +- .../src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css | 2 +- .../fr/ird/observe/ui/content/table/impl/seine/AbstractSampleUI.css | 2 +- .../fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css | 2 +- .../java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.css | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css index 0f00e65..f5cc772 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUI.css @@ -85,7 +85,7 @@ BeanComboBox { #supportVesselName { _propertyName:{FloatingObject.PROPERTY_SUPPORT_VESSEL_NAME}; text:{getStringValue(bean.getSupportVesselName())}; - _validatorLabel:{"observe.common.supportVesselName"}; + _validatorLabel:{t("observe.common.supportVesselName")}; } #resetSupportVesselName{ diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css index 7e4d4ee..6fdc6e7 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUI.css @@ -42,7 +42,7 @@ label:{t("observe.setSeine.startTime")}; date:{bean.getStartTime()}; dateEditable:false; - _validatorLabel:{"observe.setSeine.startTime"}; + _validatorLabel:{t("observe.setSeine.startTime")}; } #endPursingTimeStamp { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/AbstractSampleUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/AbstractSampleUI.css index 8a7a337..70a8ad8 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/AbstractSampleUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/AbstractSampleUI.css @@ -71,7 +71,7 @@ JToolBar { property:"weight"; model:{tableEditBean.getWeight()}; numberPattern:{fr.ird.observe.ui.UIHelper.DECIMAL2_PATTERN}; - _validatorLabel:{"observe.common.weight.ind"}; + _validatorLabel:{t("observe.common.weight.ind")}; } #weightSourceInformation { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css index bc9c1ef..2bcb0fb 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUI.css @@ -54,7 +54,7 @@ } #length { - _validatorLabel:{"observe.common.taille"}; + _validatorLabel:{t("observe.common.taille")}; } #countLabel { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.css index 0216968..1f88985 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUI.css @@ -68,7 +68,7 @@ } #length { - _validatorLabel:{"observe.common.length.inf"}; + _validatorLabel:{t("observe.common.length.inf")}; } #countLabel { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm