diff --git a/Frameworks/Ajax/ERDivaLook/Resources/English.lproj/ValidationTemplate.strings b/Frameworks/Ajax/ERDivaLook/Resources/English.lproj/ValidationTemplate.strings index 4192f9fac1d..5a8ac228e18 100644 --- a/Frameworks/Ajax/ERDivaLook/Resources/English.lproj/ValidationTemplate.strings +++ b/Frameworks/Ajax/ERDivaLook/Resources/English.lproj/ValidationTemplate.strings @@ -1,10 +1,10 @@ { - "IllegalCharacterInNumberException" = "Please check the value @@value@@ you supplied for the field @@displayNameForProperty@@."; - "InvalidDateFormatException" = "Please check @@displayNameForProperty@@ as @@value@@ is not a valid date"; + "IllegalCharacterInNumberException" = "Please check the value @@escapedValue@@ you supplied for the field @@displayNameForProperty@@."; + "InvalidDateFormatException" = "Please check @@displayNameForProperty@@ as @@escapedValue@@ is not a valid date"; "InvalidNumberException" = "The value is an invalid number."; "MandatoryToManyRelationshipException" = "A @@displayNameForEntity@@ must have a least one @@displayNameForDestinationEntity@@."; "MandatoryToOneRelationshipException" = "A @@displayNameForEntity@@ must have a @@displayNameForProperty@@."; - "NotANumberException" = "Sorry, I could not read this number @@value@@ "; + "NotANumberException" = "Sorry, I could not read this number @@escapedValue@@ "; "NullPropertyException" = "Please provide a @@displayNameForProperty@@."; "ObjectCannotBeDeletedException" = "Cannot delete this @@displayNameForEntity@@ because either this @@displayNameForEntity@@ or any object related to this @@displayNameForEntity@@ cannot be deleted."; "ObjectRemovalException" = "Cannot delete this @@displayNameForEntity@@. You should first delete the item in its @@displayNameForProperty@@."; diff --git a/Frameworks/Core/ERDirectToWeb/Resources/Dutch.lproj/ValidationTemplate.strings b/Frameworks/Core/ERDirectToWeb/Resources/Dutch.lproj/ValidationTemplate.strings index 06f929859b9..ba8c6d82d1a 100644 --- a/Frameworks/Core/ERDirectToWeb/Resources/Dutch.lproj/ValidationTemplate.strings +++ b/Frameworks/Core/ERDirectToWeb/Resources/Dutch.lproj/ValidationTemplate.strings @@ -1,10 +1,10 @@ { - "IllegalCharacterInNumberException" = "De waarde @@value@@ in @@displayNameForProperty@@ is niet toegestaan."; - "InvalidDateFormatException" = "De waarde @@value@@ in @@displayNameForProperty@@ is geen geldige datum."; + "IllegalCharacterInNumberException" = "De waarde @@escapedValue@@ in @@displayNameForProperty@@ is niet toegestaan."; + "InvalidDateFormatException" = "De waarde @@escapedValue@@ in @@displayNameForProperty@@ is geen geldige datum."; "InvalidNumberException" = "Deze waarde is geen getal."; "MandatoryToManyRelationshipException" = "@@displayNameForProperty@@ moet ingevuld zijn."; "MandatoryToOneRelationshipException" = "@@displayNameForProperty@@ moet ingevuld zijn."; - "NotANumberException" = "De waarde @@value@@ is geen getal."; + "NotANumberException" = "De waarde @@escapedValue@@ is geen getal."; "NullPropertyException" = "Vul het veld @@displayNameForProperty@@ in."; "ObjectCannotBeDeletedException" = "Deze @@displayNameForEntity@@ kan niet verwijderd worden, omdat u geen rechten hebt deze @@displayNameForEntity@@ direct of een van de verwante objecten van @@displayNameForEntity@@ te verwijderen."; "ObjectRemovalException" = "@@displayNameForEntity@@ kan niet verwijderd worden als @@displayNameForProperty@@ nog bestaat."; diff --git a/Frameworks/Core/ERDirectToWeb/Resources/English.lproj/ValidationTemplate.strings b/Frameworks/Core/ERDirectToWeb/Resources/English.lproj/ValidationTemplate.strings index f00b2219fa9..ca7368c9e42 100644 --- a/Frameworks/Core/ERDirectToWeb/Resources/English.lproj/ValidationTemplate.strings +++ b/Frameworks/Core/ERDirectToWeb/Resources/English.lproj/ValidationTemplate.strings @@ -1,10 +1,10 @@ { - "IllegalCharacterInNumberException" = "Please check the value @@value@@ you supplied for the field @@displayNameForProperty@@."; - "InvalidDateFormatException" = "Please check @@displayNameForProperty@@ as @@value@@ is not a valid date"; + "IllegalCharacterInNumberException" = "Please check the value @@escapedValue@@ you supplied for the field @@displayNameForProperty@@."; + "InvalidDateFormatException" = "Please check @@displayNameForProperty@@ as @@escapedValue@@ is not a valid date"; "InvalidNumberException" = "The value is an invalid number."; "MandatoryToManyRelationshipException" = "A @@displayNameForEntity@@ must have a least one @@displayNameForDestinationEntity@@."; "MandatoryToOneRelationshipException" = "A @@displayNameForEntity@@ must have a @@displayNameForProperty@@."; - "NotANumberException" = "Sorry, I could not read this number @@value@@ "; + "NotANumberException" = "Sorry, I could not read this number @@escapedValue@@ "; "NullPropertyException" = "Please provide @@indefiniteArticleForProperty@@ @@displayNameForProperty@@."; "ObjectCannotBeDeletedException" = "Cannot delete this @@displayNameForEntity@@ because either this @@displayNameForEntity@@ or any object related to this @@displayNameForEntity@@ cannot be deleted."; "ObjectRemovalException" = "Cannot delete this @@displayNameForEntity@@. You should first delete the item in its @@displayNameForProperty@@."; diff --git a/Frameworks/Core/ERDirectToWeb/Resources/German.lproj/ValidationTemplate.strings b/Frameworks/Core/ERDirectToWeb/Resources/German.lproj/ValidationTemplate.strings index 7161e06fdde..9b441308cd1 100644 --- a/Frameworks/Core/ERDirectToWeb/Resources/German.lproj/ValidationTemplate.strings +++ b/Frameworks/Core/ERDirectToWeb/Resources/German.lproj/ValidationTemplate.strings @@ -1,10 +1,10 @@ { - "IllegalCharacterInNumberException" = "Bitte \U00fcberpr\U00fcfen Sie den Wert @@value@@ in @@displayNameForProperty@@."; - "InvalidDateFormatException" = "Der Wert @@value@@ in @@displayNameForProperty@@ ist kein g\U00fcltiges Datum."; + "IllegalCharacterInNumberException" = "Bitte \U00fcberpr\U00fcfen Sie den Wert @@escapedValue@@ in @@displayNameForProperty@@."; + "InvalidDateFormatException" = "Der Wert @@escapedValue@@ in @@displayNameForProperty@@ ist kein g\U00fcltiges Datum."; "InvalidNumberException" = "Dieser Wert ist keine Zahl."; "MandatoryToManyRelationshipException" = "@@displayNameForProperty@@ m\U00fcssen gesetzt sein."; "MandatoryToOneRelationshipException" = "@@displayNameForProperty@@ muss gesetzt sein."; - "NotANumberException" = "Der Wert @@value@@ ist keine Zahl."; + "NotANumberException" = "Der Wert @@escapedValue@@ ist keine Zahl."; "NullPropertyException" = "Bitte f\U00fcllen Sie das Feld @@displayNameForProperty@@ aus."; "ObjectCannotBeDeletedException" = "Diese @@displayNameForEntity@@ kann nicht gel\U00f6scht werden, weil Sie keine Rechte haben, diese @@displayNameForEntity@@ direkt oder eines der verkn\U00fcpften Objekte dieser @@displayNameForEntity@@ zu l\U00f6schen."; "ObjectRemovalException" = "@@displayNameForEntity@@ kann nicht gel\U00f6scht werden l\U00f6schen, solange noch @@displayNameForProperty@@ gesetzt sind."; diff --git a/Frameworks/Core/ERExtensions/Resources/Dutch.lproj/ValidationTemplate.strings b/Frameworks/Core/ERExtensions/Resources/Dutch.lproj/ValidationTemplate.strings index fedfb35fb1a..eed8e15c8ee 100644 --- a/Frameworks/Core/ERExtensions/Resources/Dutch.lproj/ValidationTemplate.strings +++ b/Frameworks/Core/ERExtensions/Resources/Dutch.lproj/ValidationTemplate.strings @@ -1,7 +1,7 @@ { "EOObjectNotAvailableException" = "Dit gegeven is niet gevonden in de database. Het gegeven is vermoedelijk verwijderd door iemand anders."; "ExceedsMaximumLengthException" = "De waarde in @@displayNameForProperty@@ is langer dan de maximale lengte van @@attribute.width@@ tekens."; - "InvalidNumberException" = "Controleer ** KEY_MARKER ** aangezien @@value@@ een ongeldig getal is."; + "InvalidNumberException" = "Controleer ** KEY_MARKER ** aangezien @@escapedValue@@ een ongeldig getal is."; "MandatoryToManyRelationshipException" = "@@object.entityName@@ heeft een verplichte verbinding welke niet ingevuld is."; "MandatoryToOneRelationshipException" = "Een @@displayNameForEntity@@ moet een @@displayNameForProperty@@ hebben."; "NullPropertyException" = "Vul ** KEY_MARKER ** in."; diff --git a/Frameworks/Core/ERExtensions/Resources/German.lproj/ValidationTemplate.strings b/Frameworks/Core/ERExtensions/Resources/German.lproj/ValidationTemplate.strings index bc373363599..e29b5108f53 100644 --- a/Frameworks/Core/ERExtensions/Resources/German.lproj/ValidationTemplate.strings +++ b/Frameworks/Core/ERExtensions/Resources/German.lproj/ValidationTemplate.strings @@ -1,7 +1,7 @@ { "EOObjectNotAvailableException" = "This object was not found in the database. It was probably deleted by someone else."; "ExceedsMaximumLengthException" = "The value entered for @@displayNameForProperty@@ exceeds the length of @@attribute.width@@."; - "InvalidNumberException" = "Please check @@displayNameForProperty@@ as @@value@@ is an invalid number."; + "InvalidNumberException" = "Please check @@displayNameForProperty@@ as @@escapedValue@@ is an invalid number."; "MandatoryToManyRelationshipException" = "The @@object.entityName@@ must has a mandatory relationship which is not being satisfied."; "MandatoryToOneRelationshipException" = "A @@displayNameForEntity@@ must have a @@displayNameForProperty@@."; "NullPropertyException" = "Please provide a @@displayNameForProperty@@."; diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/validation/ERXValidationException.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/validation/ERXValidationException.java index 7fc685739e6..678adaa1779 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/validation/ERXValidationException.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/validation/ERXValidationException.java @@ -8,6 +8,7 @@ import org.apache.log4j.Logger; +import com.webobjects.appserver.WOMessage; import com.webobjects.eoaccess.EOAttribute; import com.webobjects.eoaccess.EOEntity; import com.webobjects.eoaccess.EOUtilities; @@ -272,6 +273,16 @@ public EOAttribute attribute() { * @return failed validation value. */ public Object value() { return value; } + + /** + * Provides an escaped value to use in validation template string. + */ + public String escapedValue() { + if(value() != null) { + return WOMessage.stringByEscapingHTMLString(value().toString()); + } + return null; + } /** * Sets the value that failed validation. diff --git a/Frameworks/Misc/ERDivaliteLook/Resources/English.lproj/ValidationTemplate.strings b/Frameworks/Misc/ERDivaliteLook/Resources/English.lproj/ValidationTemplate.strings index 4192f9fac1d..5a8ac228e18 100644 --- a/Frameworks/Misc/ERDivaliteLook/Resources/English.lproj/ValidationTemplate.strings +++ b/Frameworks/Misc/ERDivaliteLook/Resources/English.lproj/ValidationTemplate.strings @@ -1,10 +1,10 @@ { - "IllegalCharacterInNumberException" = "Please check the value @@value@@ you supplied for the field @@displayNameForProperty@@."; - "InvalidDateFormatException" = "Please check @@displayNameForProperty@@ as @@value@@ is not a valid date"; + "IllegalCharacterInNumberException" = "Please check the value @@escapedValue@@ you supplied for the field @@displayNameForProperty@@."; + "InvalidDateFormatException" = "Please check @@displayNameForProperty@@ as @@escapedValue@@ is not a valid date"; "InvalidNumberException" = "The value is an invalid number."; "MandatoryToManyRelationshipException" = "A @@displayNameForEntity@@ must have a least one @@displayNameForDestinationEntity@@."; "MandatoryToOneRelationshipException" = "A @@displayNameForEntity@@ must have a @@displayNameForProperty@@."; - "NotANumberException" = "Sorry, I could not read this number @@value@@ "; + "NotANumberException" = "Sorry, I could not read this number @@escapedValue@@ "; "NullPropertyException" = "Please provide a @@displayNameForProperty@@."; "ObjectCannotBeDeletedException" = "Cannot delete this @@displayNameForEntity@@ because either this @@displayNameForEntity@@ or any object related to this @@displayNameForEntity@@ cannot be deleted."; "ObjectRemovalException" = "Cannot delete this @@displayNameForEntity@@. You should first delete the item in its @@displayNameForProperty@@.";