From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 21 Apr 2011 12:50:40 +0000 (+0000)
Subject: i18n for r1090763
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=ee12247350f47947deee302d63b9a2b08b1cd54d;p=tomcat7.0

i18n for r1090763

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1095686 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/jasper/compiler/DefaultErrorHandler.java b/java/org/apache/jasper/compiler/DefaultErrorHandler.java
index 4b8b7ed85..444d96591 100644
--- a/java/org/apache/jasper/compiler/DefaultErrorHandler.java
+++ b/java/org/apache/jasper/compiler/DefaultErrorHandler.java
@@ -38,8 +38,10 @@ class DefaultErrorHandler implements ErrorHandler {
     @Override
     public void jspError(String fname, int line, int column, String errMsg,
             Exception ex) throws JasperException {
-        throw new JasperException(fname + "(line: " + line + ", column: " +
-                column + ")" + " " + errMsg, ex);
+        throw new JasperException(fname + " (" +
+                Localizer.getMessage("jsp.error.location",
+                        Integer.toString(line), Integer.toString(column)) +
+                ") " + errMsg, ex);
     }
     
     /*
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties
index f18fed0c0..428b673bd 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -336,6 +336,7 @@ jsp.error.needAlternateJavaEncoding=Default java encoding {0} is invalid on your
 jsp.error.single.line.number=An error occurred at line: {0} in the jsp file: {1}
 jsp.error.multiple.line.number=\n\nAn error occurred between lines: {0} and {1} in the jsp file: {2}\n\n
 jsp.error.java.line.number=An error occurred at line: {0} in the generated java file
+jsp.error.location=line: {0}, column {1}
 jsp.error.corresponding.servlet=Generated servlet error:\n
 jsp.error.empty.body.not.allowed=Empty body not allowed for {0}
 jsp.error.jspbody.required=Must use jsp:body to specify tag body for {0} if jsp:attribute is used.