modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java | 9 ++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 9 ++++----- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 7 ++++--- 3 files changed, 12 insertions(+), 13 deletions(-)
New commits: commit 8164146dee50593b356effc183f739309eed3718 Author: Joseph Marques joseph@redhat.com Date: Wed Nov 17 14:54:12 2010 -0500
do not parameterize verbs or terminology, keep the translations simple
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java index 9236ec3..d3e4922 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java @@ -53,8 +53,8 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
super.configureTable();
- addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), MSG.common_msg_actionConfirm("delete", - "resources"), new AbstractTableAction(TableActionEnablement.ANY) { + addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), MSG + .view_inventory_resources_deleteConfirm(), new AbstractTableAction(TableActionEnablement.ANY) {
// only enabled if all selected are a deletable type and if the user has delete permission // on the resources. @@ -84,13 +84,12 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
resourceManager.deleteResources(resourceIds, new AsyncCallback<List<DeleteResourceHistory>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.common_msg_actionFailure("delete", "resources"), - caught); + CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_deleteFailed(), caught); }
public void onSuccess(List<DeleteResourceHistory> result) { CoreGUI.getMessageCenter().notify( - new Message(MSG.common_msg_actionSuccess("deleted", "resources"), Severity.Info)); + new Message(MSG.view_inventory_resources_deleteSuccessful(), Severity.Info));
ResourceCompositeSearchView.this.refresh(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java index d13d949..078461f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java @@ -142,21 +142,20 @@ public class ResourceSearchView extends Table { setListGridFields(iconField, nameField, descriptionField, typeNameField, pluginNameField, categoryField, availabilityField);
- addTableAction(extendLocatorId("Uninventory"), MSG.common_button_uninventory(), MSG.common_msg_actionConfirm( - "uninventory", "resources"), new AbstractTableAction(TableActionEnablement.ANY) { + addTableAction(extendLocatorId("Uninventory"), MSG.common_button_uninventory(), MSG + .view_inventory_resources_deleteConfirm(), new AbstractTableAction(TableActionEnablement.ANY) { public void executeAction(ListGridRecord[] selection, Object actionValue) { int[] resourceIds = TableUtility.getIds(selection); ResourceGWTServiceAsync resourceManager = GWTServiceLookup.getResourceService();
resourceManager.uninventoryResources(resourceIds, new AsyncCallback<List<Integer>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.common_msg_actionFailure("uninventory", "resource"), - caught); + CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_deleteFailed(), caught); }
public void onSuccess(List<Integer> result) { CoreGUI.getMessageCenter().notify( - new Message(MSG.common_msg_actionSuccess("uninventoried", "resource"), Severity.Info)); + new Message(MSG.view_inventory_resources_deleteSuccessful(), Severity.Info));
ResourceSearchView.this.refresh(); } 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 34b2f47..e8bf31f 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 @@ -92,9 +92,6 @@ common_title_version = Version~
# Common Messages #-------------- -common_msg_actionConfirm = Are you sure you want to {0} the # selected {1}?~ -common_msg_actionFailure = Failed to {0} the selected {1}?~ -common_msg_actionSuccess = Successfully {0} the selected {1}?~ common_msg_areYouSure = Are You Sure?~ common_msg_deleteConfirm = Are you sure you want to delete the # selected {0}?~ common_msg_loading = Loading...~ @@ -435,6 +432,10 @@ 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_inventory_resources_deleteConfirm=Are you sure you want to delete the selected resources?~ +view_inventory_resources_deleteSuccessful=You have successfully deleted the selected resources~ +view_inventory_resources_deleteFailed=Failed to delete the selected resources~ +view_inventory_resources_loadFailed=Failed to load resource composite data~ view_inventory_resources_title=Member Resources~ view_inventory_resources_title_children=Child Resources~ view_inventory_resources_title_members=Member Resources~
rhq-commits@lists.fedorahosted.org