This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new fb6bdb5 Import/export cycle to fix ordering
fb6bdb5 is described below
commit fb6bdb54759e3c596810908db3ee87e1a57b7832
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Sep 2 21:37:09 2021 +0100
Import/export cycle to fix ordering
---
java/org/apache/el/LocalStrings_zh_CN.properties | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/el/LocalStrings_zh_CN.properties
b/java/org/apache/el/LocalStrings_zh_CN.properties
index d5093d6..07c58df 100644
--- a/java/org/apache/el/LocalStrings_zh_CN.properties
+++ b/java/org/apache/el/LocalStrings_zh_CN.properties
@@ -16,20 +16,20 @@
elSupport.coerce.nonAbstract=无法将LambdaExpression强制到函数接口[{0}]，因为方法[{1}]不是抽象的
error.cannotSetVariables=不能在工厂上设置变量
+error.compare=无法将[{0}}]与[{1}]进行比较
error.context.null=ELConect为空
error.convert=无法将类型为[{1}]的[{0}]转换为[{2}]
-error.compare=无法将[{0}}]与[{1}]进行比较
error.fnMapper.method=找不到函数[{0}]
error.fnMapper.null=表达式使用函数，但未提供FunctionMapper
error.fnMapper.paramcount=函数[{0}]指定了[{1}]参数，但声明了[{2}]
error.function=调用函数[{0}]时出现问题
error.function.tooManyMethodParameterSets=为函数[{0}]指定了多组参数
error.identifier.noMethod=标识[{0}]为空，无法调用
-error.identifier.notjava=标识符[{0}]不是EL规范第1.19节要求的有效Java标识符（标识符::=Java语言标识符）。可以通过将系统属性org.apache.el.parser.SKIP_IDENTIFIER_CHECK设置为true来禁用此检查。
error.identifier.notMethodExpression=Identity [{0}]未引用方法表达式实例，返回类型[{1}]
+error.identifier.notjava=标识符[{0}]不是EL规范第1.19节要求的有效Java标识符（标识符::=Java语言标识符）。可以通过将系统属性org.apache.el.parser.SKIP_IDENTIFIER_CHECK设置为true来禁用此检查。
error.invalidMethodExpression=不是有效的方法表达式[{0}]
-error.invoke.wrongParams=方法[{0}]在调用时入参为 [{1}],预期入参为 [{2}]
error.invoke.tooFewParams=方法[{0}]在调用时入参为 [{1}],预期入参至少为 [{2}]
+error.invoke.wrongParams=方法[{0}]在调用时入参为 [{1}],预期入参为 [{2}]
error.lambda.tooManyMethodParameterSets=指定的方法参数集多于嵌套lambda表达式的集合
error.lambda.wrongNestedState=嵌套状态只能设置一次
error.method=无效的方法表达式：[{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
