modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java | 15 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java | 23 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java | 45 ++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java | 12 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 18 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java | 29 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java | 46 ++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java | 45 ++--
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 95 +++++++++-
11 files changed, 216 insertions(+), 118 deletions(-)
New commits:
commit 6eaf009903d51d04969c75388ab6d86549bdd6fe
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Nov 16 17:40:08 2010 -0500
more i18n
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java
index 67724b0..bb26a03 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java
@@ -66,21 +66,24 @@ public class EventCompositeDatasource extends RPCDataSource<EventComposite> {
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceField id = new DataSourceIntegerField("id", "Id");
+ DataSourceField id = new DataSourceIntegerField("id", MSG.common_title_id());
id.setPrimaryKey(true);
fields.add(id);
- DataSourceTextField timestamp = new DataSourceTextField("timestamp", "Timestamp");
+ DataSourceTextField timestamp = new DataSourceTextField("timestamp", MSG
+ .view_inventory_eventHistory_timestamp());
timestamp.setType(FieldType.DATETIME);
fields.add(timestamp);
- DataSourceTextField severity = new DataSourceTextField("severity", "Severity");
+ DataSourceTextField severity = new DataSourceTextField("severity", MSG.view_inventory_eventHistory_severity());
fields.add(severity);
- DataSourceTextField details = new HighlightingDatasourceTextField("details", "Details");
+ DataSourceTextField details = new HighlightingDatasourceTextField("details", MSG
+ .view_inventory_eventHistory_details());
fields.add(details);
- DataSourceTextField sourceLocation = new DataSourceTextField("source", "Source Location");
+ DataSourceTextField sourceLocation = new DataSourceTextField("source", MSG
+ .view_inventory_eventHistory_sourceLocation());
fields.add(sourceLocation);
return fields;
@@ -111,7 +114,7 @@ public class EventCompositeDatasource extends RPCDataSource<EventComposite> {
GWTServiceLookup.getEventService().findEventCompositesByCriteria(criteria,
new AsyncCallback<PageList<EventComposite>>() {
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to load event data", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_inventory_eventDetails_loadFailed(), caught);
response.setStatus(RPCResponse.STATUS_FAILURE);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java
index 3581a59..ddcaf9b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDetailsView.java
@@ -28,7 +28,6 @@ import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.form.fields.TextAreaItem;
-import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.criteria.EventCriteria;
import org.rhq.core.domain.event.composite.EventComposite;
@@ -38,23 +37,25 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
* @author Joseph Marques
*/
-public class EventCompositeDetailsView extends VLayout implements BookmarkableView {
+public class EventCompositeDetailsView extends LocatableVLayout implements BookmarkableView {
private int eventId;
private ViewId viewId;
- private static EventCompositeDetailsView INSTANCE = new EventCompositeDetailsView();
+ private static EventCompositeDetailsView INSTANCE = new EventCompositeDetailsView("eventCompositeDetailsView");
public static EventCompositeDetailsView getInstance() {
return INSTANCE;
}
- private EventCompositeDetailsView() {
+ private EventCompositeDetailsView(String id) {
// access through the static singleton only
+ super(id);
}
private void show(int eventId) {
@@ -70,7 +71,7 @@ public class EventCompositeDetailsView extends VLayout implements BookmarkableVi
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failure loading event details", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_inventory_eventDetails_loadFailed(), caught);
}
});
}
@@ -81,7 +82,7 @@ public class EventCompositeDetailsView extends VLayout implements BookmarkableVi
}
if (this.viewId != null) {
- viewId.getBreadcrumbs().get(0).setDisplayName("Details");
+ viewId.getBreadcrumbs().get(0).setDisplayName(MSG.view_inventory_eventHistory_details());
CoreGUI.refreshBreadCrumbTrail();
}
@@ -89,19 +90,19 @@ public class EventCompositeDetailsView extends VLayout implements BookmarkableVi
form.setWidth100();
form.setHeight100();
- StaticTextItem id = new StaticTextItem("id", "Id");
+ StaticTextItem id = new StaticTextItem("id", MSG.common_title_id());
id.setValue(composite.getEventId());
- StaticTextItem severity = new StaticTextItem("severity", "Severity");
+ StaticTextItem severity = new StaticTextItem("severity", MSG.view_inventory_eventHistory_severity());
severity.setValue(composite.getSeverity().name());
- StaticTextItem source = new StaticTextItem("source", "Source");
+ StaticTextItem source = new StaticTextItem("source", MSG.view_inventory_eventHistory_sourceLocation());
source.setValue(composite.getSourceLocation());
- StaticTextItem timestamp = new StaticTextItem("timestamp", "Timestamp");
+ StaticTextItem timestamp = new StaticTextItem("timestamp", MSG.view_inventory_eventHistory_timestamp());
timestamp.setValue(composite.getTimestamp());
- TextAreaItem detail = new TextAreaItem("details", "Details");
+ TextAreaItem detail = new TextAreaItem("details", MSG.view_inventory_eventHistory_details());
detail.setValue(composite.getEventDetail());
detail.setTitleOrientation(TitleOrientation.TOP);
detail.setColSpan(2);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
index 8994686..8f2e10c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
@@ -57,14 +57,14 @@ public class EventCompositeHistoryView extends TableSection {
private boolean hasWriteAccess;
public static EventCompositeHistoryView get(String locatorId, ResourceGroupComposite composite) {
- String tableTitle = "Group Event History";
+ String tableTitle = MSG.view_inventory_eventHistory_groupEventHistory();
EntityContext context = EntityContext.forGroup(composite.getResourceGroup().getId());
boolean hasWriteAccess = composite.getResourcePermission().isEvent();
return new EventCompositeHistoryView(locatorId, tableTitle, context, hasWriteAccess);
}
public static EventCompositeHistoryView get(String locatorId, ResourceComposite composite) {
- String tableTitle = "Resource Event History";
+ String tableTitle = MSG.view_inventory_eventHistory_resourceEventHistory();
EntityContext context = EntityContext.forResource(composite.getResource().getId());
boolean hasWriteAccess = composite.getResourcePermission().isEvent();
return new EventCompositeHistoryView(locatorId, tableTitle, context, hasWriteAccess);
@@ -87,24 +87,25 @@ public class EventCompositeHistoryView extends TableSection {
@Override
protected void configureTableFilters() {
- final TextItem sourceFilter = new TextItem("source", "Source Filter");
- final TextItem detailsFilter = new TextItem("details", "Details Filter");
- final EnumSelectItem severityFilter = new EnumSelectItem("severities", "Severity Filter", EventSeverity.class);
+ final TextItem sourceFilter = new TextItem("source", MSG.view_inventory_eventHistory_sourceFilter());
+ final TextItem detailsFilter = new TextItem("details", MSG.view_inventory_eventHistory_detailsFilter());
+ final EnumSelectItem severityFilter = new EnumSelectItem("severities", MSG
+ .view_inventory_eventHistory_severityFilter(), EventSeverity.class);
setFilterFormItems(sourceFilter, detailsFilter, severityFilter);
}
@Override
protected void configureTable() {
- ListGridField timestampField = new ListGridField("timestamp", "Timestamp", 125);
- ListGridField severityField = new ListGridField("severity", "Severity", 75);
+ ListGridField timestampField = new ListGridField("timestamp", MSG.view_inventory_eventHistory_timestamp(), 125);
+ ListGridField severityField = new ListGridField("severity", MSG.view_inventory_eventHistory_severity(), 75);
severityField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
return Canvas.imgHTML("subsystems/event/" + o + "_16.png", 16, 16) + o;
}
});
- ListGridField detailsField = new ListGridField("details-highlight", "Details");
- ListGridField sourceField = new ListGridField("source", "Source Location", 275);
+ ListGridField detailsField = new ListGridField("details-highlight", MSG.view_inventory_eventHistory_details());
+ ListGridField sourceField = new ListGridField("source", MSG.view_inventory_eventHistory_sourceLocation(), 275);
sourceField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
String sourceLocation = (String) o;
@@ -124,15 +125,16 @@ public class EventCompositeHistoryView extends TableSection {
private void setupTableInteractions() {
TableActionEnablement singleTargetEnablement = hasWriteAccess ? TableActionEnablement.ANY
: TableActionEnablement.NEVER;
- addTableAction("deleteButton", "Delete", "Are You Sure?", new AbstractTableAction(singleTargetEnablement) {
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- deleteButtonPressed(selection);
- }
- });
+ addTableAction("deleteButton", MSG.common_button_delete(), MSG.common_msg_areYouSure(),
+ new AbstractTableAction(singleTargetEnablement) {
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ deleteButtonPressed(selection);
+ }
+ });
TableActionEnablement multipleTargetEnablement = hasWriteAccess ? TableActionEnablement.ALWAYS
: TableActionEnablement.NEVER;
- addTableAction("purgeAllButton", "Purge All", "Are You Sure?",
+ addTableAction("purgeAllButton", MSG.common_button_purgeAll(), MSG.common_msg_areYouSure(),
new AbstractTableAction(multipleTargetEnablement) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
purgeButtonPressed();
@@ -149,15 +151,15 @@ public class EventCompositeHistoryView extends TableSection {
@Override
public void onSuccess(Integer result) {
CoreGUI.getMessageCenter().notify(
- new Message("Successfully deleted " + result + " events for " + context.toShortString(),
- Severity.Info));
+ new Message(MSG.view_inventory_eventHistory_deleteSuccessful(result.toString(), context
+ .toShortString()), Severity.Info));
refresh();
}
@Override
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(
- "Failed to delete selected events for " + context.toShortString(), caught);
+ MSG.view_inventory_eventHistory_deleteFailed(context.toShortString()), caught);
}
});
}
@@ -167,14 +169,15 @@ public class EventCompositeHistoryView extends TableSection {
@Override
public void onSuccess(Integer result) {
CoreGUI.getMessageCenter().notify(
- new Message("Successfully purged " + result + " events for " + context.toShortString(),
- Severity.Info));
+ new Message(MSG.view_inventory_eventHistory_purgeSuccessful(result.toString(), context
+ .toShortString()), Severity.Info));
refresh();
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to purge events for " + context.toShortString(), caught);
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_inventory_eventHistory_purgeFailed(context.toShortString()), caught);
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
index 7fe6d2d..127cd83 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
@@ -73,7 +73,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceField idDataField = new DataSourceIntegerField("id", "ID", 50);
+ DataSourceField idDataField = new DataSourceIntegerField("id", MSG.common_title_id(), 50);
idDataField.setPrimaryKey(true);
idDataField.setCanEdit(false);
fields.add(idDataField);
@@ -105,7 +105,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
groupService.findResourceGroupCompositesByCriteria(criteria,
new AsyncCallback<PageList<ResourceGroupComposite>>() {
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to fetch group composite data", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_inventory_groups_loadFailed(), caught);
response.setStatus(RPCResponse.STATUS_FAILURE);
processResponse(request.getRequestId(), response);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java
index 88ecdf6..743db43 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java
@@ -25,17 +25,19 @@ package org.rhq.enterprise.gui.coregui.client.inventory.groups;
import com.smartgwt.client.widgets.grid.ListGridField;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+
public enum ResourceGroupDataSourceField {
- NAME("name", "Name"),
+ NAME("name", CoreGUI.getMessages().common_title_name()),
- DESCRIPTION("description", "Description"),
+ DESCRIPTION("description", CoreGUI.getMessages().common_title_description()),
- TYPE("typeName", "Type"),
+ TYPE("typeName", CoreGUI.getMessages().common_title_type()),
- PLUGIN("pluginName", "Plugin"),
+ PLUGIN("pluginName", CoreGUI.getMessages().common_title_plugin()),
- CATEGORY("groupCategory", "Category");
+ CATEGORY("groupCategory", CoreGUI.getMessages().common_title_category());
/**
* Corresponds to a property name of Resource
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
index 3b4ddbe..7780095 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
@@ -51,7 +51,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
*/
public class ResourceGroupListView extends Table {
- private static final String DEFAULT_TITLE = "Resource Groups";
+ private static final String DEFAULT_TITLE = MSG.view_inventory_groups_resourceGroups();
public ResourceGroupListView(String locatorId) {
this(locatorId, DEFAULT_TITLE);
@@ -88,18 +88,20 @@ public class ResourceGroupListView extends Table {
ListGridField pluginNameField = new ListGridField(PLUGIN.propertyName(), PLUGIN.title(), 100);
ListGridField categoryField = new ListGridField(CATEGORY.propertyName(), CATEGORY.title(), 100);
- ListGridField availabilityChildrenField = new ListGridField("availabilityChildren", "Children", 100);
+ ListGridField availabilityChildrenField = new ListGridField("availabilityChildren", MSG
+ .view_inventory_groups_children(), 100);
availabilityChildrenField.setWrap(false);
availabilityChildrenField.setAlign(Alignment.CENTER);
- ListGridField availabilityDescendantsField = new ListGridField("availabilityDescendents", "Descendants", 100);
+ ListGridField availabilityDescendantsField = new ListGridField("availabilityDescendents", MSG
+ .view_inventory_groups_descendants(), 100);
availabilityDescendantsField.setWrap(false);
availabilityDescendantsField.setAlign(Alignment.CENTER);
setListGridFields(nameField, descriptionField, typeNameField, pluginNameField, categoryField,
availabilityChildrenField, availabilityDescendantsField);
- addTableAction(extendLocatorId("Delete"), "Delete", "Delete the selected resource groups?",
+ addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), MSG.common_msg_areYouSure(),
new AbstractTableAction(TableActionEnablement.ANY) {
public void executeAction(ListGridRecord[] selections, Object actionValue) {
int[] groupIds = new int[selections.length];
@@ -111,12 +113,12 @@ public class ResourceGroupListView extends Table {
resourceGroupManager.deleteResourceGroups(groupIds, new AsyncCallback<Void>() {
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to delete selected resource groups", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_inventory_groups_deleteFailed(), caught);
}
public void onSuccess(Void result) {
CoreGUI.getMessageCenter().notify(
- new Message("Deleted selected resource groups", Severity.Info));
+ new Message(MSG.view_inventory_groups_deleteSuccessful(), Severity.Info));
ResourceGroupListView.this.refresh();
}
@@ -124,7 +126,7 @@ public class ResourceGroupListView extends Table {
}
});
- addTableAction(extendLocatorId("New"), "New", new AbstractTableAction() {
+ addTableAction(extendLocatorId("New"), MSG.common_button_new(), new AbstractTableAction() {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
new GroupCreateWizard(ResourceGroupListView.this).startWizard();
}
@@ -142,7 +144,7 @@ public class ResourceGroupListView extends Table {
public static ResourceGroupListView getGroupsOf(String locatorId, int explicitResourceId) {
return new ResourceGroupListView(locatorId, new Criteria("explicitResourceId", String
- .valueOf(explicitResourceId)), "Resource Groups");
+ .valueOf(explicitResourceId)), MSG.view_inventory_groups_resourceGroups());
}
}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
index cc2be01..d0ba901 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java
@@ -72,7 +72,7 @@ public class ResourceGroupsDataSource extends RPCDataSource<ResourceGroup> {
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceField idDataField = new DataSourceIntegerField("id", "ID", 20);
+ DataSourceField idDataField = new DataSourceIntegerField("id", MSG.common_title_id(), 20);
idDataField.setPrimaryKey(true);
fields.add(idDataField);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java
index 0ec46f3..0b8c15e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java
@@ -39,6 +39,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+import org.rhq.enterprise.gui.coregui.client.util.message.Message;
/**
* @author Greg Hinkle
@@ -67,28 +68,28 @@ public class GroupDefinitionDataSource extends RPCDataSource<GroupDefinition> {
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceField idField = new DataSourceIntegerField("id", "ID");
+ DataSourceField idField = new DataSourceIntegerField("id", MSG.common_title_id());
idField.setPrimaryKey(true);
idField.setCanEdit(false);
fields.add(idField);
- DataSourceTextField nameField = new DataSourceTextField("name", "Name");
+ DataSourceTextField nameField = new DataSourceTextField("name", MSG.common_title_name());
nameField.setRequired(true);
fields.add(nameField);
- DataSourceTextField descriptionField = new DataSourceTextField("description", "Description");
+ DataSourceTextField descriptionField = new DataSourceTextField("description", MSG.common_title_description());
fields.add(descriptionField);
- DataSourceTextField expressionField = new DataSourceTextField("expression", "Expression Set");
+ DataSourceTextField expressionField = new DataSourceTextField("expression", MSG.view_dynagroup_expressionSet());
expressionField.setRequired(true);
fields.add(expressionField);
- DataSourceIntegerField lastCalculationTimeIntervalField = new DataSourceIntegerField("lastCalculationTime",
- "Recalculation Interval");
+ DataSourceIntegerField lastCalculationTimeIntervalField = new DataSourceIntegerField("lastCalculationTime", MSG
+ .view_dynagroup_recalculationInterval());
fields.add(lastCalculationTimeIntervalField);
- DataSourceIntegerField nextCalculationTimeField = new DataSourceIntegerField("nextCalculationTime",
- "Next Calculation Time");
+ DataSourceIntegerField nextCalculationTimeField = new DataSourceIntegerField("nextCalculationTime", MSG
+ .view_dynagroup_nextCalculationTime());
fields.add(nextCalculationTimeField);
return fields;
@@ -101,7 +102,7 @@ public class GroupDefinitionDataSource extends RPCDataSource<GroupDefinition> {
groupService.findGroupDefinitionsByCriteria(criteria, new AsyncCallback<PageList<GroupDefinition>>() {
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to load group definitions", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_dynagroup_definitionLoadFailure(), caught);
response.setStatus(RPCResponse.STATUS_FAILURE);
processResponse(request.getRequestId(), response);
}
@@ -123,7 +124,7 @@ public class GroupDefinitionDataSource extends RPCDataSource<GroupDefinition> {
@Override
public void onFailure(Throwable caught) {
Map<String, String> errors = new HashMap<String, String>();
- errors.put("name", "A group definition with this name already exists.");
+ errors.put("name", MSG.view_dynagroup_definitionAlreadyExists());
response.setErrors(errors);
response.setStatus(RPCResponse.STATUS_VALIDATION_ERROR);
processResponse(request.getRequestId(), response);
@@ -131,7 +132,7 @@ public class GroupDefinitionDataSource extends RPCDataSource<GroupDefinition> {
@Override
public void onSuccess(GroupDefinition result) {
- CoreGUI.getErrorHandler().handleError("Successfully created group definition '" + name + "'");
+ CoreGUI.getMessageCenter().notify(new Message(MSG.view_dynagroup_definitionCreated(name)));
response.setData(new Record[] { copyValues(result) });
processResponse(request.getRequestId(), response);
}
@@ -140,7 +141,7 @@ public class GroupDefinitionDataSource extends RPCDataSource<GroupDefinition> {
@Override
protected void executeUpdate(Record editedRecord, Record oldRecord, final DSRequest request,
- final DSResponse response) {
+ final DSResponse response) {
final GroupDefinition updatedGroupDefinition = copyValues(editedRecord);
final String name = updatedGroupDefinition.getName();
@@ -148,12 +149,12 @@ public class GroupDefinitionDataSource extends RPCDataSource<GroupDefinition> {
new AsyncCallback<Void>() {
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failure saving group definition '" + name + "'", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_dynagroup_saveFailure(name), caught);
}
@Override
public void onSuccess(Void result) {
- CoreGUI.getErrorHandler().handleError("Successfully saved group definition '" + name + "'");
+ CoreGUI.getMessageCenter().notify(new Message(MSG.view_dynagroup_saveSuccessful(name)));
response.setData(new Record[] { copyValues(updatedGroupDefinition) });
processResponse(request.getRequestId(), response);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java
index aee745e..b734425 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java
@@ -45,7 +45,7 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
* @author Joseph Marques
*/
public class GroupDefinitionListView extends TableSection {
- private static final String TITLE = "Dynagroup Definitions";
+ private static final String TITLE = MSG.view_dynagroup_definitions();
public GroupDefinitionListView(String locatorId, String headerIcon) {
super(locatorId, TITLE);
@@ -58,33 +58,35 @@ public class GroupDefinitionListView extends TableSection {
@Override
protected void configureTable() {
- ListGridField idField = new ListGridField("id", "ID", 50);
- ListGridField nameField = new ListGridField("name", "Name", 150);
- ListGridField descriptionField = new ListGridField("description", "Description");
- ListGridField expressionField = new ListGridField("expression", "Expression Set", 250);
+ ListGridField idField = new ListGridField("id", MSG.common_title_id(), 50);
+ ListGridField nameField = new ListGridField("name", MSG.common_title_name(), 150);
+ ListGridField descriptionField = new ListGridField("description", MSG.common_title_description());
+ ListGridField expressionField = new ListGridField("expression", MSG.view_dynagroup_expressionSet(), 250);
expressionField.setCellFormatter(new CellFormatter() {
public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
return value.toString().replaceAll("\\n", "<br/>");
}
});
- ListGridField lastCalculationTimeField = new ListGridField("lastCalculationTime", "Last Calculation Time", 175);
+ ListGridField lastCalculationTimeField = new ListGridField("lastCalculationTime", MSG
+ .view_dynagroup_lastCalculationTime(), 175);
//lastCalculationTimeField.setAlign(Alignment.CENTER);
lastCalculationTimeField.setCellFormatter(new TimestampCellFormatter() {
public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
if (value == null) {
- return "Never";
+ return MSG.common_val_never();
}
return super.format(value, record, rowNum, colNum);
}
});
- ListGridField nextCalculationTimeField = new ListGridField("nextCalculationTime", "Next Calculation Time", 175);
+ ListGridField nextCalculationTimeField = new ListGridField("nextCalculationTime", MSG
+ .view_dynagroup_nextCalculationTime(), 175);
//nextCalculationTimeField.setAlign(Alignment.CENTER);
nextCalculationTimeField.setCellFormatter(new TimestampCellFormatter() {
public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
if (value == null || "0".equals(value.toString())) {
- return "N/A";
+ return MSG.common_val_na();
}
return super.format(value, record, rowNum, colNum);
}
@@ -93,13 +95,13 @@ public class GroupDefinitionListView extends TableSection {
getListGrid().setFields(idField, nameField, descriptionField, expressionField, lastCalculationTimeField,
nextCalculationTimeField);
- addTableAction(extendLocatorId("New"), "New", null, new AbstractTableAction() {
+ addTableAction(extendLocatorId("New"), MSG.common_button_new(), null, new AbstractTableAction() {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
newDetails();
}
});
- addTableAction(extendLocatorId("Recalculate"), "Recalculate", null, new AbstractTableAction(
+ addTableAction(extendLocatorId("Recalculate"), MSG.view_dynagroup_recalculate(), null, new AbstractTableAction(
TableActionEnablement.ANY) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
final int[] groupDefinitionIds = TableUtility.getIds(selection);
@@ -107,15 +109,13 @@ public class GroupDefinitionListView extends TableSection {
resourceGroupManager.recalculateGroupDefinitions(groupDefinitionIds, new AsyncCallback<Void>() {
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to recalculate selected group definitions",
- caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_dynagroup_recalcFailureSelection(), caught);
}
public void onSuccess(Void result) {
CoreGUI.getMessageCenter().notify(
- new Message(
- "Successfully recalculated " + groupDefinitionIds.length + " group definitions",
- Severity.Info));
+ new Message(MSG.view_dynagroup_recalcSuccessfulSelection(String
+ .valueOf(groupDefinitionIds.length)), Severity.Info));
GroupDefinitionListView.this.refresh();
}
@@ -123,7 +123,8 @@ public class GroupDefinitionListView extends TableSection {
}
});
- addTableAction(extendLocatorId("Delete"), "Delete", null, new AbstractTableAction(TableActionEnablement.ANY) {
+ addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), null, new AbstractTableAction(
+ TableActionEnablement.ANY) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
final int[] groupDefinitionIds = TableUtility.getIds(selection);
ResourceGroupGWTServiceAsync groupManager = GWTServiceLookup.getResourceGroupService();
@@ -131,14 +132,14 @@ public class GroupDefinitionListView extends TableSection {
@Override
public void onSuccess(Void result) {
CoreGUI.getMessageCenter().notify(
- new Message("Successfully deleted " + groupDefinitionIds.length + " group definitions",
- Severity.Info));
+ new Message(MSG.view_dynagroup_deleteSuccessfulSelection(String
+ .valueOf(groupDefinitionIds.length)), Severity.Info));
GroupDefinitionListView.this.refresh();
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to delete selected group definitions", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_dynagroup_deleteFailureSelection(), caught);
}
});
}
@@ -157,13 +158,12 @@ public class GroupDefinitionListView extends TableSection {
GWTServiceLookup.getAuthorizationService().getExplicitGlobalPermissions(new AsyncCallback<Set<Permission>>() {
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(
- "Could not determine whether user had MANAGE_INVENTORY permission", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_dynagroup_permUnknown(), caught);
handleAuthorizationFailure();
}
private void handleAuthorizationFailure() {
- CoreGUI.getErrorHandler().handleError("You do not have permission to view group definitions");
+ CoreGUI.getErrorHandler().handleError(MSG.view_dynagroup_permDenied());
History.back();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
index ef55f63..3a9fdcf 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
@@ -113,7 +113,7 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm
groupDefinitionId);
// button setup
- IButton saveButton = new LocatableIButton(this.extendLocatorId("Save"), "Save");
+ IButton saveButton = new LocatableIButton(this.extendLocatorId("Save"), MSG.common_button_save());
//saveButton.addClickHandler(new SaveOrUpdateClickHandler(form, operationType, dynaGroupChildrenView));
saveButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
@@ -125,7 +125,7 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm
Record[] results = response.getData();
if (results.length != 1) {
CoreGUI.getErrorHandler().handleError(
- "Error: " + results.length + " created instead of one");
+ MSG.view_dynagroup_singleSaveFailure(String.valueOf(results.length)));
} else {
Record newRecord = results[0];
GroupDefinition newGroupDefinition = GroupDefinitionDataSource.getInstance()
@@ -141,7 +141,8 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm
}
});
- IButton recalculateButton = new LocatableIButton(this.extendLocatorId("Recalculate"), "Save & Recalculate");
+ IButton recalculateButton = new LocatableIButton(this.extendLocatorId("Recalculate"), MSG
+ .view_dynagroup_saveAndRecalculate());
recalculateButton.setWidth(150);
recalculateButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
@@ -153,16 +154,15 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm
new int[] { groupDefinitionId }, new AsyncCallback<Void>() {
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(
- "Failed to recalculate this group definition", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_dynagroup_recalcFailure(),
+ caught);
}
@Override
public void onSuccess(Void result) {
dynaGroupChildrenView.refresh();
CoreGUI.getMessageCenter().notify(
- new Message("Successfully recalculated this group definition",
- Severity.Info));
+ new Message(MSG.view_dynagroup_recalcSuccessful(), Severity.Info));
}
});
}
@@ -171,7 +171,7 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm
}
});
- IButton resetButton = new LocatableIButton(this.extendLocatorId("Reset"), "Reset");
+ IButton resetButton = new LocatableIButton(this.extendLocatorId("Reset"), MSG.common_button_reset());
resetButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
form.reset();
@@ -194,8 +194,8 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm
class DynaGroupChildrenView extends Table {
public DynaGroupChildrenView(String locatorId, int groupDefinitionId) {
- super(locatorId, "DynaGroup Children", new Criteria("groupDefinitionId", String.valueOf(groupDefinition
- .getId())));
+ super(locatorId, MSG.view_dynagroup_children(), new Criteria("groupDefinitionId", String
+ .valueOf(groupDefinition.getId())));
setDataSource(ResourceGroupsDataSource.getInstance());
setMinHeight(250);
}
@@ -209,9 +209,9 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm
recalculationInterval.show();
if (groupDefinitionId == 0) {
- viewId.getBreadcrumbs().get(0).setDisplayName("New Group Definition");
+ viewId.getBreadcrumbs().get(0).setDisplayName(MSG.view_dynagroup_newGroupDefinition());
} else {
- viewId.getBreadcrumbs().get(0).setDisplayName("Editing '" + name.getValue().toString() + "'");
+ viewId.getBreadcrumbs().get(0).setDisplayName(MSG.view_dynagroup_editing(name.getValue().toString()));
}
CoreGUI.refreshBreadCrumbTrail();
@@ -219,26 +219,26 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm
}
private void buildForm() {
- id = new TextItem("id", "ID");
+ id = new TextItem("id", MSG.common_title_id());
id.setVisible(false);
- name = new TextItem("name", "Name");
+ name = new TextItem("name", MSG.common_title_name());
name.setWidth(400);
name.setDefaultValue("");
- description = new TextAreaItem("description", "Description");
+ description = new TextAreaItem("description", MSG.common_title_description());
description.setWidth(400);
description.setHeight(50);
description.setDefaultValue("");
- recursive = new CheckboxItem("recursive", "Recursive");
+ recursive = new CheckboxItem("recursive", MSG.view_dynagroup_recursive());
- expression = new TextAreaItem("expression", "Expression");
+ expression = new TextAreaItem("expression", MSG.view_dynagroup_expression());
expression.setWidth(400);
expression.setHeight(150);
expression.setDefaultValue("");
- recalculationInterval = new SpinnerItem("recalculationInterval", "Recalculation Interval");
+ recalculationInterval = new SpinnerItem("recalculationInterval", MSG.view_dynagroup_recalculationInterval());
recalculationInterval.setWrapTitle(false);
recalculationInterval.setMin(0);
recalculationInterval.setDefaultValue(0);
@@ -313,14 +313,14 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm
new AsyncCallback<PageList<GroupDefinition>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(
- "Failure loading group definition[id=" + groupDefinitionId + "]", caught);
+ MSG.view_dynagroup_loadDefinitionFailure(String.valueOf(groupDefinitionId)), caught);
History.back();
}
public void onSuccess(PageList<GroupDefinition> result) {
if (result.size() == 0) {
CoreGUI.getErrorHandler().handleError(
- "No group definition exists with id=" + groupDefinitionId);
+ MSG.view_dynagroup_loadDefinitionMissing(String.valueOf(groupDefinitionId)));
History.back();
} else {
GroupDefinition existingGroupDefinition = result.get(0);
@@ -337,13 +337,12 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm
GWTServiceLookup.getAuthorizationService().getExplicitGlobalPermissions(new AsyncCallback<Set<Permission>>() {
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(
- "Could not determine whether user had MANAGE_INVENTORY permission", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_dynagroup_permUnknown(), caught);
handleAuthorizationFailure();
}
private void handleAuthorizationFailure() {
- CoreGUI.getErrorHandler().handleError("You do not have permission to view group definitions");
+ CoreGUI.getErrorHandler().handleError(MSG.view_dynagroup_permDenied());
History.back();
}
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 0134b6a..8fe6dcf 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
@@ -13,20 +13,30 @@ common_buildInfo_gwtVersion = ${gwt.version}~
# Button Labels
#--------------
+common_button_advanced = Advanced...~
common_button_apply = Apply~
common_button_cancel = Cancel~
common_button_close = Close~
common_button_delete = Delete~
common_button_disable = Disable~
common_button_enable = Enable~
-common_button_ok = OK~
common_button_new = New~
-common_button_save = Save~
+common_button_ok = OK~
+common_button_purgeAll=Purge All~
+common_button_refresh = "Refresh"~
common_button_reset = Reset~
+common_button_save = Save~
+
# Common Labels
+common_label_all = ALL~
+common_label_all_resources = all resources~
+common_label_day=day~
common_label_days=days~
+common_label_hour=hour~
common_label_hours=hours~
+common_label_item=item~
+common_label_items=items~
common_label_milliseconds=milliseconds~
common_label_minutes=minutes~
common_label_seconds=seconds~
@@ -34,16 +44,21 @@ common_label_unlimited = unlimited~
# Common Titles
#--------------
+common_title_availability = Availability~
+common_title_category = Category~
common_title_compatibleGroups = Compatible Groups~
common_title_description=Description~
common_title_enabled=Enabled?~
+common_title_end = End~
common_title_generalProp = General Properties~
common_title_id = Id~
common_title_inventory = Inventory~
common_title_metric = Metric~
common_title_mixedGroups = Mixed Groups~
common_title_name = Name~
+common_title_plugin = Plugin~
common_title_resource = Resource~
+common_title_start = Start~
common_title_type = Type~
common_title_value = Value~
common_title_version = Version~
@@ -58,7 +73,11 @@ common_msg_loading = Loading...~
# Common Values
#--------------
common_val_no = No~
+common_val_no_lower = no~
common_val_yes = Yes~
+common_val_yes_lower = yes~
+common_val_never=Never~
+common_val_na=N/A~
#=================== Widgets =====================
@@ -123,7 +142,7 @@ view_adminUsersDetails_dataTypeName = user~
#=================== Components =====================
view_configCompare_comparingConfigs = Comparing Configurations~
-view_configCompare_configCompare = ~Configuration Comparison~
+view_configCompare_configCompare = Configuration Comparison~
view_configEdit_addItem = Add Item to List~
view_configEdit_confirm_1 = Are you sure you want to delete the selected properties from the set?~
@@ -155,6 +174,23 @@ view_groupConfigEdit_unset = Unset~
view_groupConfigEdit_valsDiff = member values differ~
view_groupConfigEdit_valsDiffForProp = Member Values for Property [{0}]~
+view_measureRange_day = 1 Day~
+view_measureRange_days = {0,number,integer} Days~
+view_measureRange_hour = 1 Hour~
+view_measureRange_hours = {0,number,integer} Hours~
+view_measureRange_last = Last~
+view_measureRange_minutes = {0,number,integer} Minutes~
+view_measureRange_range = Range~
+view_measureRange_simple = Simple...~
+
+view_selector_assigned = Assigned {0}~
+view_selector_available = Available {0}~
+
+view_subTab_error_disabled = Cannot select disabled subTab [{0}].~
+
+view_table_totalRows = Total Rows: {0} Selected: {1}~
+
+
#=================== Dashboard =====================
view_portlet_autodiscovery_config_platform_selection = Number of platforms to display~
view_portlet_autodiscovery_help_msg = This portlet offers the ability to import newly discovered resources into the inventory for monitoring and management or to ignore them from further action.~
@@ -165,8 +201,11 @@ view_portlet_graph_help_msg = This Portlet supports the graphing of a resource m
view_portlet_graph_help_title = Graph Portlet~
view_portlet_graph_help_unconfigured=This graph is unconfigured, click the settings button to configure.~
view_portlet_graph_title = Resource Graph~
+view_portlet_platform_help_msg = This portlet displays information about platforms in inventory.~
+view_portlet_platform_platform_error_1 = Failed to load platform metrics~
view_portlet_platform_title = Platforms Summary~
-view_portlet_platform_help_msg=This portlet displays information about platforms in inventory.~
+view_portlet_platform_type_error_1 = Could not load type data~
+
#=================== Inventory =====================
view_inventory_sectionHelp = From this section, newly discovered Resources, inventoried Resources, and Groups can be viewed and managed.~
@@ -178,6 +217,54 @@ view_inventory_downServers=Down Servers~
view_inventory_allGroups=All Groups~
view_metric_traits=Traits~
view_metric_viewTraitHistory=Value History for Trait [{0}]~
+view_inventory_eventHistory_groupEventHistory=Group Event History~
+view_inventory_eventHistory_resourceEventHistory=Resource Event History~
+view_inventory_eventHistory_sourceFilter=Source Filter~
+view_inventory_eventHistory_detailsFilter=Details Filter~
+view_inventory_eventHistory_severityFilter=Severity Filter~
+view_inventory_eventHistory_timestamp=Timestamp~
+view_inventory_eventHistory_severity=Severity~
+view_inventory_eventHistory_details=Details~
+view_inventory_eventHistory_sourceLocation=Source Location~
+view_inventory_eventHistory_deleteSuccessful=You have successfully deleted [{0}] events for [{1}]~
+view_inventory_eventHistory_deleteFailed=Failed to deleted selected events for [{0}]~
+view_inventory_eventHistory_purgeSuccessful=You have successfully purged [{0}] events for [{1}]~
+view_inventory_eventHistory_purgeFailed=Failed to purge events for [{0}]~
+view_inventory_eventDetails_loadFailed=An error occurred loading the event details~
+view_inventory_groups_resourceGroups=Resource Groups~
+view_inventory_groups_children=Children~
+view_inventory_groups_descendants=Descendants~
+view_inventory_groups_deleteSuccessful=You have successfully deleted the selected resource groups~
+view_inventory_groups_deleteFailed=Failed to delete the selected resource groups~
+view_inventory_groups_loadFailed=Failed to load group composite data~
+view_dynagroup_expressionSet=Expression Set~
+view_dynagroup_recalculationInterval=Recalculation Interval~
+view_dynagroup_lastCalculationTime=Last Calculation Time~
+view_dynagroup_nextCalculationTime=Next Calculation Time~
+view_dynagroup_definitionCreated=You have successfully created a group definition named [{0}]~
+view_dynagroup_definitionLoadFailure=Failed to load group definitions~
+view_dynagroup_definitionAlreadyExists=A group definition already exists with this name~
+view_dynagroup_saveSuccessful=You have successfully saved the group definition named [{0}]~
+view_dynagroup_saveFailure=Failed to save the group definition named [{0}]~
+view_dynagroup_singleSaveFailure=An error occurred - there should have been one created, but instead there were [{0}] created~
+view_dynagroup_saveAndRecalculate=Save & Recalculate~
+view_dynagroup_recalculate=Recalculate~
+view_dynagroup_recalcSuccessful=You have successfully recalculated this group definition~
+view_dynagroup_recalcFailure=Failed to recalculated this group definition~
+view_dynagroup_recalcSuccessfulSelection=You have successfully recalculated [{0}] group definitions~
+view_dynagroup_recalcFailureSelection=Failed to recalculated the selected group definitions~
+view_dynagroup_deleteSuccessfulSelection=You have successfully deleted [{0}] group definitions~
+view_dynagroup_deleteFailureSelection=Failed to delete the selected group definitions~
+view_dynagroup_children=DynaGroup Children~
+view_dynagroup_newGroupDefinition=New Group Definition~
+view_dynagroup_editing=Editing [{0}]~
+view_dynagroup_expression=Expression~
+view_dynagroup_recursive=Recursive~
+view_dynagroup_loadDefinitionFailure=Failed to load group definition [{0}]~
+view_dynagroup_loadDefinitionMissing=There is no group definition with the ID of [{0}]~
+view_dynagroup_permUnknown=Could not determine if you have the proper permissions - access is denied~
+view_dynagroup_permDenied=You do not have permission to view group definitions~
+view_dynagroup_definitions=DynaGroup Definitions~
#==================== Reports ======================