This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new f4466d2 Align message key format
f4466d2 is described below
commit f4466d233b88ca3b2131d40dc1ee9c344bfb3193
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 26 15:32:19 2019 +0100
Align message key format
---
java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
java/org/apache/catalina/servlets/LocalStrings.properties | 3 +--
java/org/apache/catalina/servlets/LocalStrings_es.properties | 3 +--
java/org/apache/catalina/servlets/LocalStrings_fr.properties | 3 +--
java/org/apache/catalina/servlets/LocalStrings_ja.properties | 3 +--
5 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index f404973..e161f8b 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2742,7 +2742,7 @@ public class DefaultServlet extends HttpServlet {
return e;
}
if (skipped < start) {
- return new IOException(sm.getString("defaultservlet.skipfail",
+ return new IOException(sm.getString("defaultServlet.skipfail",
Long.valueOf(skipped), Long.valueOf(start)));
}
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties
b/java/org/apache/catalina/servlets/LocalStrings.properties
index 34611aa..984766f 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -41,10 +41,9 @@ 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.readerCloseFailed=Failed to close reader
+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
-defaultservlet.skipfail=Read failed because only [{0}] bytes were available
but needed to skip [{1}] bytes to reach the start of the requested range
-
directory.filename=Filename
directory.lastModified=Last Modified
directory.parent=Up To [{0}]
diff --git a/java/org/apache/catalina/servlets/LocalStrings_es.properties
b/java/org/apache/catalina/servlets/LocalStrings_es.properties
index 1d6b7d7..c96df05 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_es.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_es.properties
@@ -24,8 +24,7 @@ cgiServlet.runStdErrFail=Problemas de I/O con stderr
defaultServlet.blockExternalSubset=Se bloqueó el acceso al subconjunt externo
con nombre [{0}] y URI base [{1}]\n
defaultServlet.missingResource=El recurso requerido [{0}] no se encuentra
disponible
-
-defaultservlet.skipfail=Sólo se han saltado [{0}] cuando se requirieron [{1}]
+defaultServlet.skipfail=Sólo se han saltado [{0}] cuando se requirieron [{1}]
directory.filename=Nombre de Fichero:
directory.lastModified=Última Modificación
diff --git a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
index cb1428c..dafef27 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
@@ -41,10 +41,9 @@ 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.readerCloseFailed=Impossible de fermer le lecteur
+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
-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
-
directory.filename=Nom de fichier
directory.lastModified=Dernière modification
directory.parent=Jusqu''à [{0}]
diff --git a/java/org/apache/catalina/servlets/LocalStrings_ja.properties
b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
index f7fd655..d6c380d 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
@@ -39,10 +39,9 @@ defaultServlet.blockExternalSubset=名前[{0}]およびベースURI [{1}]を持
defaultServlet.missingResource=要求されたリソース [{0}] は利用できません。
defaultServlet.noResources=静的リソースが見つかりません。
defaultServlet.readerCloseFailed=readerのクローズに失敗しました
+defaultServlet.skipfail=[{0}]バイトしか利用できなかったため、[{1}]バイトをスキップして要求された範囲の先頭に到達する必要があったため、読み取りに失敗しました。
defaultServlet.xslError=XSL変換エラー
-defaultservlet.skipfail=[{0}]バイトしか利用できなかったため、[{1}]バイトをスキップして要求された範囲の先頭に到達する必要があったため、読み取りに失敗しました。
-
directory.filename=ファイル名
directory.lastModified=最終更新
directory.parent=[{0}] に移動
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
