Author: tchemit Date: 2012-10-10 22:16:50 +0200 (Wed, 10 Oct 2012) New Revision: 622 Url: http://forge.codelutin.com/repositories/revision/sammoa/622 Log: fixes #1586: Am?\195?\169liorer la validation du skyGlint refs #1587: Am?\195?\169liorer le controle du subjective condition Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-onBoard-error-validation.xml trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-validation-error-validation.xml trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-onBoard-error-validation.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-onBoard-error-validation.xml 2012-10-10 15:43:42 UTC (rev 621) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-onBoard-error-validation.xml 2012-10-10 20:16:50 UTC (rev 622) @@ -74,7 +74,8 @@ <field-validator type="int" short-circuit="true"> <param name="min">0</param> - <message>sammoa.validator.route.skyGlint.invalidMin##${min}</message> + <param name="max">2</param> + <message>sammoa.validator.route.skyGlint.invalidRange##${min}##${max}</message> </field-validator> </field> @@ -123,7 +124,7 @@ <field-validator type="regex" short-circuit="true"> <param name="expression"> - <![CDATA[ [EGMP]{2} ]]> + <![CDATA[ [EGMPLX]{2} ]]> </param> <message>sammoa.validator.route.subjectiveConditions.unkownValue</message> </field-validator> Modified: trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-validation-error-validation.xml =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-validation-error-validation.xml 2012-10-10 15:43:42 UTC (rev 621) +++ trunk/sammoa-ui-swing/src/main/resources/fr/ulr/sammoa/persistence/Route-validation-error-validation.xml 2012-10-10 20:16:50 UTC (rev 622) @@ -74,7 +74,8 @@ <field-validator type="int" short-circuit="true"> <param name="min">0</param> - <message>sammoa.validator.route.skyGlint.invalidMin##${min}</message> + <param name="max">2</param> + <message>sammoa.validator.route.skyGlint.invalidRange##${min}##${max}</message> </field-validator> </field> @@ -122,9 +123,7 @@ </field-validator> <field-validator type="regex" short-circuit="true"> - <param name="expression"> - <![CDATA[ [EGMP]{2} ]]> - </param> + <param name="expression"><![CDATA[ [EGMPLX]{2} ]]></param> <message>sammoa.validator.route.subjectiveConditions.unkownValue</message> </field-validator> Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-10-10 15:43:42 UTC (rev 621) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-10-10 20:16:50 UTC (rev 622) @@ -298,7 +298,7 @@ sammoa.validator.route.glareSeverity.invalidRange=The glare severity must be between %1$s and %2$s (0 \: no glare, 3 \: strong glare) sammoa.validator.route.glareTo.invalidRange=The glare must be in degrees between %1$s and %2$s (plane nose is at 0°) sammoa.validator.route.seaState.invalidRange=The sea state must be between %1$s and %2$s (beaufort system) -sammoa.validator.route.skyGlint.invalidMin=The sky glint must be higher than %1$s +sammoa.validator.route.skyGlint.invalidRange=The sky glint must be between %1$s and %2$s sammoa.validator.route.subjectiveConditions.badLength=The subjective conditions must have %1$s characters (one letter for each side) sammoa.validator.route.subjectiveConditions.required=The subjective conditions is mandatory sammoa.validator.route.subjectiveConditions.unkownValue=The subjective conditions must be \: E for excellent, G for good, M for medium, P for poor