This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d2f21d52a6d10f711e685aaae577c1663bd3d661 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Jul 2 13:52:04 2019 +0100 Align with 8.5.x. Use i18n. --- java/org/apache/catalina/servlets/DefaultServlet.java | 2 +- java/org/apache/catalina/servlets/LocalStrings.properties | 1 + java/org/apache/catalina/servlets/LocalStrings_fr.properties | 1 + java/org/apache/catalina/servlets/LocalStrings_ja.properties | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java index 6821f66..5a5eddd 100644 --- a/java/org/apache/catalina/servlets/DefaultServlet.java +++ b/java/org/apache/catalina/servlets/DefaultServlet.java @@ -1449,7 +1449,7 @@ public class DefaultServlet extends HttpServlet { osWriter.flush(); return new ByteArrayInputStream(stream.toByteArray()); } catch (TransformerException e) { - throw new ServletException("XSL transformer error", e); + throw new ServletException(sm.getString("defaultServlet.xslError"), e); } finally { if (Globals.IS_SECURITY_ENABLED) { PrivilegedSetTccl pa = new PrivilegedSetTccl(original); diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties b/java/org/apache/catalina/servlets/LocalStrings.properties index 22adaa8..13a9d40 100644 --- a/java/org/apache/catalina/servlets/LocalStrings.properties +++ b/java/org/apache/catalina/servlets/LocalStrings.properties @@ -41,6 +41,7 @@ defaultServlet.blockExternalSubset=Blocked access to external subset with name [ defaultServlet.missingResource=The requested resource [{0}] is not available defaultServlet.noResources=No static resources were found defaultServlet.skipfail=Read failed because only [{0}] bytes were available but needed to skip [{1}] bytes to reach the start of the requested range +defaultServlet.xslError=XSL transformer error directory.filename=Filename directory.lastModified=Last Modified diff --git a/java/org/apache/catalina/servlets/LocalStrings_fr.properties b/java/org/apache/catalina/servlets/LocalStrings_fr.properties index 4ee5781..fdcb2ec 100644 --- a/java/org/apache/catalina/servlets/LocalStrings_fr.properties +++ b/java/org/apache/catalina/servlets/LocalStrings_fr.properties @@ -41,6 +41,7 @@ defaultServlet.blockExternalSubset=L''accès au sous-ensemble externe de nom [{0 defaultServlet.missingResource=La ressource demandée [{0}] n''est pas disponible defaultServlet.noResources=Pas de ressources statiques defaultServlet.skipfail=La lecture a échouée parce que seuls [{0}] octets étaient disponibles alors qu''il était nécessaire d''en sauter [{1}] pour atteindre le début de la plage demandée +defaultServlet.xslError=Erreur de transformation XSL directory.filename=Nom de fichier directory.lastModified=Dernière modification diff --git a/java/org/apache/catalina/servlets/LocalStrings_ja.properties b/java/org/apache/catalina/servlets/LocalStrings_ja.properties index 7105faf..e3a35af 100644 --- a/java/org/apache/catalina/servlets/LocalStrings_ja.properties +++ b/java/org/apache/catalina/servlets/LocalStrings_ja.properties @@ -39,6 +39,7 @@ defaultServlet.blockExternalSubset=名前[{0}]およびベースURI [{1}]を持 defaultServlet.missingResource=要求されたリソース [{0}] は利用できません。 defaultServlet.noResources=静的リソースが見つかりません。 defaultServlet.skipfail=[{0}]バイトしか利用できなかったため、[{1}]バイトをスキップして要求された範囲の先頭に到達する必要があったため、読み取りに失敗しました。 +defaultServlet.xslError=XSL変換エラー directory.filename=ファイル名 directory.lastModified=最終更新 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org