[sling-org-apache-sling-validation-examples] 15/24: SLING-4213 leverage sling-i18n for validation failure messages

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-examples.git

commit a12e67fdce4259d61b6ed23c3413633626c71e41
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Jan 8 08:51:00 2016 +0000

    SLING-4213 leverage sling-i18n for validation failure messages
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1723664 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/sling/validation/examples/servlets/ModifyUserServlet.java | 3 ++-
 .../resources/SLING-INF/apps/validationdemo/components/user/user.jsp | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java b/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
index d74657f..b3a832f 100644
--- a/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
+++ b/src/main/java/org/apache/sling/validation/examples/servlets/ModifyUserServlet.java
@@ -20,6 +20,7 @@ package org.apache.sling.validation.examples.servlets;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.servlet.ServletException;
@@ -74,7 +75,7 @@ public class ModifyUserServlet extends SlingAllMethodsServlet {
                         JSONArray failures = new JSONArray();
                         for (ValidationFailure failure : vr.getFailures()) {
                             JSONObject failureJson = new JSONObject();
-                            failureJson.put("message", failure.getMessage());
+                            failureJson.put("message", failure.getMessage(request.getResourceBundle(Locale.US)));
                             failureJson.put("location", failure.getLocation());
                             failures.put(failureJson);
                         }
diff --git a/src/main/resources/SLING-INF/apps/validationdemo/components/user/user.jsp b/src/main/resources/SLING-INF/apps/validationdemo/components/user/user.jsp
index bfca1ef..cda6478 100644
--- a/src/main/resources/SLING-INF/apps/validationdemo/components/user/user.jsp
+++ b/src/main/resources/SLING-INF/apps/validationdemo/components/user/user.jsp
@@ -18,6 +18,7 @@
 --><%@page session="false" import="
     java.util.Map,
     java.util.List,
+    java.util.Locale,
     org.apache.sling.api.resource.Resource,
     org.apache.sling.validation.ValidationFailure,
     org.apache.sling.validation.examples.models.UserModel
@@ -49,8 +50,8 @@
 <%
     for (ValidationFailure error : user.getErrors()) {
 %>
-<span><strong>Key:</strong> <%= error.getLocation() %></span><br>
-<span><%= error.getMessage() %></span><br>
+<span><strong>Location:</strong> <%= error.getLocation() %></span><br>
+<span><%= error.getMessage(slingRequest.getResourceBundle(Locale.US)) %></span><br>
 <%
     }
 %>
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.