You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2010/01/30 11:43:30 UTC
svn commit: r904756 -
/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
Author: jdonnerstag
Date: Sat Jan 30 10:43:28 2010
New Revision: 904756
URL: http://svn.apache.org/viewvc?rev=904756&view=rev
Log:
fixed FormComponent.MessageSource.getMessage(String) and getValidatorKeyPrefix()
Issue: WICKET-2704
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=904756&r1=904755&r2=904756&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java Sat Jan 30 10:43:28 2010
@@ -175,11 +175,11 @@
if (Strings.isEmpty(message))
{
resource = prefix(prefix, key);
- message = getString(localizer, key, formComponent);
+ message = getString(localizer, resource, formComponent);
}
// If not found try the most general form [key]
- if (Strings.isEmpty(message) && Strings.isEmpty(prefix))
+ if (Strings.isEmpty(message))
{
// Try a variation of the resource key
message = getString(localizer, key, formComponent);