Author: ivaynberg
Date: Tue Jul 14 04:12:05 2009
New Revision: 793784
URL: http://svn.apache.org/viewvc?rev=793784&view=rev
Log:
WICKET-2350 Localization messages stops working with validators since 1.4-rc2
Issue: WICKET-2350
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestForm.properties
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestForm_nl.properties
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestPanel.properties
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=793784&r1=793783&r2=793784&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
Tue Jul 14 04:12:05 2009
@@ -159,11 +159,12 @@
String prefix = formComponent.getValidatorKeyPrefix();
String message = null;
- // first try the full form of key
[prefix].[form-component-id].[key]
- String resource = prefix(prefix, getId() + "." + key);
+ // first try the full form of key
[form-component-id].[key]
+ String resource = getId() + "." + prefix(prefix, key);
message = getString(localizer, resource, formComponent);
- // if not found, try a more general form (without
prefix) [form-component-id].[key]
+ // if not found, try a more general form (without
prefix)
+ // [form-component-id].[prefix].[key]
if (Strings.isEmpty(message) && Strings.isEmpty(prefix))
{
resource = getId() + "." + key;
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java?rev=793784&r1=793783&r2=793784&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
Tue Jul 14 04:12:05 2009
@@ -109,8 +109,7 @@
.getFeedbackMessage()
.getMessage()
.toString());
- assertEquals("Default message: text5 required", page.getText5()
- // assertEquals("ok: 555text555 is missing", page.getText5()
+ assertEquals("ok: 555text555 is found in TestForm.properties",
page.getText5()
.getFeedbackMessage()
.getMessage()
.toString());
@@ -126,12 +125,11 @@
.getFeedbackMessage()
.getMessage()
.toString());
- assertEquals("Default message: text9 required", page.getText9()
- // assertEquals("found it in panel", page.getText9()
+ assertEquals("found it in panel", page.getText9()
.getFeedbackMessage()
.getMessage()
.toString());
- assertEquals("Default message: text10 required",
page.getText10()
+ assertEquals("found it in form", page.getText10()
.getFeedbackMessage()
.getMessage()
.toString());
@@ -139,7 +137,7 @@
.getFeedbackMessage()
.getMessage()
.toString());
- assertEquals("Default message: text12 required",
page.getText12()
+ assertEquals("found it in page", page.getText12()
.getFeedbackMessage()
.getMessage()
.toString());
@@ -206,8 +204,7 @@
.getFeedbackMessage()
.getMessage()
.toString());
- assertEquals("Default message: text5 verplicht", page.getText5()
- // assertEquals("ok: 555text555 mist", page.getText5()
+ assertEquals("gevonden in form", page.getText5()
.getFeedbackMessage()
.getMessage()
.toString());
@@ -223,12 +220,11 @@
.getFeedbackMessage()
.getMessage()
.toString());
- assertEquals("Default message: text9 verplicht", page.getText9()
- // assertEquals("gevonden in panel", page.getText9()
+ assertEquals("gevonden in panel", page.getText9()
.getFeedbackMessage()
.getMessage()
.toString());
- assertEquals("Default message: text10 verplicht",
page.getText10()
+ assertEquals("gevonden in form", page.getText10()
.getFeedbackMessage()
.getMessage()
.toString());
@@ -236,7 +232,7 @@
.getFeedbackMessage()
.getMessage()
.toString());
- assertEquals("Default message: text12 verplicht",
page.getText12()
+ assertEquals("gevonden in page", page.getText12()
.getFeedbackMessage()
.getMessage()
.toString());
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestForm.properties
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestForm.properties?rev=793784&r1=793783&r2=793784&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestForm.properties
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestForm.properties
Tue Jul 14 04:12:05 2009
@@ -1,5 +1,5 @@
-text5.Required = ok: text is missing
+text5.Required = ok: 555text555 is found in TestForm.properties
panel1.text4.Required = ok testForm: ${label} is missing
text10.Required = found it in form
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestForm_nl.properties
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestForm_nl.properties?rev=793784&r1=793783&r2=793784&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestForm_nl.properties
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestForm_nl.properties
Tue Jul 14 04:12:05 2009
@@ -1,5 +1,5 @@
-text5.Required = ok: text mist
+text5.Required = gevonden in form
panel1.text4.Required = ok testForm: ${label} mist
text10.Required = gevonden in form
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestPanel.properties
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestPanel.properties?rev=793784&r1=793783&r2=793784&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestPanel.properties
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/TestPanel.properties
Tue Jul 14 04:12:05 2009
@@ -1,3 +1,3 @@
-text5.Required = ok: 555text555 is missing
+text5.Required = wrong: 555text555 should have been found in
TestForm.properties
text9.Required = found it in panel
