modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java | 18 +-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupSelector.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java | 12 +- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 53 ++++++++-- 4 files changed, 63 insertions(+), 21 deletions(-)
New commits: commit 354f93149000f3e03e47e33de7db6c09414e36ce Author: Ian Springer ian.springer@redhat.com Date: Wed Nov 17 16:24:11 2010 -0500
i18n - resource connection settings views
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java index b3a5709..fcfbf05 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java @@ -52,6 +52,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; */ public class PluginConfigurationEditView extends LocatableVLayout implements PropertyValueChangeListener, RefreshableView { + private Resource resource; private ResourcePermission resourcePermission; private ConfigurationEditor editor; @@ -73,7 +74,7 @@ public class PluginConfigurationEditView extends LocatableVLayout
toolStrip.addMember(new LayoutSpacer());
- this.saveButton = new LocatableIButton(this.extendLocatorId("Save"), "Save"); + this.saveButton = new LocatableIButton(this.extendLocatorId("Save"), MSG.common_button_save()); this.saveButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { save(); @@ -86,7 +87,7 @@ public class PluginConfigurationEditView extends LocatableVLayout refresh();
if (!this.resourcePermission.isInventory()) { - Message message = new Message("You do not have permission to edit this Resource's connection settings.", + Message message = new Message(MSG.view_connectionSettingsDetails_noPermission(), Message.Severity.Info, EnumSet.of(Message.Option.Transient)); CoreGUI.getMessageCenter().notify(message); } @@ -115,13 +116,14 @@ public class PluginConfigurationEditView extends LocatableVLayout GWTServiceLookup.getConfigurationService().updatePluginConfiguration(resource.getId(), updatedConfiguration, new AsyncCallback<PluginConfigurationUpdate>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to update connection settings.", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_connectionSettingsDetails_error_updateFailure(), + caught); }
public void onSuccess(PluginConfigurationUpdate result) { CoreGUI.getMessageCenter().notify( - new Message("Connection settings updated.", - "Connection settings updated for Resource [" + resource.getName() + "].")); + new Message(MSG.view_connectionSettingsDetails_messageConcise_updateSuccess(), + MSG.view_connectionSettingsDetails_messageDetailed_updateSuccess(resource.getName()))); refresh(); } }); @@ -135,12 +137,11 @@ public class PluginConfigurationEditView extends LocatableVLayout Set<String> invalidPropertyNames = event.getInvalidPropertyNames(); if (invalidPropertyNames.isEmpty()) { this.saveButton.enable(); - message = new Message("All connection settings have valid values, so the settings can now be saved.", + message = new Message(MSG.view_connectionSettingsDetails_allPropertiesValid(), Message.Severity.Info, EnumSet.of(Message.Option.Transient, Message.Option.Sticky)); } else { this.saveButton.disable(); - message = new Message("The following connection settings have invalid values: " + invalidPropertyNames - + ". The values must be corrected before the settings can be saved.", + message = new Message(MSG.view_connectionSettingsDetails_somePropertiesInvalid(invalidPropertyNames.toString()), Message.Severity.Error, EnumSet.of(Message.Option.Transient, Message.Option.Sticky)); } messageCenter.notify(message); @@ -148,4 +149,5 @@ public class PluginConfigurationEditView extends LocatableVLayout this.saveButton.enable(); } } + } \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupSelector.java index 6a178ea..e1fdce5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupSelector.java @@ -47,4 +47,5 @@ public class ResourceResourceGroupSelector extends ResourceGroupSelector {
this.setOverflow(Overflow.AUTO); } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java index 7e2c344..8b34aee 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java @@ -19,7 +19,6 @@
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory;
-import java.util.HashSet; import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback; @@ -66,7 +65,7 @@ public class ResourceResourceGroupsView extends LocatableVLayout {
toolStrip.addMember(new LayoutSpacer());
- IButton saveButton = new LocatableIButton(this.extendLocatorId("Save"), "Save"); + IButton saveButton = new LocatableIButton(this.extendLocatorId("Save"), MSG.common_button_save()); saveButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { save(); @@ -81,7 +80,7 @@ public class ResourceResourceGroupsView extends LocatableVLayout { c.fetchExplicitGroups(true); GWTServiceLookup.getResourceService().findResourcesByCriteria(c, new AsyncCallback<PageList<Resource>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to fetch Resource's Groups", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_resourceResourceGroupList_error_fetchFailure(), caught); }
public void onSuccess(PageList<Resource> result) { @@ -100,13 +99,14 @@ public class ResourceResourceGroupsView extends LocatableVLayout { GWTServiceLookup.getResourceGroupService().setAssignedResourceGroupsForResource(this.resource.getId(), resourceGroupIds, true, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to update configuration", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_resourceResourceGroupList_error_updateFailure(), + caught); }
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message("Group membership updated for [" - + ResourceResourceGroupsView.this.resource.getName() + "]", Message.Severity.Info)); + new Message(MSG.view_resourceResourceGroupList_message_updateSuccess( + ResourceResourceGroupsView.this.resource.getName()), Message.Severity.Info)); CoreGUI.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 dbca63a..ed4b0c4 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 @@ -17,6 +17,7 @@ common_button_advanced = Advanced...~ common_button_apply = Apply~ common_button_cancel = Cancel~ common_button_close = Close~ +common_button_compare = Compare~ common_button_create_child = Create Child~ common_button_delete = Delete~ common_button_disable = Disable~ @@ -32,9 +33,8 @@ common_button_refresh = "Refresh"~ common_button_reset = Reset~ common_button_save = Save~ common_button_search = Search~ -common_button_uninventory = Uninventory~ -common_button_compare = Compare~ common_button_showDetails = Show Details...~ +common_button_uninventory = Uninventory~
# Common Labels #------------------------ @@ -65,7 +65,10 @@ common_title_available_resources=Available Resources~ common_title_category = Category~ common_title_compatibleGroups = Compatible Groups~ common_title_compatibleGroups_total=Compatible Group Total~ +common_title_custom=Custom~ +common_title_dashboard_name=Dashboard Name~ common_title_dateCreated=Date Created~ +common_title_default=Default~ common_title_description=Description~ common_title_display=Display~ common_title_edit_mode=Edit Mode~ @@ -84,6 +87,7 @@ common_title_mixedGroups = Mixed Groups~ common_title_mixedGroups_total=Mixed Group Total~ common_title_name = Name~ common_title_new_dashboard=New Dashboard~ +common_title_operations=Operations~ common_title_operations_range=Operation Range~ common_title_over=Over~ common_title_platform_total=Platform Total~ @@ -163,14 +167,23 @@ widget_resourceFactoryWizard_uploadFileStepName=Upload Resource Content File~ widget_resourceFactoryWizard_uploadFailure=Failed to upload file~ widget_resourceFactoryWizard_editConfigStepName=Edit Configuration~ widget_resourceFactoryWizard_infoStepName=Resource Information~ +widget_resourceFactoryWizard_namePrompt=New Resource Name~ widget_resourceFactoryWizard_templatePrompt=Connection Settings Template~ widget_resourceFactoryWizard_contentTemplatePrompt=Deployment Time Configuration Templates~ +widget_resourceFactoryWizard_configTemplatePrompt=Resource Configuration Templates~ widget_resourceFactoryWizard_archPrompt=Package Architecture~ widget_resourceFactoryWizard_versionPrompt=Package Version~ widget_resourceFactoryWizard_importWizardWindowTitle=Resource Import Wizard~ widget_resourceFactoryWizard_importWizardTitle=Import Resource of Type [{0}]~ widget_resourceFactoryWizard_importFailure=Failed to manually import resource~ widget_resourceFactoryWizard_importSubmitted=A request to import a new resource of type [{0}] has been submitted~ +widget_resourceFactoryWizard_createWizardWindowTitle=Resource Create Wizard~ +widget_resourceFactoryWizard_createWizardTitle=Create New Resource of Type [{0}]~ +widget_resourceFactoryWizard_execute1=Failed to create a new resource - there is no package version~ +widget_resourceFactoryWizard_execute2=Failed to create a new resource~ +widget_resourceFactoryWizard_createSubmitType=A request to create a resource of type [{0}] has been submitted successfully.~ +widget_resourceFactoryWizard_createSubmit=A request to create a resource with the name of [{0}] has been submitted successfully.~ +widget_resourceFactoryWizard_failedToType=Failed to get backing package type for new resource~
#===================== Utils ======================
@@ -436,9 +449,18 @@ view_type_typeTreeLoadFailure=Failed to load resource type tree data~
#=================== Dashboard ===================== view_dashboardManager_error=Failed to store dashboard to server~ + view_dashboardManager_success=Saved dashboard~
view_dashboards_title=Dashboard~ +view_dashboards_confirm1=Are you sure you want to delete~ + +view_dashboardsManager_error1=Failed to add new dashboard~ +view_dashboardsManager_inventory_title=Inventory Summary~ +view_dashboardsManager_mashup_title=RHQ News~ +view_dashboardsManager_message_title=Welcome To RHQ~ +view_dashboardsManager_message_title_details=<h1>Welcome to RHQ</h1>\n<p>The RHQ project is an abstraction and plug-in based systems management suite that provides extensible and integrated systems management for multiple products and platforms across a set of core features. The project is designed with layered modules that provide a flexible architecture for deployment. It delivers a core user interface that delivers audited and historical management across an entire enterprise. A Server/Agent architecture provides remote management and plugins implement all specific support for managed products.</p>\n <p>This default dashboard can be edited by clicking the (edit mode) button above.</p>~ +view_dashboardsManager_tagcloud_title=Tag Cloud~ 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.~ view_portlet_autodiscovery_title = Discovery Queue~ @@ -501,11 +523,13 @@ view_inventory_problemGroups=Problem Groups~ view_inventory_collectionInterval=Collection Interval~ view_inventory_mixed=mixed~ view_inventory_downServers=Down Servers~ -view_inventory_allGroups=All Groups~ -view_inventory_allResources=All Resources~ -view_inventory_platforms=Platforms~ -view_inventory_servers=Servers~ -view_inventory_services=Services~ +view_inventory_groups = Groups~ +view_inventory_allGroups = All Groups~ +view_inventory_allResources = All Resources~ +view_inventory_platforms = Platforms~ +view_inventory_servers = Servers~ +view_inventory_services = Services~ +view_inventory_dynagroupDefs = Dynagroup Definitions~ view_metric_traits=Traits~ view_metric_viewTraitHistory=Value History for Trait [{0}]~ view_inventory_eventHistory_groupEventHistory=Group Event History~ @@ -653,6 +677,21 @@ view_group_summary_descUpdateFailure=Failed to change the description of the res view_group_summary_descUpdateSuccessful=You have changed the description of this resource group~ view_group_summary_dynamicNote=Dynamic group names and descriptions are managed, and therefore are not editable~
+# Connection Settings Details +#------------------------------------------ +view_connectionSettingsDetails_noPermission = You do not have permission to edit this Resource''s connection settings.~ +view_connectionSettingsDetails_error_updateFailure = Failed to update connection settings.~ +view_connectionSettingsDetails_messageConcise_updateSuccess = Connection settings updated.~ +view_connectionSettingsDetails_messageDetailed_updateSuccess = Connection settings updated for Resource [{0}].~ +view_connectionSettingsDetails_allPropertiesValid = All connection settings have valid values, so the settings can now be saved.~ +view_connectionSettingsDetails_somePropertiesInvalid = The following connection settings have invalid values: {0}. The values must be corrected before the settings can be saved.~ + +# Resource Resource Groups +#----------------------------------------- +view_resourceResourceGroupList_error_fetchFailure = Failed to fetch Resource''s groups.~ +view_resourceResourceGroupList_error_updateFailure = Failed to update assigned Resource groups.~ +view_resourceResourceGroupList_message_updateSuccess = Group membership updated for [{0}]. + # Configuration Details #------------------------------- view_configurationDetails_noPermission = You do not have permission to edit this Resource''s configuration.~
rhq-commits@lists.fedorahosted.org