modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java | 53 +++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/OverviewView.java | 48 ++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java | 14 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 85 +++++++++- 10 files changed, 159 insertions(+), 68 deletions(-)
New commits: commit e4e973745db5155bf0b0a00c5179b48ff5d23a9b Author: John Mazzitelli mazz@redhat.com Date: Wed Nov 17 11:40:09 2010 -0500
i18n messages
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 76440b1..0fa4733 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 @@ -65,6 +65,7 @@ common_title_icon = icon~ common_title_id = ID~ common_title_inventory = Inventory~ common_title_lastUpdated=Last Updated~ +common_title_lastUpdatedBy=Last Updated By~ common_title_metric = Metric~ common_title_mixedGroups = Mixed Groups~ common_title_name = Name~ @@ -72,6 +73,7 @@ common_title_plugin = Plugin~ common_title_recently_added = Recently Added Resources~ common_title_resource = Resource~ common_title_resource_inventory=Resource Inventory~ +common_title_resource_name=Resource Name~ common_title_selected_resources=Selected Resources~ common_title_start = Start~ common_title_status=Status~ @@ -97,6 +99,7 @@ common_val_yes_lower = yes~ common_val_never=Never~ common_val_na=N/A~
+ #=================== Widgets =====================
# Record Editor @@ -117,6 +120,22 @@ widget_recordEditor_info_recordsDeletedConcise = {0} {1} deleted.~ widget_recordEditor_info_recordsDeletedDetailed = {0} {1} deleted: {2}.~ widget_recordEditor_error_unsupportedOperationType = Unsupported operation type: [{0}]~
+ +#===================== Utils ====================== + +# Disambiguation Report Decorator +#------------------------------------------------- +util_disambiguationReportDecorator_pluginSuffix = ({0} plugin)~ + +# Monitoring Request Callback +#------------------------------------------ +util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status.~ + +# RPC Manager +#---------------------- +util_rpcManager_activeRequests = {0} Active Requests~ + + #================== DataSources ====================
# ContentRepositoryTree @@ -179,6 +198,15 @@ dataSource_schedules_updateFailure=Failed to set the collection interval of [{0} dataSource_schedules_updateSuccessful_concise=A new collection interval of [{0}] seconds has been set on [{1}] measurements~ dataSource_schedules_updateSuccessful_full=A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource group with ID [{2}]. The updated measurements are: [{3}]~
+# Problem Resources +#------------------------------ +dataSource_problemResources_field_resource = Resource~ +dataSource_problemResources_field_location = Location~ +dataSource_problemResources_field_alerts = Alerts~ +dataSource_problemResources_field_available = Current Availability~ +dataSource_problemResources_error_fetchFailure = Failed to load Resources with alerts/unavailability.~ + + #********************************** VIEW-SPECIFIC *************************************
#================= Administration ================== @@ -230,6 +258,7 @@ view_groupConfigEdit_valsDiffForProp = Member Values for Property [{0}]~
view_leftNav_unknownPage = Unknown page name [{0}] for section [{1}] - URL is invalid.~
+view_measure_nan = --no data available--~ view_measureRange_day = 1 Day~ view_measureRange_days = {0} Days~ view_measureRange_hour = 1 Hour~ @@ -273,7 +302,15 @@ view_upload_success = File successfully uploaded~ view_upload_upload = Upload~ view_upload_uploadFile = UploadFile~
- +# Group Create Wizard +view_groupCreateWizard_membersStepName=Select Members~ +view_groupCreateWizard_createStepName=Group Settings~ +view_groupCreateWizard_createStep_recursive=Recursive~ +view_groupCreateWizard_title=Create Group~ +view_groupCreateWizard_windowTitle=Create Group~ +view_groupCreateWizard_createFailure=Failed to create the resource group~ +view_groupCreateWizard_createSuccessful_concise=You have created a new resource group. [<a href="{0}">View Group</a>]~ +view_groupCreateWizard_createSuccessful_full=You have created a new [{0}] resource group with the name [{1}] that contains [{2}] member resources~
#=================== Dashboard ===================== view_portlet_autodiscovery_config_platform_selection = Number of platforms to display~ @@ -294,7 +331,9 @@ view_portlet_recentAlerts_config_priority_label = priority Alerts,~ view_portlet_recentAlerts_config_when=within the past~ view_portlet_recentAlerts_help_msg = Displays recent alerts fired on resources visible to the current user login.~ view_portlet_recentAlerts_title = Recent Alerts~ +view_portlet_recentlyAdded_approved_platforms=recently approved platforms on dashboard.~ view_portlet_recentlyAdded_error1=Failed to load recently added resources~ +view_portlet_recentlyAdded_help_msg=This portlet displays resources that have recently been imported into the inventory.~ view_portlet_recentlyAdded_title =Recently Added Portlet~
#=================== Inventory ===================== @@ -433,8 +472,19 @@ view_group_pluginConfig_edit_saveInitiated_full=The group connection setting upd view_group_pluginConfig_edit_saveFailure=Failed to initiate group connection setting update for [{0}] compatible group named [{1}]~ view_group_pluginConfig_edit_valid=All connection setting properties have valid values, so the connection settings can now be saved~ view_group_pluginConfig_edit_invalid=The following connection setting properties have invalid values and must be corrected before the connection settings can be saved: [{0}]~ -view_group_meas_schedules_title=Group Metric Collection Schedules -view_group_summary_updateSuccessful=The name of the resource group with ID [{0}] was changed from [{1}] to [{2}] +view_group_meas_schedules_title=Group Metric Collection Schedules~ +view_group_summary_nameUpdateFailure=Failed to change the name of the resource group with ID [{0}] - could not change from [{1}] to [{2}]~ +view_group_summary_nameUpdateSuccessful=You have changed the name of the resource group with ID [{0}] from [{1}] to [{2}]~ +view_group_summary_memberType=Member Type~ +view_group_summary_memberCount=Member Count~ +view_group_summary_dynamic=Dynamic~ +view_group_summary_recursive=Recursive~ +view_group_summary_groupDefinition=Group Definition~ +view_group_summary_mixed=Mixed~ +view_group_summary_descUpdateFailure=Failed to change the description of the resource group with ID [{0}]~ +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~ +
#==================== Reports ======================
@@ -450,8 +500,24 @@ view_tagCloud_error_tagUsedCount = Tag used {0} times.~ view_taggedResources_title = Tagged Resources~
+#===================== Test ======================= +view_testTop_title = Test~ +view_testTop_description = This section contains pages for testing various GUI components.~ + #=================== Top Level =====================
+# CoreGUI +#-------------- +view_core_error_1 = New Alerts lookup failed~ +view_core_loggedInAs = Logged in as {0}~ +view_core_loggedOut = Logged out~ +view_core_recentAlerts = [{0}] recent alerts~ +view_core_uncaught = Globally uncaught exception~ + +# Login +#-------------- +view_login_prompt = Please Login + # Menu Bar #-------------- view_menuBar_help = Help~ @@ -462,6 +528,19 @@ view_menuBar_logout = Logout~ view_searchBar_search = Search~ view_searchBar_resources = Resources~ view_searchBar_resourceGroups = Resource Groups~ +# TODO: i18n pluralization +view_searchBar_welcomeMessage = search for {0}s~ +view_searchBar_defaultPattern = name your pattern~ +view_searchBar_error_selectSavedSearch = ''Error selecting saved search''~ + +# Message Center +#-------------------------- +view_messageCenter_button_messages = Messages~ +view_messageCenter_noRecentMessages = No Recent Messages~ +view_messageCenter_messageTitle= Title~ +view_messageCenter_messageSeverity= Severity~ +view_messageCenter_messageTitle= Time~ +view_messageCenter_messageTitle= Detail~
# About Box #----------
commit 6a80c2f4eb332fbcba4ec570840845c8f1634300 Author: John Mazzitelli mazz@redhat.com Date: Wed Nov 17 11:38:27 2010 -0500
i18n
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java index b82ebd4..8b38b39 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java @@ -22,11 +22,16 @@ import java.util.List;
import com.smartgwt.client.widgets.IButton;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; + /** * @author Greg Hinkle */ public interface Wizard {
+ Messages MSG = CoreGUI.getMessages(); + String getWindowTitle();
String getTitle(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java index c21a564..958f0ed 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java @@ -20,11 +20,16 @@ package org.rhq.enterprise.gui.coregui.client.components.wizard;
import com.smartgwt.client.widgets.Canvas;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; + /** * @author Greg Hinkle */ public interface WizardStep {
+ Messages MSG = CoreGUI.getMessages(); + Canvas getCanvas();
boolean nextPage(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java index 77b600f..eb9da82 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java @@ -25,7 +25,6 @@ import com.smartgwt.client.data.Criteria; import com.smartgwt.client.data.DSRequest; import com.smartgwt.client.data.DSResponse; import com.smartgwt.client.data.DataSourceField; -import com.smartgwt.client.data.Record; import com.smartgwt.client.data.fields.DataSourceIntegerField; import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -57,7 +56,8 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat List<DataSourceField> fields = super.addDataSourceFields();
DataSourceField resourceGroupIdField = new DataSourceIntegerField( - MeasurementScheduleCriteria.FILTER_FIELD_RESOURCE_GROUP_ID, "Resource Group Id"); + MeasurementScheduleCriteria.FILTER_FIELD_RESOURCE_GROUP_ID, MSG + .dataSource_schedules_field_resourceGroupId()); resourceGroupIdField.setHidden(true); fields.add(resourceGroupIdField);
@@ -87,22 +87,23 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat @Override protected void enableSchedules(final AbstractMeasurementScheduleListView measurementScheduleListView, final int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames) { - final String s = (measurementDefinitionIds.length > 1) ? "s" : ""; + this.measurementService.enableSchedulesForCompatibleGroup(this.resourceGroupId, measurementDefinitionIds, new AsyncCallback<Void>() { @Override public void onFailure(Throwable throwable) { CoreGUI.getErrorHandler().handleError( - "Failed to enable collection of metric" + s + " " + measurementDefinitionDisplayNames - + " for Resource group with id [" + resourceGroupId + "].", throwable); + MSG.dataSource_schedules_enableFailure(String.valueOf(measurementDefinitionIds.length), String + .valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString()), throwable); }
@Override public void onSuccess(Void aVoid) { CoreGUI.getMessageCenter().notify( - new Message("Enabled collection of selected metric" + s + ".", "Enabled collection of metric" - + s + " " + measurementDefinitionDisplayNames + " for Resource group with id [" - + resourceGroupId + "].", Message.Severity.Info)); + new Message(MSG.dataSource_schedules_enableSuccessful_concise(String + .valueOf(measurementDefinitionIds.length)), MSG.dataSource_schedules_enableSuccessful_full( + String.valueOf(measurementDefinitionIds.length), String.valueOf(resourceGroupId), + measurementDefinitionDisplayNames.toString()), Message.Severity.Info)); measurementScheduleListView.refresh(); } }); @@ -110,23 +111,25 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat
@Override protected void disableSchedules(final AbstractMeasurementScheduleListView measurementScheduleListView, - int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames) { - final String s = (measurementDefinitionIds.length > 1) ? "s" : ""; + final int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames) { + this.measurementService.disableSchedulesForCompatibleGroup(this.resourceGroupId, measurementDefinitionIds, new AsyncCallback<Void>() { @Override public void onFailure(Throwable throwable) { CoreGUI.getErrorHandler().handleError( - "Failed to disable collection of metric" + s + " " + measurementDefinitionDisplayNames - + " for Resource group with id [" + resourceGroupId + "].", throwable); + MSG.dataSource_schedules_disableFailure(String.valueOf(measurementDefinitionIds.length), String + .valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString()), throwable); }
@Override public void onSuccess(Void aVoid) { CoreGUI.getMessageCenter().notify( - new Message("Disabled collection of selected metric" + s + ".", "Disabled collection of metric" - + s + " " + measurementDefinitionDisplayNames + " for Resource group with id [" - + resourceGroupId + "].", Message.Severity.Info)); + new Message(MSG.dataSource_schedules_disableSuccessful_concise(String + .valueOf(measurementDefinitionIds.length)), MSG + .dataSource_schedules_disableSuccessful_full(String + .valueOf(measurementDefinitionIds.length), String.valueOf(resourceGroupId), + measurementDefinitionDisplayNames.toString()), Message.Severity.Info)); measurementScheduleListView.refresh(); } }); @@ -134,26 +137,28 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDat
@Override protected void updateSchedules(final AbstractMeasurementScheduleListView measurementScheduleListView, - int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames, + final int[] measurementDefinitionIds, final List<String> measurementDefinitionDisplayNames, final long collectionInterval) { - final String s = (measurementDefinitionIds.length > 1) ? "s" : ""; + this.measurementService.updateSchedulesForCompatibleGroup(this.resourceGroupId, measurementDefinitionIds, collectionInterval, new AsyncCallback<Void>() { @Override public void onFailure(Throwable throwable) { CoreGUI.getErrorHandler().handleError( - "Failed to set collection interval to " + (collectionInterval / 1000) + " seconds for metric" - + s + " " + measurementDefinitionDisplayNames + " for Resource group with id [" - + resourceGroupId + "].", throwable); + MSG.dataSource_schedules_updateFailure(String.valueOf(measurementDefinitionIds.length), String + .valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString(), String + .valueOf(collectionInterval / 1000)), throwable); }
@Override public void onSuccess(Void aVoid) { + String collIntervalStr = String.valueOf(collectionInterval / 1000); CoreGUI.getMessageCenter().notify( - new Message("Updated collection intervals of selected metric" + s + ".", - "Collection interval for metric" + s + " " + measurementDefinitionDisplayNames - + " for Resource group with id [" + resourceGroupId + "] set to " - + (collectionInterval / 1000) + " seconds.", Message.Severity.Info)); + new Message(MSG.dataSource_schedules_updateSuccessful_concise(collIntervalStr, String + .valueOf(measurementDefinitionIds.length)), MSG.dataSource_schedules_updateSuccessful_full( + collIntervalStr, String.valueOf(measurementDefinitionIds.length), String + .valueOf(resourceGroupId), measurementDefinitionDisplayNames.toString()), + Message.Severity.Info)); measurementScheduleListView.refresh(); } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesView.java index eb7a19a..0f59f7d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesView.java @@ -29,7 +29,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasuremen * @author Ian Springer */ public class SchedulesView extends AbstractMeasurementScheduleListView { - private static final String TITLE = "Group Metric Collection Schedules"; + private static final String TITLE = MSG.view_group_meas_schedules_title();
private static final String[] EXCLUDED_FIELD_NAMES = new String[] { MeasurementScheduleCriteria.FILTER_FIELD_RESOURCE_GROUP_ID };
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java index 2d5fb90..777cc74 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java @@ -21,7 +21,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring import java.util.List;
import com.smartgwt.client.data.DataSourceField; -import com.smartgwt.client.data.Record; import com.smartgwt.client.data.fields.DataSourceIntegerField; import com.smartgwt.client.data.fields.DataSourceTextField; import com.smartgwt.client.widgets.grid.ListGridRecord; @@ -47,12 +46,12 @@ public class TraitsDataSource extends AbstractMeasurementDataTraitDataSource { List<DataSourceField> fields = super.addDataSourceFields();
DataSourceIntegerField groupIdField = new DataSourceIntegerField( - MeasurementDataTraitCriteria.FILTER_FIELD_GROUP_ID, "Group Id"); + MeasurementDataTraitCriteria.FILTER_FIELD_GROUP_ID, MSG.dataSource_traits_group_field_groupId()); groupIdField.setHidden(true); fields.add(0, groupIdField);
DataSourceTextField resourceNameField = new DataSourceTextField( - MeasurementDataTraitCriteria.SORT_FIELD_RESOURCE_NAME, "Member Resource"); + MeasurementDataTraitCriteria.SORT_FIELD_RESOURCE_NAME, MSG.dataSource_traits_group_field_memberResource()); fields.add(0, resourceNameField);
return fields; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/OverviewView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/OverviewView.java index 2027fd2..53809d5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/OverviewView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/OverviewView.java @@ -80,7 +80,7 @@ public class OverviewView extends LocatableVLayout {
final FormItem nameItem = (dynamic) ? new StaticTextItem() : new TogglableTextItem(); nameItem.setName("name"); - nameItem.setTitle("Name"); + nameItem.setTitle(MSG.common_title_name()); nameItem.setValue(group.getName()); if (nameItem instanceof TogglableTextItem) { final TogglableTextItem togglableNameItem = (TogglableTextItem) nameItem; @@ -94,8 +94,8 @@ public class OverviewView extends LocatableVLayout { OverviewView.this.resourceGroupService.updateResourceGroup(group, false, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError( - "Failed to change name of Resource group with id " + group.getId() + " from "" - + oldName + "" to "" + newName + "".", caught); + MSG.view_group_summary_nameUpdateFailure(String.valueOf(group.getId()), oldName, + newName), caught); // We failed to update it on the Server, so change back the ResourceGroup and the form item // to the original value. group.setName(oldName); @@ -104,8 +104,8 @@ public class OverviewView extends LocatableVLayout {
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message("Name of Resource group with id " + group.getId() + " was changed from "" - + oldName + "" to "" + newName + "".", Message.Severity.Info)); + new Message(MSG.view_group_summary_nameUpdateSuccessful(String.valueOf(group.getId()), + oldName, newName), Message.Severity.Info)); } }); } @@ -113,24 +113,25 @@ public class OverviewView extends LocatableVLayout { } formItems.add(nameItem);
- StaticTextItem typeItem = new StaticTextItem("memberType", "Member Type"); + StaticTextItem typeItem = new StaticTextItem("memberType", MSG.view_group_summary_memberType()); ResourceType type = group.getResourceType(); if (type != null) { - typeItem.setTooltip("Plugin: " + type.getPlugin() + "\n<br>" + "Type: " + type.getName()); + typeItem.setTooltip(MSG.common_title_plugin() + ": " + type.getPlugin() + "\n<br>" + + MSG.common_title_type() + ": " + type.getName()); typeItem.setValue(type.getName() + " (" + type.getPlugin() + ")"); } else { - typeItem.setValue("<i>Mixed</i>"); + typeItem.setValue("<i>" + MSG.view_group_summary_mixed() + "</i>"); } formItems.add(typeItem);
- StaticTextItem countItem = new StaticTextItem("memberCount", "Member Count"); + StaticTextItem countItem = new StaticTextItem("memberCount", MSG.view_group_summary_memberCount()); long memberCount = this.groupComposite.getImplicitUp() + this.groupComposite.getImplicitDown(); countItem.setValue(memberCount); formItems.add(countItem);
final FormItem descriptionItem = (dynamic) ? new StaticTextItem() : new TogglableTextItem(); descriptionItem.setName("description"); - descriptionItem.setTitle("Description"); + descriptionItem.setTitle(MSG.common_title_description()); descriptionItem.setValue(group.getDescription()); if (descriptionItem instanceof TogglableTextItem) { final TogglableTextItem togglableDescriptionItem = (TogglableTextItem) descriptionItem; @@ -144,8 +145,7 @@ public class OverviewView extends LocatableVLayout { OverviewView.this.resourceGroupService.updateResourceGroup(group, false, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError( - "Failed to change description of Resource group with id " + group.getId() + " from "" - + oldDescription + "" to "" + newDescription + "".", caught); + MSG.view_group_summary_descUpdateFailure(String.valueOf(group.getId())), caught); // We failed to update it on the Server, so change back the ResourceGroup and the form item // to the original value. group.setDescription(oldDescription); @@ -154,9 +154,7 @@ public class OverviewView extends LocatableVLayout {
public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message("Description of Resource group with id " + group.getId() - + " was changed from "" + oldDescription + "" to "" + newDescription + "".", - Message.Severity.Info)); + new Message(MSG.view_group_summary_descUpdateSuccessful(), Message.Severity.Info)); } }); } @@ -164,28 +162,29 @@ public class OverviewView extends LocatableVLayout { } formItems.add(descriptionItem);
- StaticTextItem dynamicItem = new StaticTextItem("dynamic", "Dynamic?"); - dynamicItem.setValue(dynamic ? "yes" : "no"); + StaticTextItem dynamicItem = new StaticTextItem("dynamic", MSG.view_group_summary_dynamic()); + dynamicItem.setValue(dynamic ? MSG.common_val_yes_lower() : MSG.common_val_no_lower()); formItems.add(dynamicItem);
- StaticTextItem recursiveItem = new StaticTextItem("recursive", "Recursive?"); - recursiveItem.setValue((group.isRecursive()) ? "yes" : "no"); + StaticTextItem recursiveItem = new StaticTextItem("recursive", MSG.view_group_summary_recursive()); + recursiveItem.setValue((group.isRecursive()) ? MSG.common_val_yes_lower() : MSG.common_val_no_lower()); formItems.add(recursiveItem);
- StaticTextItem createdItem = new StaticTextItem("created", "Created"); + StaticTextItem createdItem = new StaticTextItem("created", MSG.common_title_dateCreated()); createdItem.setValue(new Date(group.getCtime())); formItems.add(createdItem);
- StaticTextItem lastModifiedItem = new StaticTextItem("lastModified", "Last Modified"); + StaticTextItem lastModifiedItem = new StaticTextItem("lastModified", MSG.common_title_lastUpdated()); lastModifiedItem.setValue(new Date(group.getMtime())); formItems.add(lastModifiedItem);
- StaticTextItem lastModifiedByItem = new StaticTextItem("lastModifiedBy", "Last Modified By"); + StaticTextItem lastModifiedByItem = new StaticTextItem("lastModifiedBy", MSG.common_title_lastUpdatedBy()); lastModifiedByItem.setValue(group.getModifiedBy()); formItems.add(lastModifiedByItem);
if (dynamic) { - StaticTextItem groupDefinitionItem = new StaticTextItem("groupDefinition", "Group Definition"); + StaticTextItem groupDefinitionItem = new StaticTextItem("groupDefinition", MSG + .view_group_summary_groupDefinition()); GroupDefinition groupDefinition = group.getGroupDefinition(); String groupDefinitionUrl = LinkManager.getGroupDefinitionLink(groupDefinition.getId()); groupDefinitionItem @@ -202,8 +201,7 @@ public class OverviewView extends LocatableVLayout { addMember(spacer);
HTMLFlow note = new HTMLFlow(); - note - .setContents("<b>*</b> Dynamic group names and descriptions are managed, and therefore are not editable."); + note.setContents("<b>*</b> " + MSG.view_group_summary_dynamicNote()); note.setAlign(Alignment.CENTER); addMember(note); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java index 61c1cc1..d12da80 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java @@ -50,14 +50,14 @@ public class GroupCreateStep extends AbstractWizardStep { form.setWidth100(); form.setNumCols(2);
- TextItem name = new TextItem("name", "Name"); + TextItem name = new TextItem("name", MSG.common_title_name()); name.setRequired(true); name.setWidth(300);
- TextAreaItem description = new AutoFitTextAreaItem("description", "Description"); + TextAreaItem description = new AutoFitTextAreaItem("description", MSG.common_title_description()); description.setWidth(300);
- CheckboxItem recursive = new CheckboxItem("recursive", "Recursive"); + CheckboxItem recursive = new CheckboxItem("recursive", MSG.view_groupCreateWizard_createStep_recursive());
form.setFields(name, description, recursive); } @@ -70,7 +70,7 @@ public class GroupCreateStep extends AbstractWizardStep { }
public String getName() { - return "Group Settings"; + return MSG.view_groupCreateWizard_createStepName(); }
public ResourceGroup getGroup() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java index 4e66027..e437e31 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java @@ -60,11 +60,11 @@ public class GroupCreateWizard extends AbstractWizard { }
public String getWindowTitle() { - return "Create Group"; + return MSG.view_groupCreateWizard_windowTitle(); }
public String getTitle() { - return "Create Group"; + return MSG.view_groupCreateWizard_title(); }
public String getSubtitle() { @@ -86,15 +86,15 @@ public class GroupCreateWizard extends AbstractWizard { groupService.createResourceGroup(createStep.getGroup(), memberStep.getSelectedResourceIds(), new AsyncCallback<ResourceGroup>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to create Resource group.", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_groupCreateWizard_createFailure(), caught); }
public void onSuccess(ResourceGroup result) { String groupUrl = LinkManager.getResourceGroupLink(result.getId()); - String conciseMessage = "Resource group created. [<a href='" + groupUrl + "'>View Group</a>]"; - String detailedMessage = - "Created new " + result.getGroupCategory().name().toLowerCase() + " Resource group '" - + result.getName() + "' with " + memberStep.getSelectedResourceIds().length + " members."; + String conciseMessage = MSG.view_groupCreateWizard_createSuccessful_concise(groupUrl); + String detailedMessage = MSG.view_groupCreateWizard_createSuccessful_full(result.getGroupCategory() + .name().toLowerCase(), result.getName(), String + .valueOf(memberStep.getSelectedResourceIds().length)); CoreGUI.getMessageCenter().notify(new Message(conciseMessage, detailedMessage)); resourceGroupListView.refresh(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java index d24ac3c..3151742 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java @@ -54,7 +54,7 @@ public class GroupMembersStep extends AbstractWizardStep { }
public String getName() { - return "Select Members"; + return MSG.view_groupCreateWizard_membersStepName(); }
public int[] getSelectedResourceIds() {
rhq-commits@lists.fedorahosted.org