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 cb2f846e62d9e1a1fee0fe09798bb03bc02953ad Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Jun 10 14:18:09 2019 +0100 Improve i18n --- java/org/apache/jasper/resources/LocalStrings.properties | 2 ++ java/org/apache/jasper/resources/LocalStrings_fr.properties | 2 ++ java/org/apache/jasper/resources/LocalStrings_ja.properties | 2 ++ java/org/apache/jasper/runtime/JspRuntimeLibrary.java | 6 ++---- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties index 8186424..c2efc27 100644 --- a/java/org/apache/jasper/resources/LocalStrings.properties +++ b/java/org/apache/jasper/resources/LocalStrings.properties @@ -300,6 +300,8 @@ jsp.warning.quoteAttributeEL=Warning: Invalid value for the initParam quoteAttri jsp.warning.recompileOnFail=Warning: Invalid value for the initParam recompileOnFail. Will use the default value of "false" jsp.warning.strictQuoteEscaping=Warning: Invalid value for the initParam strictQuoteEscaping. Will use the default value of "true" jsp.warning.suppressSmap=Warning: Invalid value for the initParam suppressSmap. Will use the default value of "false" +jsp.warning.tagPreDestroy=Error processing preDestroy on tag instance of [{0}] +jsp.warning.tagRelease=Error processing release on tag instance of [{0}] jsp.warning.unknown.sourceVM=Unknown source VM [{0}] ignored jsp.warning.unknown.targetVM=Unknown target VM [{0}] ignored jsp.warning.unsupported.sourceVM=Unsupported source VM [{0}] requested, using [{1}] diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties b/java/org/apache/jasper/resources/LocalStrings_fr.properties index 5484344..918f276 100644 --- a/java/org/apache/jasper/resources/LocalStrings_fr.properties +++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties @@ -267,6 +267,8 @@ jsp.warning.quoteAttributeEL=WARNING: Valeur invalide pour le paramètre d'initi jsp.warning.recompileOnFail=WARNING: Valeur invalide pour le paramètre d'initialisation recompileOnFail, la valeur par défaut "false" sera utilisée jsp.warning.strictQuoteEscaping=WARNING: Valeur invalide pour le paramètre d'initialisation strictQuoteEscaping, la valeur par défaut "true" sera utilisée jsp.warning.suppressSmap=WARNING : valeur invalide d' l'initParam suppressSmap. La valeur par défaut "false" sera utilisée +jsp.warning.tagPreDestroy=Erreur lors du traitement de preDestroy pour l''instance de tag [{0}] +jsp.warning.tagRelease=Erreur lors du traitement de release pour l''instance de tag [{0}] jsp.warning.unknown.sourceVM=La VM source [{0}] inconnue a été ignorée jsp.warning.unknown.targetVM=La VM cible [{0}] inconnue a été ignorée jsp.warning.unsupported.sourceVM=La VM source [{0}] demandée n''est pas supportée, [{1}] sera utilisé diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties b/java/org/apache/jasper/resources/LocalStrings_ja.properties index 0cc1de1..fdfb51d 100644 --- a/java/org/apache/jasper/resources/LocalStrings_ja.properties +++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties @@ -299,6 +299,8 @@ jsp.warning.quoteAttributeEL=警告: initParam の quoteAttributeEL に不正な jsp.warning.recompileOnFail=警告: initParam の recompileOnFail に不正な値が指定されました。初期値の "false" を使用します。 jsp.warning.strictQuoteEscaping=警告:initParam strictQuoteEscapingの値が無効です。 デフォルト値 "true"を使用します。 jsp.warning.suppressSmap=警告: initParam suppressSmapの値が無効です。デフォルト値 "false" を使用します +jsp.warning.tagPreDestroy=[{0}]のタグインスタンスでpreDestroyを処理中にエラーが発生しました。 +jsp.warning.tagRelease=[{0}]のタグインスタンスでリリースを処理中にエラーが発生しました。 jsp.warning.unknown.sourceVM=不明な source VM [{0}]が無視されました jsp.warning.unknown.targetVM=不明な target VM [{0}]が無視されました。 jsp.warning.xpoweredBy=警告: Invalid value for the initParam xpoweredByの値が無効です。デフォルト値 "false" を使用します diff --git a/java/org/apache/jasper/runtime/JspRuntimeLibrary.java b/java/org/apache/jasper/runtime/JspRuntimeLibrary.java index 1ef424c..096f9a6 100644 --- a/java/org/apache/jasper/runtime/JspRuntimeLibrary.java +++ b/java/org/apache/jasper/runtime/JspRuntimeLibrary.java @@ -968,8 +968,7 @@ public class JspRuntimeLibrary { } catch (Throwable t) { ExceptionUtils.handleThrowable(t); Log log = LogFactory.getLog(JspRuntimeLibrary.class); - log.warn("Error processing release on tag instance of " - + tag.getClass().getName(), t); + log.warn(Localizer.getMessage("jsp.warning.tagRelease", tag.getClass().getName()), t); } try { instanceManager.destroyInstance(tag); @@ -977,8 +976,7 @@ public class JspRuntimeLibrary { Throwable t = ExceptionUtils.unwrapInvocationTargetException(e); ExceptionUtils.handleThrowable(t); Log log = LogFactory.getLog(JspRuntimeLibrary.class); - log.warn("Error processing preDestroy on tag instance of " - + tag.getClass().getName(), t); + log.warn(Localizer.getMessage("jsp.warning.tagPreDestroy", tag.getClass().getName()), t); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org