You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2018/11/22 10:18:16 UTC
[myfaces-tobago] 03/03: TOBAGO-1931: TobagoBundle class doesn't
work correctly
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 058e1992dd0fcd40957651980aeef71e953128f1
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Nov 22 11:18:02 2018 +0100
TOBAGO-1931: TobagoBundle class doesn't work correctly
* Clean up bundle names
** logical key names: <component>.<short-description>, e.g. sheet.next
---
.../apache/myfaces/tobago/event/SheetAction.java | 19 +++---
.../internal/renderkit/renderer/FileRenderer.java | 2 +-
.../renderkit/renderer/ObjectRenderer.java | 3 +-
.../internal/renderkit/renderer/PageRenderer.java | 2 +-
.../internal/renderkit/renderer/SheetRenderer.java | 38 ++++-------
.../tobago/context/TobagoResourceBundle.properties | 73 +++++++---------------
.../context/TobagoResourceBundle_de.properties | 73 +++++++---------------
.../context/TobagoResourceBundle_es.properties | 73 +++++++---------------
.../tobago/util/ResourcesUtilsUnitTest.java | 8 +--
9 files changed, 100 insertions(+), 191 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetAction.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetAction.java
index 277ab29..07a1236 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetAction.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetAction.java
@@ -19,29 +19,27 @@
package org.apache.myfaces.tobago.event;
-import org.apache.myfaces.tobago.internal.util.StringUtils;
-
public enum SheetAction {
/**
* First page is requested
*/
- first,
+ first("sheet.first"),
/**
* Previous page is requested
*/
- prev,
+ prev("sheet.prev"),
/**
* Next page is requested
*/
- next,
+ next("sheet.next"),
/**
* Last page is requested
*/
- last,
+ last("sheet.last"),
/**
* A specified row is requested
@@ -51,17 +49,20 @@ public enum SheetAction {
/**
* A specified page is requested
*/
- toPage,
+ toPage("sheet.toPage"),
/**
* Sorting
*/
- sort;
+ sort();
private String bundleKey;
SheetAction() {
- this.bundleKey = "sheet" + StringUtils.firstToUpperCase(name());
+ }
+
+ SheetAction(final String bundleKey) {
+ this.bundleKey = bundleKey;
}
public String getBundleKey() {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
index 7a0da40..9032793 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
@@ -164,7 +164,7 @@ public class FileRenderer extends MessageLayoutRendererBase implements Component
writer.writeIdAttribute(fieldId);
writer.writeClassAttribute(TobagoClass.FILE__REAL);
writer.writeNameAttribute(clientId);
- final String multiFormat = ResourceUtils.getString(facesContext, "tobago.file.multiFormat");
+ final String multiFormat = ResourceUtils.getString(facesContext, "file.selected");
writer.writeAttribute(DataAttributes.dynamic("tobago-file-multi-format"), multiFormat, true);
// readonly seems not making sense in browsers.
writer.writeAttribute(HtmlAttributes.DISABLED, file.isDisabled() || file.isReadonly());
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ObjectRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ObjectRenderer.java
index b342c6d..3ea229e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ObjectRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ObjectRenderer.java
@@ -60,12 +60,11 @@ public class ObjectRenderer extends RendererBase {
object.getCustomClass(),
markup != null && markup.contains(Markup.SPREAD) ? TobagoClass.SPREAD : null);
- writer.writeText(ResourceUtils.getString(facesContext, "browser.noframe.message.prefix"));
+ writer.writeText(ResourceUtils.getString(facesContext, "object.noframe"));
writer.writeText(" ");
if (object.getSrc() != null) {
writer.writeText(object.getSrc());
}
- writer.writeText(" " + ResourceUtils.getString(facesContext, "browser.noframe.message.postfix"));
writer.endElement(HtmlElements.IFRAME);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
index 4dcf0e2..479c97c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
@@ -358,7 +358,7 @@ public class PageRenderer extends RendererBase {
writer.startElement(HtmlElements.NOSCRIPT);
writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(TobagoClass.PAGE__NOSCRIPT);
- writer.writeText(ResourceUtils.getString(facesContext, "pageNoscript"));
+ writer.writeText(ResourceUtils.getString(facesContext, "page.noscript"));
writer.endElement(HtmlElements.DIV);
writer.endElement(HtmlElements.NOSCRIPT);
writer.endElement(HtmlElements.DIV);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
index 070e0bc..9c70f77 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
@@ -374,7 +374,7 @@ public class SheetRenderer extends RendererBase {
writer.startElement(HtmlElements.LI);
writer.writeClassAttribute(BootstrapClass.PAGE_ITEM);
writer.writeAttribute(HtmlAttributes.TITLE,
- ResourceUtils.getString(facesContext, "sheetPagingInfoRowPagingTip"), true);
+ ResourceUtils.getString(facesContext, "sheet.setRow"), true);
writer.startElement(HtmlElements.SPAN);
writer.writeClassAttribute(TobagoClass.SHEET__PAGING_TEXT, BootstrapClass.PAGE_LINK);
if (sheet.getRowCount() != 0) {
@@ -386,17 +386,9 @@ public class SheetRenderer extends RendererBase {
final boolean unknown = !sheet.hasRowCount();
final String key; // plural
if (unknown) {
- if (first == last1) {
- key = "sheetPagingInfoUndefinedSingleRow";
- } else {
- key = "sheetPagingInfoUndefinedRows";
- }
+ key = first == last1 ? "sheet.rowX" : "sheet.rowXtoY";
} else {
- if (first == last1) {
- key = "sheetPagingInfoSingleRow";
- } else {
- key = "sheetPagingInfoRows";
- }
+ key = first == last1 ? "sheet.rowXofZ" : "sheet.rowXtoYofZ";
}
final String inputMarker = "{#}";
final Object[] args = {inputMarker, last1 == -1 ? "?" : last1, unknown ? "" : sheet.getRowCount()};
@@ -471,7 +463,7 @@ public class SheetRenderer extends RendererBase {
writer.startElement(HtmlElements.SPAN);
writer.writeClassAttribute(TobagoClass.SHEET__PAGING_TEXT, BootstrapClass.PAGE_LINK);
writer.writeAttribute(HtmlAttributes.TITLE,
- ResourceUtils.getString(facesContext, "sheetPagingInfoPagePagingTip"), true);
+ ResourceUtils.getString(facesContext, "sheet.setPage"), true);
if (sheet.getRowCount() != 0) {
final Locale locale = facesContext.getViewRoot().getLocale();
final int first = sheet.getCurrentPage() + 1;
@@ -479,17 +471,9 @@ public class SheetRenderer extends RendererBase {
final int pages = unknown ? -1 : sheet.getPages();
final String key;
if (unknown) {
- if (first == pages) {
- key = "sheetPagingInfoUndefinedSinglePage";
- } else {
- key = "sheetPagingInfoUndefinedPages";
- }
+ key = first == pages ? "sheet.pageX" : "sheet.pageXtoY";
} else {
- if (first == pages) {
- key = "sheetPagingInfoSinglePage";
- } else {
- key = "sheetPagingInfoPages";
- }
+ key = first == pages ? "sheet.pageXofZ" : "sheet.pageXtoYofZ";
}
final String inputMarker = "{#}";
final Object[] args = {inputMarker, pages == -1 ? "?" : pages};
@@ -771,7 +755,7 @@ public class SheetRenderer extends RendererBase {
writer.writeAttribute(HtmlAttributes.COLSPAN, countColumns);
writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(BootstrapClass.TEXT_CENTER);
- writer.writeText(ResourceUtils.getString(facesContext, "sheetPagingInfoEmptyRow"));
+ writer.writeText(ResourceUtils.getString(facesContext, "sheet.empty"));
writer.endElement(HtmlElements.DIV);
writer.endElement(HtmlElements.TD);
if (!autoLayout) {
@@ -949,7 +933,7 @@ public class SheetRenderer extends RendererBase {
} else {
tip += " - ";
}
- tip += ResourceUtils.getString(facesContext, "sheetTipSorting");
+ tip += ResourceUtils.getString(facesContext, "sheet.sorting");
markup = markup.add(Markup.SORTABLE);
@@ -957,10 +941,10 @@ public class SheetRenderer extends RendererBase {
if (column.getId().equals(sheetState.getSortedColumnId())) {
final String sortTitle;
if (sheetState.isAscending()) {
- sortTitle = ResourceUtils.getString(facesContext, "sheetAscending");
+ sortTitle = ResourceUtils.getString(facesContext, "sheet.ascending");
markup = markup.add(Markup.ASCENDING);
} else {
- sortTitle = ResourceUtils.getString(facesContext, "sheetDescending");
+ sortTitle = ResourceUtils.getString(facesContext, "sheet.descending");
markup = markup.add(Markup.DESCENDING);
}
if (sortTitle != null) {
@@ -980,7 +964,7 @@ public class SheetRenderer extends RendererBase {
writer.writeClassAttribute(TobagoClass.SHEET__COLUMN_SELECTOR);
writer.writeAttribute(
HtmlAttributes.TITLE,
- ResourceUtils.getString(facesContext, "sheetMenuSelect"),
+ ResourceUtils.getString(facesContext, "sheet.selectAll"),
true);
writer.endElement(HtmlElements.INPUT);
} else {
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle.properties b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle.properties
index d54e985..83a4e1c 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle.properties
@@ -1,51 +1,26 @@
#Converted from './tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource.xml'
#Thu Sep 20 20:54:31 CEST 2018
-browser.noframe.message.postfix=
-browser.noframe.message.prefix=Your user agent does not support frames or is currently configured not to display frames. However, you may visit the related document manually:
-configButtonText=Configuration
-configCachecoverage=Cache coverage
-configContentType=Content type
-configContentTypeText=Which Content-Type should be used?
-configLocale=Locale
-configLocaleText=Which locale should be used?
-configSubmit=Submit
-configTheme=Theme
-configThemeText=Which theme should be used?
-configTitle=Client configuration of the Tobago framework
-datePickerCancel=Cancel
-datePickerOk=OK
-datePickerTitle=Date Picker
-pageNoscript=This site requires JavaScript, but JavaScript is currently not activated in your browser. To enable JavaScript you may consult your browsers the documentation.
-sheetAscending=Ascending
-sheetDescending=Descending
-sheetFirst=First Page
-sheetLast=Last Page
-sheetMenuSelect=Select all
-sheetNext=Next Page
-sheetPagingInfoEmptyRow=No rows available
-sheetPagingInfoPagePagingTip=Click here, to change the displayed page
-sheetPagingInfoPages=Page {0} of {1}
-sheetPagingInfoRowPagingTip=Click here, to change the first displayed row
-sheetPagingInfoRows=Rows {0} to {1} of {2}
-sheetPagingInfoSinglePage=Page {0} of {1}
-sheetPagingInfoSingleRow=Row {0} of {2}
-sheetPagingInfoUndefinedPages=Page {0}
-sheetPagingInfoUndefinedRows=Rows {0} to {1}
-sheetPagingInfoUndefinedSinglePage=Page {0}
-sheetPagingInfoUndefinedSingleRow=Row {0}
-sheetPrev=Previous Page
-sheetTipSorting=Click to sort this column
-sheetToPage=Page {0}
-tobago.file.multiFormat={} files selected
-tobago.in.inputSuggest.moreElements=There are more matching entries\u2026
-tobago.message.confirmation.okay=OK
-tobago.message.confirmation.title=Messages
-treeCopy=Copy
-treeCut=Cut
-treeDelete=Delete
-treeEdit=Edit
-treeMoveDown=Move Down
-treeMoveUp=Move Up
-treeNew=New
-treeNodeNew=New Node
-treePaste=Paste
+object.noframe=Your user agent does not support frames or is currently configured not to display frames. However, you may visit the related document manually:
+page.noscript=This site requires JavaScript, but JavaScript is currently not activated in your browser. To enable JavaScript you may consult your browsers the documentation.
+sheet.ascending=Ascending
+sheet.descending=Descending
+sheet.first=First Page
+sheet.last=Last Page
+sheet.selectAll=Select all
+sheet.next=Next Page
+sheet.empty=No rows available
+sheet.setPage=Click here, to change the displayed page
+sheet.pageXtoYofZ=Page {0} of {1}
+sheet.setRow=Click here, to change the first displayed row
+sheet.rowXtoYofZ=Rows {0} to {1} of {2}
+sheet.pageXofZ=Page {0} of {1}
+sheet.rowXofZ=Row {0} of {2}
+sheet.pageXtoY=Page {0}
+sheet.rowXtoY=Rows {0} to {1}
+sheet.pageX=Page {0}
+sheet.rowX=Row {0}
+sheet.prev=Previous Page
+sheet.sorting=Click to sort this column
+sheet.toPage=Page {0}
+file.selected={} files selected
+
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_de.properties b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_de.properties
index a0d17ef..6bfae3d 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_de.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_de.properties
@@ -1,51 +1,26 @@
#Converted from './tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource_de.xml'
#Thu Sep 20 20:54:31 CEST 2018
-browser.noframe.message.postfix=
-browser.noframe.message.prefix=Ihr Browser stellt keine so genannten Frames dar. Den Inhalt k\u00F6nnen Sie hier erreichen:
-configButtonText=Einstellungen
-configCachecoverage=Cache Abdeckung
-configContentType=Inhaltstyp
-configContentTypeText=Welcher Inhaltstyp (Content-Type) soll verwendet werden?
-configLocale=Sprache
-configLocaleText=Welche Sprache/Region soll verwendet werden?
-configSubmit=\u00C4ndern
-configTheme=Design
-configThemeText=Welches Design soll verwendet werden?
-configTitle=Konfiguration des Clients des Tobago-Frameworks
-datePickerCancel=Abbrechen
-datePickerOk=OK
-datePickerTitle=Datumsauswahl
-pageNoscript=Diese Seite ben\u00F6tigt JavaScript, allerdings ist JavaScript in Ihrem Browser derzeit deaktiviert. Um JavaScript zu aktivieren, lesen Sie ggf. die Anleitung Ihres Browsers.
-sheetAscending=aufsteigend sortiert
-sheetDescending=absteigend sortiert
-sheetFirst=erste Seite
-sheetLast=letzte Seite
-sheetMenuSelect=Alles ausw\u00E4hlen
-sheetNext=n\u00E4chste Seite
-sheetPagingInfoEmptyRow=Keine Zeilen verf\u00FCgbar
-sheetPagingInfoPagePagingTip=Hier klicken, zum Eingeben der anzuzeigenden Seite.
-sheetPagingInfoPages=Seite {0} von {1}
-sheetPagingInfoRowPagingTip=Hier klicken, zum Eingeben der ersten anzuzeigenden Zeile.
-sheetPagingInfoRows=Zeilen {0} bis {1} von {2}
-sheetPagingInfoSinglePage=Seite {0} von {1}
-sheetPagingInfoSingleRow=Zeile {0} von {2}
-sheetPagingInfoUndefinedPages=Seite {0}
-sheetPagingInfoUndefinedRows=Zeilen {0} bis {1}
-sheetPagingInfoUndefinedSinglePage=Seite {0}
-sheetPagingInfoUndefinedSingleRow=Zeile {0}
-sheetPrev=vorherige Seite
-sheetTipSorting=nach dieser Spalte sortieren
-sheetToPage=Seite {0}
-tobago.file.multiFormat={} Dateien ausgew\u00E4hlt
-tobago.in.inputSuggest.moreElements=Es gibt weitere passende Eintr\u00E4ge\u2026
-tobago.message.confirmation.okay=OK
-tobago.message.confirmation.title=Meldungen
-treeCopy=Kopieren
-treeCut=Ausschneiden
-treeDelete=L\u00F6schen
-treeEdit=Bearbeiten
-treeMoveDown=Nach unten verschieben
-treeMoveUp=Nach oben verschieben
-treeNew=Neu
-treeNodeNew=Neuer Knoten
-treePaste=Einf\u00FCgen
+object.noframe=Ihr Browser stellt keine Frames dar. Den Inhalt k\u00F6nnen Sie hier erreichen:
+page.noscript=Diese Seite ben\u00F6tigt JavaScript, allerdings ist JavaScript in Ihrem Browser derzeit deaktiviert. Um JavaScript zu aktivieren, lesen Sie ggf. die Anleitung Ihres Browsers.
+sheet.ascending=aufsteigend sortiert
+sheet.descending=absteigend sortiert
+sheet.first=erste Seite
+sheet.last=letzte Seite
+sheet.selectAll=Alles ausw\u00E4hlen
+sheet.next=n\u00E4chste Seite
+sheet.empty=Keine Zeilen verf\u00FCgbar
+sheet.setPage=Hier klicken, zum Eingeben der anzuzeigenden Seite.
+sheet.pageXtoYofZ=Seite {0} von {1}
+sheet.setRow=Hier klicken, zum Eingeben der ersten anzuzeigenden Zeile.
+sheet.rowXtoYofZ=Zeilen {0} bis {1} von {2}
+sheet.pageXofZ=Seite {0} von {1}
+sheet.rowXofZ=Zeile {0} von {2}
+sheet.pageXtoY=Seite {0}
+sheet.rowXtoY=Zeilen {0} bis {1}
+sheet.pageX=Seite {0}
+sheet.rowX=Zeile {0}
+sheet.prev=vorherige Seite
+sheet.sorting=nach dieser Spalte sortieren
+sheet.toPage=Seite {0}
+file.selected={} Dateien ausgew\u00E4hlt
+
diff --git a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_es.properties b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_es.properties
index 26e93eb..d47d714 100644
--- a/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_es.properties
+++ b/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResourceBundle_es.properties
@@ -1,51 +1,26 @@
#Converted from './tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource_es.xml'
#Thu Sep 20 20:54:31 CEST 2018
-browser.noframe.message.postfix=
-browser.noframe.message.prefix=Tu navegador no soporta frames o est\u00E1 configurado para no desplegar frames. Como sea, puedes visitar el documento relacionado:
-configButtonText=Configuracion
-configCachecoverage=Cobertura de cache
-configContentType=Tipo de contenido
-configContentTypeText=\u00BFQue tipo de contenido debe de ser utilizado?
-configLocale=Idioma
-configLocaleText=\u00BFQue idioma debe de ser utilizado?
-configSubmit=Enviar
-configTheme=Tema
-configThemeText=\u00BFQue tema debe de ser utilizado?
-configTitle=Configuraci\u00F3n cliente del framework Tobago
-datePickerCancel=Cancelar
-datePickerOk=Enviar
-datePickerTitle=Escoger fecha
-pageNoscript=Esta p\u00E1gina requiere JavaScript, pero JavaScript no se activa actualmente en su navegador. Para permitir JavaScript usted puede consultar la documentaci\u00F3n del navegador.
-sheetAscending=Ascendente
-sheetDescending=Descendente
-sheetFirst=Primera P\u00E1gina
-sheetLast=\u00DAltima P\u00E1gina
-sheetMenuSelect=Seleccionar todo
-sheetNext=P\u00E1gina Siguiente
-sheetPagingInfoEmptyRow=No hay registros disponibles
-sheetPagingInfoPagePagingTip=Click aqu\u00ED, para cambiar el nombre desplegado.
-sheetPagingInfoPages=P\u00E1gina {0} de {1}
-sheetPagingInfoRowPagingTip=Click aqui, para cambiar el primer registro desplegado.
-sheetPagingInfoRows=Registros {0} {1} de {2}
-sheetPagingInfoSinglePage=P\u00E1gina {0} de {1}
-sheetPagingInfoSingleRow=Registro {0} de {2}
-sheetPagingInfoUndefinedPages=P\u00E1gina {0}
-sheetPagingInfoUndefinedRows=Registros {0} {1}
-sheetPagingInfoUndefinedSinglePage=P\u00E1gina {0}
-sheetPagingInfoUndefinedSingleRow=Registro {0}
-sheetPrev=P\u00E1gina Anterior
-sheetTipSorting=Ordenar por esta columna
-sheetToPage=P\u00E1gina {0}
-tobago.file.multiFormat={} archivos seleccionados
-tobago.in.inputSuggest.moreElements=Hay m\u00E1s entradas aparejadas\u2026
-tobago.message.confirmation.okay=Enviar
-tobago.message.confirmation.title=Aviso
-treeCopy=Copiar
-treeCut=Cortar
-treeDelete=Borrar
-treeEdit=Editar
-treeMoveDown=Mover hacia abajo
-treeMoveUp=Mover hacia arriba
-treeNew=Nuevo
-treeNodeNew=Nuevo nodo
-treePaste=Pegar
+object.noframe=Tu navegador no soporta frames o est\u00E1 configurado para no desplegar frames. Como sea, puedes visitar el documento relacionado:
+page.noscript=Esta p\u00E1gina requiere JavaScript, pero JavaScript no se activa actualmente en su navegador. Para permitir JavaScript usted puede consultar la documentaci\u00F3n del navegador.
+sheet.ascending=Ascendente
+sheet.descending=Descendente
+sheet.first=Primera P\u00E1gina
+sheet.last=\u00DAltima P\u00E1gina
+sheet.selectAll=Seleccionar todo
+sheet.next=P\u00E1gina Siguiente
+sheet.empty=No hay registros disponibles
+sheet.setPage=Click aqu\u00ED, para cambiar el nombre desplegado.
+sheet.pageXtoYofZ=P\u00E1gina {0} de {1}
+sheet.setRow=Click aqui, para cambiar el primer registro desplegado.
+sheet.rowXtoYofZ=Registros {0} {1} de {2}
+sheet.pageXofZ=P\u00E1gina {0} de {1}
+sheet.rowXofZ=Registro {0} de {2}
+sheet.pageXtoY=P\u00E1gina {0}
+sheet.rowXtoY=Registros {0} {1}
+sheet.pageX=P\u00E1gina {0}
+sheet.rowX=Registro {0}
+sheet.prev=P\u00E1gina Anterior
+sheet.sorting=Ordenar por esta columna
+sheet.toPage=P\u00E1gina {0}
+file.selected={} archivos seleccionados
+
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/util/ResourcesUtilsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/util/ResourcesUtilsUnitTest.java
index cf4cc58..60b05c0 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/util/ResourcesUtilsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/util/ResourcesUtilsUnitTest.java
@@ -29,24 +29,24 @@ public class ResourcesUtilsUnitTest extends AbstractTobagoTestBase {
@Test
public void testDefault() {
- Assert.assertEquals("Locale", ResourceUtils.getString("configLocale"));
+ Assert.assertEquals("First Page", ResourceUtils.getString("sheet.first"));
}
@Test
public void testGermany() {
facesContext.getViewRoot().setLocale(Locale.GERMANY);
- Assert.assertEquals("Sprache", ResourceUtils.getString("configLocale"));
+ Assert.assertEquals("erste Seite", ResourceUtils.getString("sheet.first"));
}
@Test
public void testSpanish() {
facesContext.getViewRoot().setLocale(Locale.forLanguageTag("es"));
- Assert.assertEquals("Idioma", ResourceUtils.getString("configLocale"));
+ Assert.assertEquals("Primera Página", ResourceUtils.getString("sheet.first"));
}
@Test
public void testFallback() {
facesContext.getViewRoot().setLocale(Locale.forLanguageTag("ja"));
- Assert.assertEquals("Locale", ResourceUtils.getString("configLocale"));
+ Assert.assertEquals("First Page", ResourceUtils.getString("sheet.first"));
}
}