Revision: 404
http://svn.sourceforge.net/stripes/?rev=404&view=rev
Author: tfenne
Date: 2006-09-02 10:36:23 -0700 (Sat, 02 Sep 2006)
Log Message:
-----------
Fix for STS-255: a couple more keys for scoped localizable error to look for.
Modified Paths:
--------------
trunk/stripes/src/net/sourceforge/stripes/validation/ScopedLocalizableError.java
Modified:
trunk/stripes/src/net/sourceforge/stripes/validation/ScopedLocalizableError.java
===================================================================
---
trunk/stripes/src/net/sourceforge/stripes/validation/ScopedLocalizableError.java
2006-09-02 17:20:27 UTC (rev 403)
+++
trunk/stripes/src/net/sourceforge/stripes/validation/ScopedLocalizableError.java
2006-09-02 17:36:23 UTC (rev 404)
@@ -33,8 +33,10 @@
* <ul>
* <li>/cats/KittenDetail.action.age.outOfRange</li>
* <li>/cats/KittenDetail.action.age.errorMessage</li>
+ * <li>age.outOfRange</li>
* <li>age.errorMessage</li>
* <li>/cats/KittenDetail.action.outOfRange</li>
+ * <li>/cats/KittenDetail.action.errorMessage</li>
* <li>converter.integer.outOfRange</li>
* </ul>
*
@@ -73,32 +75,48 @@
*/
@Override
protected String getMessageTemplate(Locale locale) {
- String name1=null, name2=null, name3=null, name4=null, name5=null;
+ String name1=null, name2=null, name3=null, name4=null, name5=null,
name6=null, name7=null;
name1 = getActionPath() + "." + getFieldName() + "." + key;
+
+ // 1. /cats/KittenDetail.action.age.outOfRange
String template = LocalizationUtility.getErrorMessage(locale, name1);
if (template == null) {
+ // 2. /cats/KittenDetail.action.age.errorMessage
name2 = getActionPath() + "." + getFieldName() + "." +
DEFAULT_NAME;
template = LocalizationUtility.getErrorMessage(locale, name2);
}
if (template == null) {
- name3 = getFieldName() + "." + DEFAULT_NAME;
+ // 3. age.outOfRange
+ name3 = getFieldName() + "." + key;
template = LocalizationUtility.getErrorMessage(locale, name3);
}
if (template == null) {
- name4 = getActionPath() + "." + key;
+ // 4. age.errorMessage
+ name4 = getFieldName() + "." + DEFAULT_NAME;
template = LocalizationUtility.getErrorMessage(locale, name4);
}
if (template == null) {
- name5 = defaultScope + "." + key;
+ // 5. /cats/KittenDetail.action.outOfRange
+ name5 = getActionPath() + "." + key;
template = LocalizationUtility.getErrorMessage(locale, name5);
}
+ if (template == null) {
+ // 6. /cats/KittenDetail.action.errorMessage
+ name6 = getActionPath() + "." + DEFAULT_NAME;
+ template = LocalizationUtility.getErrorMessage(locale, name6);
+ }
+ if (template == null) {
+ // 7. converter.integer.outOfRange
+ name7 = defaultScope + "." + key;
+ template = LocalizationUtility.getErrorMessage(locale, name7);
+ }
if (template == null) {
throw new MissingResourceException(
"Could not find an error message with any of the following
keys: " +
"'" + name1 + "', '" + name2 + "', '" + name3 + "', '" +
- name4 + "', '" + name5 + "'.", null, null
+ name4 + "', '" + name5 + "', '" + name6 + "', '" + name7 +
"'.", null, null
);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
