fix issue: validation message is empty if template does not contain variables

greenlaw110 · greenlaw110 · commit 4f8156630ec8 · 2015-09-23T21:39:06.000+10:00
diff --git a/src/main/java/act/validation/ValidationMessageInterpolator.java b/src/main/java/act/validation/ValidationMessageInterpolator.java
@@ -76,7 +76,7 @@ private String merge(String template, Object val, Map<String, Object> attrs) {
             sb.append(paramVal);
             s = s.substr(p1 + 1);
         }
-        return sb.toString();
+        return sb.length() == 0 ? template : sb.toString();
     }
 
     private String resolveTemplate(String messageTemplateId, Locale locale) {

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ private String merge(String template, Object val, Map<String, Object> attrs) {`
`76`	`76`	`sb.append(paramVal);`
`77`	`77`	`s = s.substr(p1 + 1);`
`78`	`78`	`}`
`79`		`- return sb.toString();`
	`79`	`+ return sb.length() == 0 ? template : sb.toString();`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`private String resolveTemplate(String messageTemplateId, Locale locale) {`