Author: chris.laprun(a)jboss.com Date: 2012-03-14 12:24:13 -0400 (Wed, 14 Mar 2012) New Revision: 8599 Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties Log: - GTNPORTAL-2377: + Only output one message of each type in CompoundApplicationMessage + Fixed UsernameValidator and improved IdentifierValidator and ResourceValidator to fail fast when we have an error condition in a loop + Fixed improper/missing localization in EN and FR properties, would need to be done for other languages as well Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2012-03-14 16:19:24 UTC (rev 8598) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2012-03-14 16:24:13 UTC (rev 8599) @@ -230,16 +230,17 @@ #{0}=input field name NameValidator.msg.Invalid-char=Only alpha, digit, dot, dash and underscore characters are allowed for the field "{0}". -FirstCharacterNameValidator.msg=The "{0}" field must start with a character. +FirstCharacterNameValidator.msg=The "{0}" field must start with a letter. FirstAndSpecialCharacterNameValidator.msg=The "{0}" field must start with a character and must not contain special characters." ############################################################################## # Username Validator ############################################################################## -LastCharacterUsernameValidator.msg=The field "{0}" must end with a character or digit. -ConsecutiveSymbolValidator.msg=The field "{0}" cannot contain consecutive "{1}" and "{2}" symbols. -UsernameValidator.msg.Invalid-char=Only alpha lower, digit, dot and underscore characters are allowed for the field "{0}". +LastCharacterUsernameValidator.msg=The field "{0}" must end with a character or digit instead of "{1}". +ConsecutiveSymbolValidator.msg=The field "{0}" cannot contain consecutive symbols. Allowed symbols are: {1}. +UsernameValidator.msg.Invalid-char=Only alpha lower, digit, dot and underscore lowercase characters are allowed for the field "{0}". +FirstCharacterUsernameValidator.msg=The "{0}" field must start with a lowercase letter. ############################################################################## # Natural language Validator Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2012-03-14 16:19:24 UTC (rev 8598) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2012-03-14 16:24:13 UTC (rev 8599) @@ -203,6 +203,12 @@ NameValidator.msg.Invalid-char=Seuls les caractères "a..z", "A..Z","0..9", ".", "-" et "_" sont autorisés dans le champ "{0}". FirstCharacterNameValidator.msg=Le champ "{0}" doit commencer par une lettre. +# Username validator +ConsecutiveSymbolValidator.msg=Le champ "{0}" ne peut pas contenir des symboles consécutifs. Les symboles autorisés sont: {1}. +UsernameValidator.msg.Invalid-char=Seuls les caractères "a..z", "0..9", "." et "_" sont autorisés dans le champ "{0}". +FirstCharacterUsernameValidator.msg=Le champ "{0}" doit commencer par une lettre minuscule. +LastCharacterUsernameValidator.msg=Le champ "{0}" doit se terminer par une lettre minuscule ou un chiffre au lieu de "{1}". + ############################################################################# # Message Info # #############################################################################