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
commit 6090dcf8571c0884ddcfd021d0180da32abb819d Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Jul 2 21:17:29 2019 +0100 Expand i18n and update translations --- java/javax/servlet/http/HttpServlet.java | 2 +- java/javax/servlet/http/LocalStrings.properties | 5 +++-- java/javax/servlet/http/LocalStrings_es.properties | 2 +- java/javax/servlet/http/LocalStrings_fr.properties | 15 +++++++++------ java/javax/servlet/http/LocalStrings_ja.properties | 5 ++++- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/java/javax/servlet/http/HttpServlet.java b/java/javax/servlet/http/HttpServlet.java index 12a537a..f28eac3 100644 --- a/java/javax/servlet/http/HttpServlet.java +++ b/java/javax/servlet/http/HttpServlet.java @@ -736,7 +736,7 @@ public abstract class HttpServlet extends GenericServlet { request = (HttpServletRequest) req; response = (HttpServletResponse) res; } catch (ClassCastException e) { - throw new ServletException("non-HTTP request or response"); + throw new ServletException(lStrings.getString("http.non_http")); } service(request, response); } diff --git a/java/javax/servlet/http/LocalStrings.properties b/java/javax/servlet/http/LocalStrings.properties index aef4847..3ea5922 100644 --- a/java/javax/servlet/http/LocalStrings.properties +++ b/java/javax/servlet/http/LocalStrings.properties @@ -19,8 +19,9 @@ err.io.indexOutOfBounds=Invalid offset [{0}] and / or length [{1}] specified for err.io.nullArray=Null passed for byte array in write method err.io.short_read=Short Read -http.method_delete_not_supported=Http method DELETE is not supported by this URL +http.method_delete_not_supported=HTTP method DELETE is not supported by this URL http.method_get_not_supported=HTTP method GET is not supported by this URL -http.method_not_implemented=Method [{0}] is not implemented by this servlet for this URI +http.method_not_implemented=Method [{0}] is not implemented by this Servlet for this URI http.method_post_not_supported=HTTP method POST is not supported by this URL http.method_put_not_supported=HTTP method PUT is not supported by this URL +http.non_http=Non HTTP request or response diff --git a/java/javax/servlet/http/LocalStrings_es.properties b/java/javax/servlet/http/LocalStrings_es.properties index c17c246..0b7972e 100644 --- a/java/javax/servlet/http/LocalStrings_es.properties +++ b/java/javax/servlet/http/LocalStrings_es.properties @@ -15,7 +15,7 @@ err.cookie_name_blank=El nombre del Cookie no puede ser nulo o de longitud cero err.cookie_name_is_token=El nombre de Cookie [{0}] es una palabra reservada -err.io.negativelength=Longitud Negativa en el metodo write +err.io.nullArray=Se pasó un valor Null para el arreglo byte en el método de escritura err.io.short_read=Lectura Corta http.method_delete_not_supported=El Metodo HTTP DELETE no es soportado por esta URL diff --git a/java/javax/servlet/http/LocalStrings_fr.properties b/java/javax/servlet/http/LocalStrings_fr.properties index f7a07e7..cab2650 100644 --- a/java/javax/servlet/http/LocalStrings_fr.properties +++ b/java/javax/servlet/http/LocalStrings_fr.properties @@ -13,12 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. +err.cookie_name_blank=Le nom de cookie ne doit pas être null ou vide err.cookie_name_is_token=Le nom de cookie [{0}] est un "token" réservé -err.io.negativelength=Taille négative donnée dans la méthode "write" +err.io.indexOutOfBounds=L''offset [{0}] et/ou la longueur [{1}] spécifiés pour la taille du tableau [{2}] sont invalides +err.io.nullArray=Null a été passée comme tableau d'octets à la méthode d'écriture err.io.short_read=Lecture partielle -http.method_delete_not_supported=La méthode HTTP DELETE n''est pas supportée par cette URL -http.method_get_not_supported=La méthode HTTP GET n''est pas supportée par cette URL -http.method_not_implemented=Le méthode [{0}] n''est pas définie dans la RFC 2068 et n''est pas supportée par l''API Servlet -http.method_post_not_supported=La méthode HTTP POST n''est pas supportée par cette URL -http.method_put_not_supported=La méthode HTTP PUT n''est pas supportée par cette URL +http.method_delete_not_supported=La méthode HTTP DELETE n'est pas supportée par cette URL +http.method_get_not_supported=La méthode HTTP GET n'est pas supportée par cette URL +http.method_not_implemented=Le méthode [{0}] n''est pas implémentée par ce Servlet pour cette URI +http.method_post_not_supported=La méthode HTTP POST n'est pas supportée par cette URL +http.method_put_not_supported=La méthode HTTP PUT n'est pas supportée par cette URL +http.non_http=Requête ou réponse non HTTP diff --git a/java/javax/servlet/http/LocalStrings_ja.properties b/java/javax/servlet/http/LocalStrings_ja.properties index f1954a5..94e7ba5 100644 --- a/java/javax/servlet/http/LocalStrings_ja.properties +++ b/java/javax/servlet/http/LocalStrings_ja.properties @@ -13,8 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +err.cookie_name_blank=Cookie名はnullまたは長さゼロであってはなりません.\n err.cookie_name_is_token=クッキー名 [{0}] は予約済のトークンです。 -err.io.negativelength=writeメソッドに負の長さが指定されました。 +err.io.indexOutOfBounds=サイズ[{2}]の配列に指定されたオフセット[{0}]または長さ[{1}]が無効です。 +err.io.nullArray=write メソッドに渡されたバイト配列は null です。 err.io.short_read=読み込みがすぐに終わりました。 http.method_delete_not_supported=HTTPのDELETEメソッドは、このURLではサポートされていません。 @@ -22,3 +24,4 @@ http.method_get_not_supported=HTTPのGETメソッドは、このURLではサポ http.method_not_implemented=メソッド [{0}] はRFC 2068には定義されておらず、サーブレットAPIではサポートされません。 http.method_post_not_supported=HTTPのPOSTメソッドは、このURLではサポートされていません。 http.method_put_not_supported=HTTPのPUTメソッドは、このURLではサポートされていません。 +http.non_http=リクエストが HTTP リクエストではない、あるいはレスポンスが HTTP レスポンスではありません。 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org