Updated localization

Author: rmraya

i18n/XMLJava_es.tmx

@@ -15,7 +15,7 @@
 public class Constants {
 
     public static final String VERSION = "2.2.0";
-    public static final String BUILD = "20250227_1029";
+    public static final String BUILD = "20250520_1057";
 
     private Constants() {
         // private for security

i18n/XMLJava_es.xlf

@@ -12,6 +12,7 @@
 package com.maxprograms.xml;
 
 import java.io.Serializable;
+import java.text.MessageFormat;
 import java.util.List;
 import java.util.Stack;
 import java.util.StringTokenizer;
@@ -65,7 +66,8 @@ public static ContentModel parse(String modelString) {
         if (string.startsWith("(#PCDATA")) {
             type = MIXED;
             if (!string.endsWith(")*")) {
-                throw new IllegalArgumentException("Invalid mixed content model: " + string);
+                MessageFormat mf = new MessageFormat(Messages.getString("ContentModel.0"));
+                throw new IllegalArgumentException(mf.format(new Object[] { modelString }));
             }
         }
 
@@ -87,13 +89,13 @@ public static ContentModel parse(String modelString) {
                 current.add(groupParticle);
             } else if ("*".equals(token) || "+".equals(token) || "?".equals(token)) {
                 if (current.isEmpty()) {
-                    throw new IllegalArgumentException(
-                            "Cardinality operator '" + token + "' must follow a valid particle.");
+                    MessageFormat mf = new MessageFormat(Messages.getString("ContentModel.1"));
+                    throw new IllegalArgumentException(mf.format(new Object[] { token }));
                 }
                 Object lastObject = current.get(current.size() - 1);
                 if (!(lastObject instanceof ContentParticle)) {
-                    throw new IllegalArgumentException(
-                            "Cardinality operator '" + token + "' must follow a valid particle.");
+                    MessageFormat mf = new MessageFormat(Messages.getString("ContentModel.1"));
+                    throw new IllegalArgumentException(mf.format(new Object[] { token }));
                 }
                 int cardinality = "?".equals(token) ? OPTIONAL : ("*".equals(token) ? ZEROMANY : ONEMANY);
                 ((ContentParticle) lastObject).setCardinality(cardinality);
@@ -108,7 +110,8 @@ public static ContentModel parse(String modelString) {
 
         for (Object obj : current) {
             if (!(obj instanceof ContentParticle)) {
-                throw new IllegalArgumentException("Invalid content model: " + string);
+                MessageFormat mf = new MessageFormat(Messages.getString("ContentModel.2"));
+                throw new IllegalArgumentException(mf.format(new Object[] { modelString }));
             }
             particles.add((ContentParticle) obj);
         }
@@ -118,7 +121,7 @@ public static ContentModel parse(String modelString) {
 
     private static ContentParticle processGroup(List<Object> group) {
         if (group.isEmpty()) {
-            throw new IllegalArgumentException("Empty group found in content model.");
+            throw new IllegalArgumentException(Messages.getString("ContentModel.3"));
         }
         if (group.size() == 1) {
             Object obj = group.get(0);
@@ -139,7 +142,8 @@ private static ContentParticle processGroup(List<Object> group) {
             }
         }
         if (sep == null) {
-            throw new IllegalArgumentException("No separator found in group: " + group);
+            MessageFormat mf = new MessageFormat(Messages.getString("ContentModel.4"));
+            throw new IllegalArgumentException(mf.format(new Object[] { group }));
         }
         ContentParticle result = "|".equals(sep) ? new DTDChoice() : new DTDSecuence();
         for (Object obj : group) {
@@ -163,17 +167,20 @@ private static void validateParentheses(String string) {
             else if (c == ')')
                 balance--;
             if (balance < 0) {
-                throw new IllegalArgumentException("Unbalanced parentheses in content model: " + string);
+                MessageFormat mf = new MessageFormat(Messages.getString("ContentModel.5"));
+                throw new IllegalArgumentException(mf.format(new Object[] { string }));
             }
         }
         if (balance != 0) {
-            throw new IllegalArgumentException("Unbalanced parentheses in content model: " + string);
+            MessageFormat mf = new MessageFormat(Messages.getString("ContentModel.5"));
+            throw new IllegalArgumentException(mf.format(new Object[] { string }));
         }
     }
 
     private static void validateToken(String token) {
         if (!token.matches("[a-zA-Z0-9#|,?*+()]+")) {
-            throw new IllegalArgumentException("Invalid token in content model: " + token);
+            MessageFormat mf = new MessageFormat(Messages.getString("ContentModel.6"));
+            throw new IllegalArgumentException(mf.format(new Object[] { token }));
         }
     }
 

lib/xmljava.jar

@@ -2,6 +2,13 @@ Catalog.0=Error parsing DTD ''{0}''
 Calatalog.1=Error connecting to ''{0}'': {1}
 Calatalog.2=Error  {0} for: {1}
 Catalog.3=Resolving from URL ''{0}''
+ContentModel.0=Invalid mixed content model: {0}
+ContentModel.1=Cardinality operator ''{0}'' must follow a valid particle
+ContentModel.2=Invalid content model: {0}
+ContentModel.3=Empty group found in content model
+ContentModel.4=No separator found in group: {0}
+ContentModel.5=Unbalanced parentheses in content model: {0}
+ContentModel.6=Invalid token in content model: {0}
 CustomContentHandler.0=Malformed content found
 Document.0=Prolog contains wrong content type
 DTDParser.0=Malformed entity reference

src/com/maxprograms/xml/Constants.java

@@ -2,6 +2,13 @@ Catalog.0=Error al analizar DTD ''{0}''
 Calatalog.1=Error conectando a ''{0}'': {1}
 Calatalog.2=Error  {0} para: {1}
 Catalog.3=Resolviendo desde URL ''{0}''
+ContentModel.0=Modelo de contenido mixto no válido: {0}
+ContentModel.1=El operador de cardinalidad ''{0}'' debe aparecer después de una partícula válida.
+ContentModel.2=Modelo de contenido no válido: {0}
+ContentModel.3=Se encontró un grupo vacío en el modelo de contenido
+ContentModel.4=No se encontró separador en el grupo: {0}
+ContentModel.5=Paréntesis desequilibrados en el modelo de contenido: {0}
+ContentModel.6=Token no válido en el modelo de contenido: {0}
 CustomContentHandler.0=Se ha encontrado contenido con formato incorrecto
 Document.0=Prólogo contiene un tipo de contenido incorrecto
 DTDParser.0=Referencia de entidad con formato incorrecto