Author: chatellier Date: 2010-11-24 10:25:20 +0000 (Wed, 24 Nov 2010) New Revision: 256 Log: Am?\195?\169lioration des messages d'erreur Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-error-validation.xml trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-fatal-validation.xml trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Strata-error-validation.xml trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml 2010-11-24 10:06:13 UTC (rev 255) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml 2010-11-24 10:25:20 UTC (rev 256) @@ -29,37 +29,37 @@ <field name="survey"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>You must enter a campagne name.</message> + <message>Missing survey name</message> </field-validator> </field> <field name="year"> <field-validator type="regex"> <param name="expression">[0-9]{4}</param> - <message>year is not valid</message> + <message>year is not valid (4 digits)</message> </field-validator> </field> <field name="haul"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>You must enter a trait name.</message> + <message>Missing haul name</message> </field-validator> </field> <field name="species"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>You must enter a espece name.</message> + <message>Missing specy name</message> </field-validator> </field> <field name="numberAsString"> <field-validator type="checkDouble"> <param name="notAvailable">NA</param> - <message>Number attribute is not a valid double</message> + <message>number attribute is not a valid double</message> </field-validator> </field> <field name="weightAsString"> <field-validator type="checkDouble"> <param name="notAvailable">NA</param> - <message>Weight attribute is not a valid double</message> + <message>weight attribute is not a valid double</message> </field-validator> </field> <validator type="coserExpression"> Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-error-validation.xml 2010-11-24 10:06:13 UTC (rev 255) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-error-validation.xml 2010-11-24 10:25:20 UTC (rev 256) @@ -28,28 +28,29 @@ <validators> <field name="survey"> <field-validator type="requiredstring"> - <message>You must enter a survey name.</message> + <message>Missing survey name</message> </field-validator> </field> <field name="year"> <field-validator type="regex"> <param name="expression">[0-9]{4}</param> - <message>year is not valid</message> + <message>year is not valid (4 digits)</message> </field-validator> </field> <field name="haul"> <field-validator type="requiredstring"> - <message>You must enter a haul name.</message> + <message>Missing haul name</message> </field-validator> </field> <field name="month"> - <field-validator type="requiredstring"> - <message>You must enter a month name.</message> + <field-validator type="regex"> + <param name="expression">[0-9]{2}</param> + <message>month is not valid (2 digits)</message> </field-validator> </field> <field name="stratum"> <field-validator type="requiredstring"> - <message>You must enter a stratum name.</message> + <message>Missing stratum name</message> </field-validator> </field> <field name="sweptSurfaceAsString"> @@ -73,7 +74,7 @@ <field name="depthAsString"> <field-validator type="checkDouble"> <param name="notAvailable">NA</param> - <message>Depth attribute is not a valid double</message> + <message>depth attribute is not a valid double</message> </field-validator> </field> </validators> \ No newline at end of file Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-fatal-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-fatal-validation.xml 2010-11-24 10:06:13 UTC (rev 255) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-fatal-validation.xml 2010-11-24 10:25:20 UTC (rev 256) @@ -29,19 +29,19 @@ <field name="sweptSurface"> <field-validator type="regex"> <param name="expression">\-?[0-9]+\.[0-9]{3,}</param> - <message>sweptSurface must contains at least 3 decimals</message> + <message>sweptSurface must contain at least 3 decimals</message> </field-validator> </field> <field name="lat"> <field-validator type="regex"> - <param name="expression">\-?[0-9]+\.[0-9]{3,}</param> - <message>lat must contains at least 3 decimals</message> + <param name="expression">\-?[0-9]+\.[0-9]{5,}</param> + <message>lat must contain at least 5 decimals</message> </field-validator> </field> <field name="long"> <field-validator type="regex"> - <param name="expression">\-?[0-9]+\.[0-9]{3,}</param> - <message>long must contains at least 3 decimals</message> + <param name="expression">\-?[0-9]+\.[0-9]{5,}</param> + <message>long must contain at least 5 decimals</message> </field-validator> </field> </validators> \ No newline at end of file Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml 2010-11-24 10:06:13 UTC (rev 255) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml 2010-11-24 10:25:20 UTC (rev 256) @@ -29,35 +29,35 @@ <field name="survey"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>You must enter a campagne name.</message> + <message>Missing survey name</message> </field-validator> </field> <field name="year"> <field-validator type="regex"> <param name="expression">[0-9]{4}</param> - <message>year is not valid</message> + <message>year is not valid (4 digits)</message> </field-validator> </field> <field name="haul"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>You must enter a trait name.</message> + <message>Missing haul name</message> </field-validator> </field> <field name="species"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>You must enter a espece name.</message> + <message>Missing specy name</message> </field-validator> </field> <field name="sex"> <field-validator type="requiredstring"> - <message>Sex is mandatory</message> + <message>Missing sex attribute</message> </field-validator> </field> <field name="maturity"> <field-validator type="requiredstring"> - <message>Maturity attribute is required</message> + <message>Missing maturity attribute</message> </field-validator> </field> <field name="lengthAsString"> @@ -66,7 +66,7 @@ </field-validator> </field> <validator type="coserExpression"> - <param name="expression"><![CDATA[lengthAsString.contains(".00") || lengthAsString.contains(".50")]]></param> + <param name="expression"><![CDATA[lengthAsString.endsWith(".00") || lengthAsString.endsWith(".0") || lengthAsString.endsWith(".50") || lengthAsString.endsWith(".5")]]></param> <message>coser.business.control.error.invalidLengthLengthStep</message> </validator> <field name="numberAsString"> @@ -78,12 +78,12 @@ <field name="weightAsString"> <field-validator type="checkDouble"> <param name="notAvailable">NA</param> - <message>Weight attribute is not a valid double</message> + <message>weight attribute is not a valid double</message> </field-validator> </field> <field name="age"> <field-validator type="requiredstring"> - <message>Age attribute is required</message> + <message>Missing age attribute</message> </field-validator> </field> </validators> \ No newline at end of file Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Strata-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Strata-error-validation.xml 2010-11-24 10:06:13 UTC (rev 255) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Strata-error-validation.xml 2010-11-24 10:25:20 UTC (rev 256) @@ -29,19 +29,19 @@ <field name="survey"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>You must enter a campagne name.</message> + <message>Missing survey name</message> </field-validator> </field> <field name="stratum"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>You must enter a strata name.</message> + <message>Missing stratum name</message> </field-validator> </field> <field name="surfaceAsString"> - <field-validator type="requiredstring"> - <param name="trim">true</param> - <message>You must enter a trait name.</message> + <field-validator type="checkDouble"> + <param name="notAvailable">NA</param> + <message>surface attribute is not a valid double</message> </field-validator> </field> </validators> \ No newline at end of file Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-11-24 10:06:13 UTC (rev 255) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-11-24 10:25:20 UTC (rev 256) @@ -1,30 +1,23 @@ -Age\ attribute\ is\ required= Can't\ create\ project= Can't\ find\ line\ %s\ for\ deletion= Can't\ find\ line\ %s\ for\ undeletion= Can't\ read\ file\ %s\ for\ category\ %s= Can't\ read\ file\ '%s'.\ Check\ CSV\ file\ separator= Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s= -Depth\ attribute\ is\ not\ a\ valid\ double= -Maturity\ attribute\ is\ required= +Missing\ age\ attribute= Missing\ file\ %s= -Number\ attribute\ is\ not\ a\ valid\ double= +Missing\ haul\ name= +Missing\ maturity\ attribute= +Missing\ sex\ attribute= +Missing\ specy\ name= +Missing\ stratum\ name= +Missing\ survey\ name= Project\ %s\ already\ exist= Project\ %s\ doesn't\ exists\ \!= Selection\ %s\ already\ exists= -Sex\ is\ mandatory= Specy\ %s\ doesn't\ exist\ in\ referential= -Weight\ attribute\ is\ not\ a\ valid\ double= Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s= Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s\ or\ %s= -You\ must\ enter\ a\ campagne\ name.= -You\ must\ enter\ a\ espece\ name.= -You\ must\ enter\ a\ haul\ name.= -You\ must\ enter\ a\ month\ name.= -You\ must\ enter\ a\ strata\ name.= -You\ must\ enter\ a\ stratum\ name.= -You\ must\ enter\ a\ survey\ name.= -You\ must\ enter\ a\ trait\ name.= coser.business.category.catch=Catch coser.business.category.haul=Haul coser.business.category.length=Length @@ -63,12 +56,16 @@ coser.config.reference.species.description= coser.config.reference.typeEspeces.description= coser.config.validator.directory.description= +depth\ attribute\ is\ not\ a\ valid\ double= lat\ attribute\ is\ not\ a\ valid\ double= -lat\ must\ contains\ at\ least\ 3\ decimals= +lat\ must\ contain\ at\ least\ 5\ decimals= length\ attribute\ is\ not\ a\ valid\ double= long\ attribute\ is\ not\ a\ valid\ double= -long\ must\ contains\ at\ least\ 3\ decimals= +long\ must\ contain\ at\ least\ 5\ decimals= +month\ is\ not\ valid\ (2\ digits)= number\ attribute\ is\ not\ a\ valid\ double= +surface\ attribute\ is\ not\ a\ valid\ double= sweptSurface\ attribute\ is\ not\ a\ valid\ double= -sweptSurface\ must\ contains\ at\ least\ 3\ decimals= -year\ is\ not\ valid= +sweptSurface\ must\ contain\ at\ least\ 3\ decimals= +weight\ attribute\ is\ not\ a\ valid\ double= +year\ is\ not\ valid\ (4\ digits)= Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-11-24 10:06:13 UTC (rev 255) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-11-24 10:25:20 UTC (rev 256) @@ -1,30 +1,23 @@ -Age\ attribute\ is\ required= Can't\ create\ project=Impossible de cr\u00E9er le projet Can't\ find\ line\ %s\ for\ deletion= Can't\ find\ line\ %s\ for\ undeletion= Can't\ read\ file\ %s\ for\ category\ %s=Impossible de lire le fichier %s pour la cat\u00E9gorie %s \! Can't\ read\ file\ '%s'.\ Check\ CSV\ file\ separator=Impossible de lire le fichier '%s'.\nMerci de v\u00E9rifier le s\u00E9parateur utilis\u00E9 est bien un point-virgule ';' Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s= -Depth\ attribute\ is\ not\ a\ valid\ double= -Maturity\ attribute\ is\ required= +Missing\ age\ attribute=Attribut age manquant Missing\ file\ %s=Fichier manquant \: %s -Number\ attribute\ is\ not\ a\ valid\ double= +Missing\ haul\ name=Nom de trait manquant +Missing\ maturity\ attribute=Attribut maturit\u00E9 manquant +Missing\ sex\ attribute=Attribut sex manquant +Missing\ specy\ name=Nom d'esp\u00E8ce manquant +Missing\ stratum\ name=Nom de strate manquant +Missing\ survey\ name=Nom de campagne manquant Project\ %s\ already\ exist=Le projet %s existe d\u00E9j\u00E0 \! Project\ %s\ doesn't\ exists\ \!=Le projet %s n'existe pas \! Selection\ %s\ already\ exists=La s\u00E9lection %s existe d\u00E9j\u00E0 \! -Sex\ is\ mandatory= Specy\ %s\ doesn't\ exist\ in\ referential=L'esp\u00E8ce %s n'existe pas dans le r\u00E9f\u00E9rentiel -Weight\ attribute\ is\ not\ a\ valid\ double= Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans\n%s.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s. Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s\ or\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans %s.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s\nou\u2009\:\n\t%s. -You\ must\ enter\ a\ campagne\ name.= -You\ must\ enter\ a\ espece\ name.= -You\ must\ enter\ a\ haul\ name.= -You\ must\ enter\ a\ month\ name.= -You\ must\ enter\ a\ strata\ name.= -You\ must\ enter\ a\ stratum\ name.= -You\ must\ enter\ a\ survey\ name.= -You\ must\ enter\ a\ trait\ name.= coser.business.category.catch=Captures coser.business.category.haul=Traits coser.business.category.length=Tailles @@ -63,12 +56,16 @@ coser.config.reference.species.description=Emplacement du fichier de r\u00E9f\u00E9rence des esp\u00E8ces coser.config.reference.typeEspeces.description=Emplacement du fichier de code type des esp\u00E8ces coser.config.validator.directory.description=Emplacement des fichiers de validations -lat\ attribute\ is\ not\ a\ valid\ double= -lat\ must\ contains\ at\ least\ 3\ decimals= -length\ attribute\ is\ not\ a\ valid\ double= -long\ attribute\ is\ not\ a\ valid\ double= -long\ must\ contains\ at\ least\ 3\ decimals= -number\ attribute\ is\ not\ a\ valid\ double= -sweptSurface\ attribute\ is\ not\ a\ valid\ double= -sweptSurface\ must\ contains\ at\ least\ 3\ decimals= -year\ is\ not\ valid= +depth\ attribute\ is\ not\ a\ valid\ double=L'attribut ProfMoy n'est pas un r\u00E9el valide +lat\ attribute\ is\ not\ a\ valid\ double=L'attribut Lat n'est pas un r\u00E9el valide +lat\ must\ contain\ at\ least\ 5\ decimals=L'attibut Lat doit contenir au moins 5 decimales +length\ attribute\ is\ not\ a\ valid\ double=L'attribut Longueur n'est pas un r\u00E9el valide +long\ attribute\ is\ not\ a\ valid\ double=L'attribut Long n'est pas un r\u00E9el valide +long\ must\ contain\ at\ least\ 5\ decimals=L'attribut Long doit contenir au moins 5 decimales +month\ is\ not\ valid\ (2\ digits)=L'attribut Mois n'est pas valide (2 chiffres) +number\ attribute\ is\ not\ a\ valid\ double=L'attribut Nombre n'est pas un r\u00E9el valide +surface\ attribute\ is\ not\ a\ valid\ double=L'attribut Surface n'est pas un r\u00E9el valide +sweptSurface\ attribute\ is\ not\ a\ valid\ double=L'attribut SurfaceBalayee n'est pas un r\u00E9el valide +sweptSurface\ must\ contain\ at\ least\ 3\ decimals=L'attribut SurfaceBalayee doit contenir au moins 3 decimales +weight\ attribute\ is\ not\ a\ valid\ double=L'attribut Poids n'est pas un r\u00E9el valide +year\ is\ not\ valid\ (4\ digits)=L'attribut Ann\u00E9e n'est pas valide (2 chiffres)