myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject [myfaces-tobago] 02/04: TOBAGO-1931: TobagoBundle class doesn't work correctly
Date Wed, 28 Nov 2018 22:41:27 GMT
This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git

commit 64927d05ef06b3955bcda6f385ae68d2bbc9d9a0
Author: Udo Schnurpfeil <lofwyr@apache.org>
AuthorDate: Thu Nov 22 14:32:17 2018 +0100

    TOBAGO-1931: TobagoBundle class doesn't work correctly
    
    * Clean up bundle names for messages
---
 .../internal/component/AbstractUISelectOneBase.java  |  2 +-
 .../tobago/internal/component/AbstractUISheet.java   |  4 ++--
 .../tobago/internal/component/AbstractUITree.java    |  2 --
 .../tobago/context/TobagoMessageBundle.properties    | 20 +++++---------------
 .../tobago/context/TobagoMessageBundle_de.properties | 20 +++++---------------
 .../tobago/context/TobagoMessageBundle_es.properties | 20 +++++---------------
 6 files changed, 18 insertions(+), 50 deletions(-)

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java
b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java
index 0a01357..0bef935 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneBase.java
@@ -33,7 +33,7 @@ import javax.faces.context.FacesContext;
 public abstract class AbstractUISelectOneBase extends javax.faces.component.UISelectOne
     implements Visual, SupportsLabelLayout, ClientBehaviorHolder {
 
-  public static final String MESSAGE_VALUE_REQUIRED = "tobago.SelectOne.MESSAGE_VALUE_REQUIRED";
+  public static final String MESSAGE_VALUE_REQUIRED = "org.apache.myfaces.tobago.UISelectOne.REQUIRED";
 
   @Override
   public void validate(final FacesContext facesContext) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
index b9174c4..fc0fc87 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
@@ -72,8 +72,8 @@ public abstract class AbstractUISheet extends AbstractUIData
   public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Data";
 
   public static final String SORTER_ID = "sorter";
-  public static final String NOT_SORTABLE_COL_MESSAGE_ID = "org.apache.myfaces.tobago.Sheet.SORTING_COL_ERROR";
-  public static final String NOT_SORTABLE_MESSAGE_ID = "org.apache.myfaces.tobago.Sheet.SORTING_ERROR";
+  public static final String NOT_SORTABLE_COL_MESSAGE_ID = "org.apache.myfaces.tobago.UISheet.SORTING_COL";
+  public static final String NOT_SORTABLE_MESSAGE_ID = "org.apache.myfaces.tobago.UISheet.SORTING";
 
   private SheetState state;
   private transient MeasureList columnLayout;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
index 05f2df2..7bb1fb4 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
@@ -37,8 +37,6 @@ import javax.faces.context.FacesContext;
  */
 public abstract class AbstractUITree extends AbstractUIData implements NamingContainer, Visual
{
 
-  public static final String MESSAGE_NOT_LEAF = "tobago.tree.MESSAGE_NOT_LEAF";
-
   /**
    * @deprecated since 2.0.0
    */
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle.properties
b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle.properties
index f9c29c9..cf3b4dc 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle.properties
@@ -4,18 +4,8 @@ org.apache.myfaces.tobago.FileItemValidator.CONTENT_TYPE=Content type error
 org.apache.myfaces.tobago.FileItemValidator.CONTENT_TYPE_detail=The given file is not content
type of ''{0}''.
 org.apache.myfaces.tobago.FileItemValidator.SIZE_LIMIT=File too large
 org.apache.myfaces.tobago.FileItemValidator.SIZE_LIMIT_detail=The uploaded file exceeded
the maximum size of {0} bytes.
-org.apache.myfaces.tobago.Sheet.SORTING_ERROR=Sorting not possible!
-org.apache.myfaces.tobago.Sheet.SORTING_COL_ERROR_detail=Can't sort the column ''{0}''\!
-tobago.SelectOne.MESSAGE_VALUE_REQUIRED=Selection required
-tobago.longrangevalidator.message.range.detail=Value must be between {0} and {1}.
-tobago.longrangevalidator.message.range.summary=Not in range.
-tobago.longrangevalidator.message.type.detail=Value is not of the correct type.
-tobago.longrangevalidator.message.type.summary=Wrong type.
-tobago.message.conversion_error.detail=Unable to convert ''{0}'' to type {1}.
-tobago.message.conversion_error.summary=Unable to convert.
-tobago.message.number_conversion_error.detail=Unable to convert ''{0}'' to number type {1}.
-tobago.message.number_conversion_error.summary=Unable to convert number.
-tobago.requiredvalidator.message.empty.detail=Field is required.
-tobago.requiredvalidator.message.empty.summary=Required field.
-tobago.tree.MESSAGE_NOT_LEAF=Only leaf selection allowed.
-org.apache.myfaces.tobago.Sheet.SORTING_COL_ERROR=Sorting not possible!
+org.apache.myfaces.tobago.UISheet.SORTING=Sorting not possible!
+org.apache.myfaces.tobago.UISheet.SORTING_COL=Can't sort the column ''{0}''!
+org.apache.myfaces.tobago.UISelectOne.REQUIRED=Selection required
+
+
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_de.properties
b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_de.properties
index 786a406..59d5089 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_de.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_de.properties
@@ -4,18 +4,8 @@ org.apache.myfaces.tobago.FileItemValidator.CONTENT_TYPE=Dateityp Fehler
 org.apache.myfaces.tobago.FileItemValidator.CONTENT_TYPE_detail=Die hochgeladene Datei ist
nicht vom Typ ''{0}''.
 org.apache.myfaces.tobago.FileItemValidator.SIZE_LIMIT=Datei zu gro\u00DF
 org.apache.myfaces.tobago.FileItemValidator.SIZE_LIMIT_detail=Die Gr\u00F6\u00DFe der hochgeladenen
Datei darf nicht gr\u00F6\u00DFer als {1} Bytes sein.
-org.apache.myfaces.tobago.Sheet.SORTING_ERROR=Sortieren nicht m\u00F6glich!
-org.apache.myfaces.tobago.Sheet.SORTING_COL_ERROR_detail=Nach Spalte ''{0}'' kann nicht sortiert
werden\!
-tobago.SelectOne.MESSAGE_VALUE_REQUIRED=Eine Auswahl wird ben\u00F6tigt\!
-tobago.longrangevalidator.message.range.detail=Wert muss zwischen {0} und {1} liegen.
-tobago.longrangevalidator.message.range.summary=Bereichs\u00FCberschreitung.
-tobago.longrangevalidator.message.type.detail=Wert hat den falschen Typ.
-tobago.longrangevalidator.message.type.summary=Falscher Typ.
-tobago.message.conversion_error.detail=''{0}'' kann nicht zum Typ {1} umgewandelt werden.
-tobago.message.conversion_error.summary=Konvertierung nicht m\u00F6glich.
-tobago.message.number_conversion_error.detail=''{0}'' kann nicht zum Typ {1} umgewandelt
werden.
-tobago.message.number_conversion_error.summary=Zahl kann nicht konvertiert werden.
-tobago.requiredvalidator.message.empty.detail=Feld ben\u00F6tigt eine Eingabe\!
-tobago.requiredvalidator.message.empty.summary=Pflichtfeld
-tobago.tree.MESSAGE_NOT_LEAF=Es d\u00FCrfen nur Endknoten ausgew\u00E4hlt werden.
-org.apache.myfaces.tobago.Sheet.SORTING_COL_ERROR=Sortieren nicht m\u00F6glich!
+org.apache.myfaces.tobago.UISheet.SORTING=Sortieren nicht m\u00F6glich!
+org.apache.myfaces.tobago.UISheet.SORTING_COL=Nach Spalte ''{0}'' kann nicht sortiert werden\!
+org.apache.myfaces.tobago.UISelectOne.REQUIRED=Eine Auswahl wird ben\u00F6tigt\!
+
+
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_es.properties
b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_es.properties
index f481a0e..23a7bde 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_es.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoMessageBundle_es.properties
@@ -4,18 +4,8 @@ org.apache.myfaces.tobago.FileItemValidator.CONTENT_TYPE=Error de tipo de
conten
 org.apache.myfaces.tobago.FileItemValidator.CONTENT_TYPE_detail=El archivo no es del tipo
de contenido ''{0}''.
 org.apache.myfaces.tobago.FileItemValidator.SIZE_LIMIT=Error en el tama\u00F1o del archivo
 org.apache.myfaces.tobago.FileItemValidator.SIZE_LIMIT_detail=El archivo subido excede el
m\u00E1ximo tama\u00F1o de {0} bytes.
-org.apache.myfaces.tobago.Sheet.SORTING_ERROR=No se puede ordenar!
-org.apache.myfaces.tobago.Sheet.SORTING_COL_ERROR_detail=Despu\u00E9s de columna ''{0}''
no se puede ordenar!
-tobago.SelectOne.MESSAGE_VALUE_REQUIRED=Se requiere seleccionar.
-tobago.longrangevalidator.message.range.detail=El valor debe de ser entre {0} y {1}.
-tobago.longrangevalidator.message.range.summary=Fuera de rango.
-tobago.longrangevalidator.message.type.detail=El valor no es del tipo correcto.
-tobago.longrangevalidator.message.type.summary=Tipo erroneo.
-tobago.message.conversion_error.detail=No se puede convertir ''{0}'' al tipo {1}.
-tobago.message.conversion_error.summary=No se puede convertir.
-tobago.message.number_conversion_error.detail=No se puede convertir ''{0}'' a tipo de n\u00FAmero
{1}.
-tobago.message.number_conversion_error.summary=N\u00FAmero no se puede convertir.
-tobago.requiredvalidator.message.empty.detail=Campo es requerido.
-tobago.requiredvalidator.message.empty.summary=Campo requerido.
-tobago.tree.MESSAGE_NOT_LEAF=Solo se permite seleccionar hojas.
-org.apache.myfaces.tobago.Sheet.SORTING_COL_ERROR=No se puede ordenar!
+org.apache.myfaces.tobago.UISheet.SORTING=No se puede ordenar!
+org.apache.myfaces.tobago.UISheet.SORTING_COL=Despu\u00E9s de columna ''{0}'' no se puede
ordenar!
+org.apache.myfaces.tobago.UISelectOne.REQUIRED=Se requiere seleccionar.
+
+


Mime
View raw message