Author: bleny Date: 2012-03-06 16:06:35 +0100 (Tue, 06 Mar 2012) New Revision: 1550 Url: http://forge.codelutin.com/repositories/revision/wao/1550 Log: cl?\195?\169 d?\195?\169j?\195?\160 d?\195?\169clar?\195?\169e dans le module business Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2012-03-06 15:04:19 UTC (rev 1549) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2012-03-06 15:06:35 UTC (rev 1550) @@ -320,4 +320,4 @@ wao.import.sampleRow.failure.wrongFishingZone=There is no fishing zone with the code '%s' wao.import.sampleRow.failure.wrongSampleRowCodeFormat=The sample row code '%s' is not compliant with the format "YYYY_IIII" wao.validation.sampleRow.conflictOnObserver=Observer %s cannot be associated to the line %s because he has to observer, on the same day, for row %s -wao.validation.sampleRow.observerNotInCompany=Observer %s doesn't work for company %s \ No newline at end of file +wao.validation.sampleRow.observerNotInCompany=Observer %s doesn't work for company %s Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2012-03-06 15:04:19 UTC (rev 1549) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2012-03-06 15:06:35 UTC (rev 1550) @@ -856,7 +856,7 @@ } else if (isCreateMode()) { if ( ! WaoUtils.isValidSampleRowCode(getSampleRow().getCode())) { sampleRowForm.recordError(code, String.format( - messages.get(n_("wao.import.sampleRow.failure.wrongSampleRowCodeFormat")), + messages.get("wao.import.sampleRow.failure.wrongSampleRowCodeFormat"), getSampleRow().getCode())); } }