modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 19 ++++------ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 2 - 2 files changed, 10 insertions(+), 11 deletions(-)
New commits: commit ff901b3e71021fd2dfb0021f08a825bd1c7d364a Author: John Mazzitelli mazz@redhat.com Date: Fri Nov 19 11:27:32 2010 -0500
i18n the table component
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java index 2da98c7..67e1b4b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java @@ -87,8 +87,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableMenu; * @author Greg Hinkle * @author Ian Springer */ -public class Table<DS extends RPCDataSource> extends LocatableHLayout - implements RefreshableView { +public class Table<DS extends RPCDataSource> extends LocatableHLayout implements RefreshableView {
private static final String FIELD_ID = "id"; private static final String FIELD_NAME = "name"; @@ -326,8 +325,8 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout public void onClick(ClickEvent clickEvent) { if (tableAction.confirmMessage != null) {
- String message = tableAction.confirmMessage.replaceAll("\#", String - .valueOf(listGrid.getSelection().length)); + String message = tableAction.confirmMessage.replaceAll("\#", String.valueOf(listGrid + .getSelection().length));
SC.ask(message, new BooleanCallback() { public void execute(Boolean confirmed) { @@ -355,15 +354,14 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout
@Override public void onClick(MenuItemClickEvent event) { - tableAction.getAction() - .executeAction(listGrid.getSelection(), menuEntries.get(key)); + tableAction.getAction().executeAction(listGrid.getSelection(), menuEntries.get(key)); } }); menu.addItem(item); }
- IMenuButton menuButton = new LocatableIMenuButton(tableAction.getLocatorId(), tableAction - .getTitle(), menu); + IMenuButton menuButton = new LocatableIMenuButton(tableAction.getLocatorId(), tableAction.getTitle(), + menu); menuButton.setDisabled(true); // this makes it pretty tight, but maybe better than the default, which is pretty wide menuButton.setAutoFit(true); @@ -381,7 +379,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout footer.addMember(new LayoutSpacer());
if (isShowFooterRefresh()) { - IButton refreshButton = new LocatableIButton(extendLocatorId("Refresh"), "Refresh"); + IButton refreshButton = new LocatableIButton(extendLocatorId("Refresh"), MSG.common_button_refresh()); refreshButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { listGrid.invalidateCache(); @@ -666,7 +664,8 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout } } if (getTableInfo() != null) { - getTableInfo().setContents("Total: " + listGrid.getTotalRows() + " (" + count + " selected)"); + getTableInfo().setContents( + MSG.view_table_totalRows(String.valueOf(listGrid.getTotalRows()), String.valueOf(count))); } } } diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 4b8da61..a581a4e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -956,7 +956,7 @@ view_selector_available = Available {0}~
view_subTab_error_disabled = Cannot select disabled subTab [{0}].~
-view_table_totalRows = Total Rows: {0} Selected: {1}~ +view_table_totalRows = Total Rows: {0} (selected: {1})~ view_tableSection_backButton = Back to List~ view_tableSection_error_noId = Table [{0}] record is missing 'id' attribute - please report this bug.~ view_tableSection_error_badId = Can not show detail for [{0}]. Illegal 'id': [{1}]. Please report this bug~
rhq-commits@lists.fedorahosted.org