Author: markt
Date: Thu Mar 30 09:14:40 2017
New Revision: 1789474
URL: http://svn.apache.org/viewvc?rev=1789474&view=rev
Log:
Add [...] delimiters to values in messages that don't currently have them for
org.apache.el and org.apache.naming packages
Modified:
tomcat/trunk/java/org/apache/el/Messages.properties
tomcat/trunk/java/org/apache/el/Messages_es.properties
tomcat/trunk/java/org/apache/naming/LocalStrings.properties
tomcat/trunk/java/org/apache/naming/LocalStrings_es.properties
tomcat/trunk/java/org/apache/naming/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/naming/LocalStrings_ja.properties
Modified: tomcat/trunk/java/org/apache/el/Messages.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/Messages.properties?rev=1789474&r1=1789473&r2=1789474&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/Messages.properties (original)
+++ tomcat/trunk/java/org/apache/el/Messages.properties Thu Mar 30 09:14:40 2017
@@ -14,23 +14,23 @@
# limitations under the License.
# General Errors
-error.convert=Cannot convert {0} of type {1} to {2}
-error.compare=Cannot compare {0} to {1}
+error.convert=Cannot convert [{0}] of type [{1}] to [{2}]
+error.compare=Cannot compare [{0}] to [{1}]
error.function=Problems calling function [{0}]
error.unreachable.base=Target Unreachable, identifier [{0}] resolved to null
error.unreachable.property=Target Unreachable, [{0}] returned null
-error.resolver.unhandled=ELResolver did not handle type: {0} with property of
[{1}]
+error.resolver.unhandled=ELResolver did not handle type: [{0}] with property
of [{1}]
error.resolver.unhandled.null=ELResolver cannot handle a null base Object with
identifier [{0}]
error.invoke.wrongParams=The method [{0}] was called with [{1}] parameter(s)
when it expected [{2}]
error.invoke.tooFewParams=The method [{0}] was called with [{1}] parameter(s)
when it expected at least [{2}]
# ValueExpressionLiteral
-error.value.literal.write=ValueExpression is a literal and not writable: {0}
+error.value.literal.write=ValueExpression is a literal and not writable: [{0}]
# ExpressionFactoryImpl
error.null=Expression cannot be null
-error.mixed=Expression cannot contain both '#{...}' and '${...}' : {0}
-error.method=Not a valid MethodExpression : {0}
+error.mixed=Expression cannot contain both '#{...}' and '${...}' : [{0}]
+error.method=Not a valid MethodExpression : [{0}]
error.method.nullParms=Parameter types cannot be null
error.value.expectedType=Expected type cannot be null
@@ -47,7 +47,7 @@ error.method.ambiguous=Unable to find un
# ValidatingVisitor
error.fnMapper.null=Expression uses functions, but no FunctionMapper was
provided
error.fnMapper.method=Function [{0}] not found
-error.fnMapper.paramcount=Function [{0}] specifies {1} params, but {2} were
declared
+error.fnMapper.paramcount=Function [{0}] specifies [{1}] params, but [{2}]
were declared
# ExpressionImpl
error.context.null=ELContext was null
Modified: tomcat/trunk/java/org/apache/el/Messages_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/Messages_es.properties?rev=1789474&r1=1789473&r2=1789474&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/Messages_es.properties (original)
+++ tomcat/trunk/java/org/apache/el/Messages_es.properties Thu Mar 30 09:14:40
2017
@@ -12,17 +12,17 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-error.convert = No puedo convertir {0} desde tipo {1} a {2}
-error.compare = No puedo comparar {0} con {1}
+error.convert = No puedo convertir [{0}] desde tipo [{1}] a [{2}]
+error.compare = No puedo comparar [{0}] con [{1}]
error.function = Problemas llamando a funci\u00F3n [{0}]
error.unreachable.base = Objetivo inalcanzable, identificador [{0}] resuelto a
nulo
error.unreachable.property = Objetivo inalcanzable, [{0}] devolvi\u00F3 nulo
-error.resolver.unhandled = ELResolver no manej\u00F3 el tipo: {0} con
propiedad de [{1}]
+error.resolver.unhandled = ELResolver no manej\u00F3 el tipo: [{0}] con
propiedad de [{1}]
error.resolver.unhandled.null = ELResolver no puede manejar un Objeto base
nulo con identificador de [{0}]
-error.value.literal.write = ValueExpression es un literal y no un grabable: {0}
+error.value.literal.write = ValueExpression es un literal y no un grabable:
[{0}]
error.null = La expresi\u00F3n no puede ser nula
-error.mixed = La expresi\u00F3n no puede contenera la vez ''#{..}'' y
''${..}'' : {0}
-error.method = No es una MethodExpression v\u00E1lida: {0}
+error.mixed = La expresi\u00F3n no puede contenera la vez ''#{..}'' y
''${..}'' : [{0}]
+error.method = No es una MethodExpression v\u00E1lida: [{0}]
error.method.nullParms = Los tipos de par\u00E1metro no pueden ser nulo
error.value.expectedType = El tipo esperado no puede ser nulo
error.syntax.set = Sit\u00E1xis ilegal para Operaci\u00F3n de Poner Valor
@@ -30,6 +30,6 @@ error.method.notfound = M\u00E9todo no h
error.method.ambiguous = No pude hallar m\u00E9todo ambiguo: {0}.{1}({2})
error.fnMapper.null = La expresi\u00F3n usa funciones, pero no se ha
suministrado FunctionMapper
error.fnMapper.method = Funci\u00F3n [{0}] no hallada
-error.fnMapper.paramcount = La funci\u00F3n [{0}] especifica {1}
par\u00E9metros, pero {2} fueron declarados
+error.fnMapper.paramcount = La funci\u00F3n [{0}] especifica [{1}]
par\u00E9metros, pero [{2}] fueron declarados
error.context.null = ELContext era nulo
error.identifier.notjava = El identificador [{0}] no es un identificado Java
v\u00E1lido seg\u00FAn se requiere en la secci\u00F3n 1.9 de la
especificaci\u00F3n EL (Identificador ::= identificador de lenguaje Java). Este
chequeo se puede desactivar poniendo la propiedad del sistema
org.apache.el.parser.SKIP_IDENTIFIER_CHECK a verdad (true).
Modified: tomcat/trunk/java/org/apache/naming/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/LocalStrings.properties?rev=1789474&r1=1789473&r2=1789474&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/naming/LocalStrings.properties Thu Mar 30
09:14:40 2017
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-contextBindings.unknownContext=Unknown context name : {0}
+contextBindings.unknownContext=Unknown context name : [{0}]
contextBindings.noContextBoundToThread=No naming context bound to this thread
contextBindings.noContextBoundToCL=No naming context bound to this class loader
selectorContext.noJavaUrl=This context must be accessed through a java: URL
@@ -24,5 +24,5 @@ namingContext.failResolvingReference=Une
namingContext.nameNotBound=Name [{0}] is not bound in this Context. Unable to
find [{1}].
namingContext.readOnly=Context is read only
namingContext.invalidName=Name is not valid
-namingContext.alreadyBound=Name {0} is already bound in this Context
+namingContext.alreadyBound=Name [{0}] is already bound in this Context
namingContext.noAbsoluteName=Can''t generate an absolute name for this
namespace
Modified: tomcat/trunk/java/org/apache/naming/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/LocalStrings_es.properties?rev=1789474&r1=1789473&r2=1789474&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/org/apache/naming/LocalStrings_es.properties Thu Mar 30
09:14:40 2017
@@ -15,7 +15,7 @@
#
# language es
# package org.apache.naming
-contextBindings.unknownContext = Contexto {0} desconocido
+contextBindings.unknownContext = Contexto [{0}] desconocido
contextBindings.noContextBoundToThread = No hay contexto de nombres asociado a
este hilo
contextBindings.noContextBoundToCL = No hay contexto de nombres asociado a
este cargador de clase
selectorContext.noJavaUrl = Este contexto debe de ser accedido a traves de una
URL de tipo java:
@@ -23,8 +23,8 @@ selectorContext.methodUsingName = Llamad
selectorContext.methodUsingString = Llamada al m\u00E9todo [{0}] con una
Cadena de [{1}]
namingContext.contextExpected = El nombre no esta asociado a ningun Contexto
namingContext.failResolvingReference = Excepci\u00F3n inesperada resolviendo
referencia
-namingContext.nameNotBound = El nombre {0} no este asociado a este contexto
+namingContext.nameNotBound = El nombre [{0}] no este asociado a este contexto
namingContext.readOnly = El contexto es de solo lectura
namingContext.invalidName = Nombre no valido
-namingContext.alreadyBound = El nombre {0} este ya asociado en este Contexto
+namingContext.alreadyBound = El nombre [{0}] este ya asociado en este Contexto
namingContext.noAbsoluteName = No se puede generar un nombre absoluto para
este espacio de nombres
Modified: tomcat/trunk/java/org/apache/naming/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/LocalStrings_fr.properties?rev=1789474&r1=1789473&r2=1789474&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/org/apache/naming/LocalStrings_fr.properties Thu Mar 30
09:14:40 2017
@@ -13,14 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-contextBindings.unknownContext=Nom de Contexte inconnu : {0}
+contextBindings.unknownContext=Nom de Contexte inconnu : [{0}]
contextBindings.noContextBoundToThread=Aucun Contexte de nommage li\u00e9
\u00e0 ce thread
contextBindings.noContextBoundToCL=Aucun Contexte de nommage li\u00e9 \u00e0
ce chargeur de classes
selectorContext.noJavaUrl=Ce Contexte doit \u00eatre acc\u00e9d\u00e9 par une
java: URL
namingContext.contextExpected=Le Nom n''est pas li\u00e9 \u00e0 un Contexte
namingContext.failResolvingReference=Une erreur s est produite durant la
r\u00e9solution de la r\u00e9f\u00e9rence
-namingContext.nameNotBound=Le Nom {0} n''est pas li\u00e9 \u00e0 ce Contexte
+namingContext.nameNotBound=Le Nom [{0}] n''est pas li\u00e9 \u00e0 ce Contexte
namingContext.readOnly=Le Contexte est en lecture seule
namingContext.invalidName=Le Nom est invalide
-namingContext.alreadyBound=Le Nom {0} est d\u00e9j\u00e0 li\u00e9 \u00e0 ce
Contexte
+namingContext.alreadyBound=Le Nom [{0}] est d\u00e9j\u00e0 li\u00e9 \u00e0 ce
Contexte
namingContext.noAbsoluteName=Impossible de g\u00e9n\u00e9rer un nom absolu
pour cet espace de nommage (namespace)
Modified: tomcat/trunk/java/org/apache/naming/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/LocalStrings_ja.properties?rev=1789474&r1=1789473&r2=1789474&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/LocalStrings_ja.properties (original)
+++ tomcat/trunk/java/org/apache/naming/LocalStrings_ja.properties Thu Mar 30
09:14:40 2017
@@ -13,14 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-contextBindings.unknownContext=\u672a\u77e5\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u540d\u3067\u3059:
{0}
+contextBindings.unknownContext=\u672a\u77e5\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u540d\u3067\u3059:
[{0}]
contextBindings.noContextBoundToThread=\u540d\u524d\u4ed8\u3051\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306f\u3053\u306e\u30b9\u30ec\u30c3\u30c9\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
contextBindings.noContextBoundToCL=\u540d\u524d\u4ed8\u3051\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306f\u3053\u306e\u30af\u30e9\u30b9\u30ed\u30fc\u30c0\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
selectorContext.noJavaUrl=\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u306fjava:
URL\u3092\u7528\u3044\u3066\u30a2\u30af\u30bb\u30b9\u3055\u308c\u306d\u3070\u3044\u3051\u307e\u305b\u3093
namingContext.contextExpected=\u540d\u524d\u304c\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
namingContext.failResolvingReference=\u53c2\u7167\u306e\u89e3\u6c7a\u4e2d\u306b\u4e88\u6e2c\u3057\u306a\u3044\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-namingContext.nameNotBound=\u540d\u524d {0}
\u306f\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+namingContext.nameNotBound=\u540d\u524d [{0}]
\u306f\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
namingContext.readOnly=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306f\u30ea\u30fc\u30c9\u30aa\u30f3\u30ea\u30fc\u3067\u3059
namingContext.invalidName=\u540d\u524d\u306f\u7121\u52b9\u3067\u3059
-namingContext.alreadyBound=\u540d\u524d {0}
\u306f\u65e2\u306b\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u3059
+namingContext.alreadyBound=\u540d\u524d [{0}]
\u306f\u65e2\u306b\u3053\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u30d0\u30a4\u30f3\u30c9\u3055\u308c\u3066\u3044\u307e\u3059
namingContext.noAbsoluteName=\u3053\u306e\u540d\u524d\u7a7a\u9593\u306b\u7d76\u5bfe\u540d\u3092\u751f\u6210\u3067\u304d\u307e\u305b\u3093
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
