modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java | 16
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/DampeningAlertDefinitionForm.java | 92 ++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java | 35 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java | 23 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java | 214 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java | 47 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/RecoveryAlertDefinitionForm.java | 28 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java | 22 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationInfo.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java | 65 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SimpleNotificationSenderForm.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java | 25 -
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 184 ++++++++
21 files changed, 565 insertions(+), 302 deletions(-)
New commits:
commit 01e83939b621fc772e902479803a8f350aa18aec
Author: Joseph Marques <joseph(a)redhat.com>
Date: Thu Nov 18 18:50:54 2010 -0500
i18n for org.rhq.enterprise.gui.coregui.client.alert.definitions
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java
index bddd4b4..133683f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java
@@ -159,28 +159,28 @@ public class AlertFormatUtility {
break;
}
case CONTROL: {
- str.append(MSG.view_alert_common_tab_conditions_type_metric_operation());
+ str.append(MSG.view_alert_common_tab_conditions_type_operation());
str.append(" [");
str.append(condition.getName());
str.append("] ");
- str.append(MSG.view_alert_common_tab_conditions_type_metric_status());
+ str.append(MSG.view_alert_common_tab_conditions_type_operation_status());
str.append(" [");
str.append(condition.getOption());
str.append("]");
break;
}
case RESOURCE_CONFIG: {
- str.append(MSG.view_alert_common_tab_conditions_type_metric_resource_configuration());
+ str.append(MSG.view_alert_common_tab_conditions_type_resource_configuration());
break;
}
case EVENT: {
- str.append(MSG.view_alert_common_tab_conditions_type_metric_event());
+ str.append(MSG.view_alert_common_tab_conditions_type_event());
str.append(" [");
str.append(condition.getName());
str.append("]");
if (condition.getOption() != null && condition.getOption().length() > 0) {
str.append(" ");
- str.append(MSG.view_alert_common_tab_conditions_type_metric_event_matching());
+ str.append(MSG.view_alert_common_tab_conditions_type_event_matching());
str.append(" '");
str.append(condition.getOption());
str.append("'");
@@ -188,7 +188,7 @@ public class AlertFormatUtility {
break;
}
default: {
- str.append(MSG.view_alert_common_tab_conditions_type_invalid(category.name()));
+ str.append(MSG.view_alert_common_tab_invalid_condition_category(category.name()));
break;
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
index d48c811..f960bc7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
@@ -102,25 +102,26 @@ public abstract class AbstractAlertDefinitionsDataSource extends RPCDataSource<A
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField nameField = new DataSourceTextField(FIELD_NAME, "Name");
+ DataSourceTextField nameField = new DataSourceTextField(FIELD_NAME, MSG.view_alerts_field_name());
fields.add(nameField);
- DataSourceTextField descriptionField = new DataSourceTextField(FIELD_DESCRIPTION, "Description");
+ DataSourceTextField descriptionField = new DataSourceTextField(FIELD_DESCRIPTION, MSG
+ .common_title_description());
fields.add(descriptionField);
- DataSourceTextField ctimeField = new DataSourceTextField(FIELD_CTIME, "Created Time");
+ DataSourceTextField ctimeField = new DataSourceTextField(FIELD_CTIME, MSG.view_alerts_field_created_time());
ctimeField.setType(FieldType.DATETIME);
fields.add(ctimeField);
- DataSourceTextField mtimeField = new DataSourceTextField(FIELD_MTIME, "Modified Time");
+ DataSourceTextField mtimeField = new DataSourceTextField(FIELD_MTIME, MSG.view_alerts_field_modified_time());
mtimeField.setType(FieldType.DATETIME);
fields.add(mtimeField);
- DataSourceTextField enabledField = new DataSourceTextField(FIELD_ENABLED, "Enabled");
+ DataSourceTextField enabledField = new DataSourceTextField(FIELD_ENABLED, MSG.view_alerts_field_enabled());
enabledField.setType(FieldType.BOOLEAN);
fields.add(enabledField);
- DataSourceImageField priorityField = new DataSourceImageField(FIELD_PRIORITY, "Priority");
+ DataSourceImageField priorityField = new DataSourceImageField(FIELD_PRIORITY, MSG.view_alerts_field_priority());
fields.add(priorityField);
return fields;
@@ -132,7 +133,7 @@ public abstract class AbstractAlertDefinitionsDataSource extends RPCDataSource<A
GWTServiceLookup.getAlertDefinitionService().findAlertDefinitionsByCriteria(criteria,
new AsyncCallback<PageList<AlertDefinition>>() {
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to load alert definition data", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_loadFailed(), caught);
response.setStatus(DSResponse.STATUS_FAILURE);
processResponse(request.getRequestId(), response);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
index 8386cbe..f7870eb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
@@ -68,7 +68,7 @@ public abstract class AbstractAlertDefinitionsView extends TableSection {
boolean permitted = isAllowedToModifyAlertDefinitions();
TableActionEnablement enablement = (permitted) ? TableActionEnablement.ALWAYS : TableActionEnablement.NEVER;
- addTableAction(extendLocatorId("New"), "New", null, new AbstractTableAction(enablement) {
+ addTableAction(extendLocatorId("New"), MSG.common_button_new(), null, new AbstractTableAction(enablement) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
newButtonPressed(selection);
// I don't think you want this refresh, it will recreate the new alert detail
@@ -77,19 +77,22 @@ public abstract class AbstractAlertDefinitionsView extends TableSection {
});
enablement = (permitted) ? TableActionEnablement.ANY : TableActionEnablement.NEVER;
- addTableAction(extendLocatorId("Enable"), "Enable", "Are You Sure?", new AbstractTableAction(enablement) {
+ addTableAction(extendLocatorId("Enable"), MSG.common_button_enable(), MSG
+ .view_alert_definitions_enable_confirm(), new AbstractTableAction(enablement) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
enableButtonPressed(selection);
refresh();
}
});
- addTableAction(extendLocatorId("Disable"), "Disable", "Are You Sure?", new AbstractTableAction(enablement) {
+ addTableAction(extendLocatorId("Disable"), MSG.common_button_disable(), MSG
+ .view_alert_definitions_disable_confirm(), new AbstractTableAction(enablement) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
disableButtonPressed(selection);
refresh();
}
});
- addTableAction(extendLocatorId("Delete"), "Delete", "Are You Sure?", new AbstractTableAction(enablement) {
+ addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), MSG
+ .view_alert_definitions_delete_confirm(), new AbstractTableAction(enablement) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
deleteButtonPressed(selection);
refresh();
@@ -110,7 +113,7 @@ public abstract class AbstractAlertDefinitionsView extends TableSection {
}
@Override
- public SingleAlertDefinitionView getDetailsView(int id) {
+ public SingleAlertDefinitionView getDetailsView(final int id) {
final SingleAlertDefinitionView singleAlertDefinitionView = new SingleAlertDefinitionView(this
.extendLocatorId("singleAlertDefinitionView"), this);
@@ -138,7 +141,8 @@ public abstract class AbstractAlertDefinitionsView extends TableSection {
GWTServiceLookup.getAlertDefinitionService().findAlertDefinitionsByCriteria(criteria,
new AsyncCallback<PageList<AlertDefinition>>() {
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to load alert definition data", caught);
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_alert_definitions_loadFailed_single(String.valueOf(id)), caught);
}
public void onSuccess(PageList<AlertDefinition> result) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java
index 6991b2c..0e11a60 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java
@@ -136,7 +136,8 @@ public class ConditionsAlertDefinitionForm extends LocatableVLayout implements E
LocatableDynamicForm conditionExpressionForm;
conditionExpressionForm = new LocatableDynamicForm(this.extendLocatorId("conditionExpressionForm"));
- conditionExpression = new SelectItem("conditionExpression", "Fire alert when");
+ conditionExpression = new SelectItem("conditionExpression", MSG
+ .view_alert_common_tab_conditions_expression());
LinkedHashMap<String, String> condExprs = new LinkedHashMap<String, String>(2);
condExprs.put(BooleanExpression.ANY.name(), BooleanExpression.ANY.toString());
condExprs.put(BooleanExpression.ALL.name(), BooleanExpression.ALL.toString());
@@ -144,10 +145,10 @@ public class ConditionsAlertDefinitionForm extends LocatableVLayout implements E
conditionExpression.setDefaultValue(BooleanExpression.ANY.name());
conditionExpression.setWrapTitle(false);
conditionExpression.setHoverWidth(300);
- conditionExpression
- .setTooltip("Determines if ANY or ALL of the conditions must evaluate to true in order for the entire condition set to be considered true.");
+ conditionExpression.setTooltip(MSG.view_alert_common_tab_conditions_expression_tooltip());
- conditionExpressionStatic = new StaticTextItem("conditionExpressionStatic", "Fire alert when");
+ conditionExpressionStatic = new StaticTextItem("conditionExpressionStatic", MSG
+ .view_alert_common_tab_conditions_expression());
conditionExpressionStatic.setWrapTitle(false);
conditionExpressionForm.setFields(conditionExpression, conditionExpressionStatic);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java
index 4824992..d1dfadb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java
@@ -92,12 +92,12 @@ public class ConditionsEditor extends LocatableVLayout {
final ConditionDataSource dataSource = new ConditionDataSource();
table.setDataSource(dataSource);
- table.addTableAction(this.extendLocatorId("add"), "Add", null, new AbstractTableAction() {
+ table.addTableAction(this.extendLocatorId("add"), MSG.common_button_add(), null, new AbstractTableAction() {
@Override
public void executeAction(ListGridRecord[] selection, Object actionValue) {
final Window winModal = new LocatableWindow(ConditionsEditor.this
.extendLocatorId("newConditionEditorWindow"));
- winModal.setTitle("Add Condition");
+ winModal.setTitle(MSG.view_alert_common_tab_conditions_modal_title());
winModal.setOverflow(Overflow.VISIBLE);
winModal.setShowMinimizeButton(false);
winModal.setIsModal(true);
@@ -126,8 +126,8 @@ public class ConditionsEditor extends LocatableVLayout {
winModal.show();
}
});
- table.addTableAction(this.extendLocatorId("delete"), "Delete", "Are you sure?", new AbstractTableAction(
- TableActionEnablement.ANY) {
+ table.addTableAction(this.extendLocatorId("delete"), MSG.common_button_delete(), MSG
+ .view_alert_definitions_delete_confirm(), new AbstractTableAction(TableActionEnablement.ANY) {
@Override
public void executeAction(ListGridRecord[] selection, Object actionValue) {
for (ListGridRecord record : selection) {
@@ -159,7 +159,8 @@ public class ConditionsEditor extends LocatableVLayout {
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField conditionField = new DataSourceTextField(FIELD_CONDITION, "Condition");
+ DataSourceTextField conditionField = new DataSourceTextField(FIELD_CONDITION, MSG
+ .view_alert_common_tab_conditions_text());
fields.add(conditionField);
return fields;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/DampeningAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/DampeningAlertDefinitionForm.java
index 1942004..d896479 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/DampeningAlertDefinitionForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/DampeningAlertDefinitionForm.java
@@ -145,7 +145,7 @@ public class DampeningAlertDefinitionForm extends LocatableDynamicForm implement
break;
}
default: {
- throw new IllegalStateException("Invalid category - please report this as a bug: " + category); // should never happen
+ throw new IllegalStateException(MSG.view_alert_common_tab_invalid_dampening_category(category.name())); // should never happen
}
}
}
@@ -228,7 +228,7 @@ public class DampeningAlertDefinitionForm extends LocatableDynamicForm implement
break;
}
default: {
- throw new IllegalStateException("Bad dampening category - please report this bug: " + cat); // should never happen
+ throw new IllegalStateException(MSG.view_alert_common_tab_invalid_dampening_category(cat.name())); // should never happen
}
}
@@ -309,7 +309,7 @@ public class DampeningAlertDefinitionForm extends LocatableDynamicForm implement
break;
}
default: {
- throw new IllegalStateException("Bad dampening category - please report this bug: " + cat); // should never happen
+ throw new IllegalStateException(MSG.view_alert_common_tab_invalid_dampening_category(cat.name())); // should never happen
}
}
@@ -354,7 +354,7 @@ public class DampeningAlertDefinitionForm extends LocatableDynamicForm implement
break;
}
default: {
- throw new IllegalStateException("Bad dampening category - please report this bug: " + cat); // should never happen
+ throw new IllegalStateException(MSG.view_alert_common_tab_invalid_dampening_category(cat.name())); // should never happen
}
}
alertDefinition.setAlertDampening(alertDampening);
@@ -383,7 +383,7 @@ public class DampeningAlertDefinitionForm extends LocatableDynamicForm implement
private void buildForm() {
if (!formBuilt) {
- dampeningRuleSelection = new SelectItem("dampeningRule", "Dampening Rule");
+ dampeningRuleSelection = new SelectItem("dampeningRule", MSG.view_alert_common_tab_dampening());
LinkedHashMap<String, String> rules = new LinkedHashMap<String, String>(4);
rules.put(AlertDampening.Category.NONE.name(), getCategoryTitle(AlertDampening.Category.NONE));
rules.put(AlertDampening.Category.CONSECUTIVE_COUNT.name(),
@@ -405,7 +405,7 @@ public class DampeningAlertDefinitionForm extends LocatableDynamicForm implement
}
});
- dampeningRuleStatic = new StaticTextItem("dampeningRuleStatic", "Dampening Rule");
+ dampeningRuleStatic = new StaticTextItem("dampeningRuleStatic", MSG.view_alert_common_tab_dampening());
dampeningRuleStatic.setWrapTitle(false);
dampeningRuleStatic.setHoverWidth(300);
@@ -413,66 +413,75 @@ public class DampeningAlertDefinitionForm extends LocatableDynamicForm implement
// nothing to do - the none category has no ui components to render
// CONSECUTIVE_COUNT
- consecutiveOccurrencesSpinner = new SpinnerItem("consecutiveOccurrencesSpinner", "Occurrences");
+ consecutiveOccurrencesSpinner = new SpinnerItem("consecutiveOccurrencesSpinner", MSG
+ .view_alert_common_tab_dampening_consecutive_occurrences_label());
consecutiveOccurrencesSpinner.setWrapTitle(false);
consecutiveOccurrencesSpinner.setMin(1);
consecutiveOccurrencesSpinner.setMax(999999);
consecutiveOccurrencesSpinner.setStep(1);
consecutiveOccurrencesSpinner.setDefaultValue(1);
consecutiveOccurrencesSpinner.setHoverWidth(300);
- consecutiveOccurrencesSpinner
- .setTooltip("The number of times the condition set must be consecutively true before the alert is triggered.");
- consecutiveOccurrencesStatic = new StaticTextItem("consecutiveOccurrencesStatic", "Occurrences");
+ consecutiveOccurrencesSpinner.setTooltip(MSG
+ .view_alert_common_tab_dampening_consecutive_occurrences_label_tooltip());
+ consecutiveOccurrencesStatic = new StaticTextItem("consecutiveOccurrencesStatic", MSG
+ .view_alert_common_tab_dampening_consecutive_occurrences_label());
consecutiveOccurrencesStatic.setWrapTitle(false);
// PARTIAL_COUNT
- partialOccurrencesSpinner = new SpinnerItem("partialOccurrencesSpinner", "Occurrences");
+ partialOccurrencesSpinner = new SpinnerItem("partialOccurrencesSpinner", MSG
+ .view_alert_common_tab_dampening_partial_occurrences_label());
partialOccurrencesSpinner.setWrapTitle(false);
partialOccurrencesSpinner.setMin(1);
partialOccurrencesSpinner.setMax(999999);
partialOccurrencesSpinner.setStep(1);
partialOccurrencesSpinner.setDefaultValue(1);
partialOccurrencesSpinner.setHoverWidth(300);
- partialOccurrencesSpinner
- .setTooltip("The number of times the condition set must be true during the last N evaluations before the alert is triggered.");
- partialOccurrencesStatic = new StaticTextItem("partialOccurrencesStatic", "Occurrences");
+ partialOccurrencesSpinner.setTooltip(MSG
+ .view_alert_common_tab_dampening_partial_occurrences_label_tooltip());
+ partialOccurrencesStatic = new StaticTextItem("partialOccurrencesStatic", MSG
+ .view_alert_common_tab_dampening_partial_occurrences_label());
partialOccurrencesStatic.setWrapTitle(false);
- partialEvaluationsSpinner = new SpinnerItem("partialEvaluationsSpinner", "Evaluations");
+ partialEvaluationsSpinner = new SpinnerItem("partialEvaluationsSpinner", MSG
+ .view_alert_common_tab_dampening_partial_evalatuions_label());
partialEvaluationsSpinner.setWrapTitle(false);
partialEvaluationsSpinner.setMin(1);
partialEvaluationsSpinner.setMax(999999);
partialEvaluationsSpinner.setStep(1);
partialEvaluationsSpinner.setDefaultValue(1);
partialEvaluationsSpinner.setHoverWidth(300);
- partialEvaluationsSpinner
- .setTooltip("The total number of times the condition set will be tested to see if the given number of occurrences are true.");
- partialEvaluationsStatic = new StaticTextItem("partialEvaluationStatic", "Evaluations");
+ partialEvaluationsSpinner.setTooltip(MSG
+ .view_alert_common_tab_dampening_partial_evalatuions_label_tooltip());
+ partialEvaluationsStatic = new StaticTextItem("partialEvaluationStatic", MSG
+ .view_alert_common_tab_dampening_partial_evalatuions_label());
partialEvaluationsStatic.setWrapTitle(false);
// DURATION_COUNT
- durationOccurrencesSpinner = new SpinnerItem("durationOccurrencesSpinner", "Occurrences");
+ durationOccurrencesSpinner = new SpinnerItem("durationOccurrencesSpinner", MSG
+ .view_alert_common_tab_dampening_duration_occurrences_label());
durationOccurrencesSpinner.setWrapTitle(false);
durationOccurrencesSpinner.setMin(1);
durationOccurrencesSpinner.setMax(999999);
durationOccurrencesSpinner.setStep(1);
durationOccurrencesSpinner.setDefaultValue(1);
durationOccurrencesSpinner.setHoverWidth(300);
- durationOccurrencesSpinner
- .setTooltip("The number of times the condition set must be true during the given time period before the alert is triggered.");
- durationOccurrencesStatic = new StaticTextItem("durationOccurrencesStatic", "Occurrences");
+ durationOccurrencesSpinner.setTooltip(MSG
+ .view_alert_common_tab_dampening_duration_occurrences_label_tooltip());
+ durationOccurrencesStatic = new StaticTextItem("durationOccurrencesStatic", MSG
+ .view_alert_common_tab_dampening_duration_occurrences_label());
durationOccurrencesStatic.setWrapTitle(false);
- durationTimePeriodSpinner = new SpinnerItem("durationTimePeriodSpinner", "Time Period");
+ durationTimePeriodSpinner = new SpinnerItem("durationTimePeriodSpinner", MSG
+ .view_alert_common_tab_dampening_duration_period_label());
durationTimePeriodSpinner.setWrapTitle(false);
durationTimePeriodSpinner.setMin(1);
durationTimePeriodSpinner.setMax(999999);
durationTimePeriodSpinner.setStep(1);
durationTimePeriodSpinner.setDefaultValue(1);
durationTimePeriodSpinner.setHoverWidth(300);
- durationTimePeriodSpinner
- .setTooltip("The time span in which the condition set will be tested to see if the given number of occurrences are true.");
- durationTimePeriodStatic = new StaticTextItem("durationTimePeriodStatic", "Time Period");
+ durationTimePeriodSpinner.setTooltip(MSG.view_alert_common_tab_dampening_duration_period_label_tooltip());
+ durationTimePeriodStatic = new StaticTextItem("durationTimePeriodStatic", MSG
+ .view_alert_common_tab_dampening_duration_period_label());
durationTimePeriodStatic.setWrapTitle(false);
durationTimeUnitsSelection = new SelectItem("durationTimeUnits", "");
@@ -527,7 +536,8 @@ public class DampeningAlertDefinitionForm extends LocatableDynamicForm implement
break;
}
default: {
- throw new IllegalStateException("Invalid category - please report this as a bug: " + cat); // should never happen
+ throw new IllegalStateException(MSG
+ .view_alert_common_tab_invalid_dampening_category(cat.name())); // should never happen
}
}
markForRedraw();
@@ -548,19 +558,19 @@ public class DampeningAlertDefinitionForm extends LocatableDynamicForm implement
private String getCategoryTitle(AlertDampening.Category category) {
switch (category) {
case NONE: {
- return "None";
+ return MSG.view_alert_common_tab_dampening_category_none();
}
case CONSECUTIVE_COUNT: {
- return "Consecutive";
+ return MSG.view_alert_common_tab_dampening_category_consecutive_count();
}
case PARTIAL_COUNT: {
- return "Last N Evaluations";
+ return MSG.view_alert_common_tab_dampening_category_partial_count();
}
case DURATION_COUNT: {
- return "Time Period";
+ return MSG.view_alert_common_tab_dampening_category_duration_count();
}
default: {
- throw new IllegalStateException("Invalid category - please report this as a bug: " + category); // should never happen
+ throw new IllegalStateException(MSG.view_alert_common_tab_invalid_dampening_category(category.name())); // should never happen
}
}
}
@@ -568,32 +578,32 @@ public class DampeningAlertDefinitionForm extends LocatableDynamicForm implement
private String getTimeUnitsTitle(AlertDampening.TimeUnits units) {
switch (units) {
case MINUTES: {
- return "minutes";
+ return MSG.common_label_month();
}
case HOURS: {
- return "hours";
+ return MSG.common_label_hours();
}
case DAYS: {
- return "days";
+ return MSG.common_label_days();
}
case WEEKS: {
- return "weeks";
+ return MSG.common_label_weeks();
}
default: {
- throw new IllegalStateException("Invalid time units - please report this as a bug: " + units); // should never happen
+ throw new IllegalStateException(MSG.view_alert_common_tab_invalid_time_units(units.name())); // should never happen
}
}
}
private String getCategoryHelp(String categorySelection) {
if (AlertDampening.Category.NONE.name().equals(categorySelection)) {
- return "Dampening is disabled. Every time the condition set is true, an alert will be triggered.";
+ return MSG.view_alert_common_tab_dampening_category_none_tooltip();
} else if (AlertDampening.Category.CONSECUTIVE_COUNT.name().equals(categorySelection)) {
- return "An alert is triggered once every X occurrences the condition set is true consecutively.";
+ return MSG.view_alert_common_tab_dampening_category_consecutive_count_tooltip();
} else if (AlertDampening.Category.PARTIAL_COUNT.name().equals(categorySelection)) {
- return "An alert is triggered once every X occurrences the condition set is true during the last N evaluations of the condition set.";
+ return MSG.view_alert_common_tab_dampening_category_partial_count_tooltip();
} else if (AlertDampening.Category.DURATION_COUNT.name().equals(categorySelection)) {
- return "An alert is triggered once every X occurrences the condition set is true within a given time period.";
+ return MSG.view_alert_common_tab_dampening_category_duration_count_tooltip();
}
return null; // should never happen
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
index 12e27d9..8795043 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
@@ -100,10 +100,10 @@ public class GeneralPropertiesAlertDefinitionForm extends LocatableDynamicForm i
priorityStatic.setValue(alertDef.getPriority().name());
enabledSelection.setValue(alertDef.getEnabled() ? "yes" : "no");
- enabledStatic.setValue(alertDef.getEnabled() ? "Yes" : "No");
+ enabledStatic.setValue(alertDef.getEnabled() ? MSG.common_val_yes() : MSG.common_val_no());
readOnlySelection.setValue(alertDef.isReadOnly() ? "yes" : "no");
- readOnlyStatic.setValue(alertDef.isReadOnly() ? "Yes" : "No");
+ readOnlyStatic.setValue(alertDef.isReadOnly() ? MSG.common_val_yes() : MSG.common_val_no());
}
markForRedraw();
@@ -204,17 +204,17 @@ public class GeneralPropertiesAlertDefinitionForm extends LocatableDynamicForm i
private void buildForm() {
if (!formBuilt) {
- nameTextField = new TextItem("name", "Name");
+ nameTextField = new TextItem("name", MSG.common_title_name());
nameTextField.setWidth(300);
nameTextField.setDefaultValue("");
- nameStatic = new StaticTextItem("nameStatic", "Name");
+ nameStatic = new StaticTextItem("nameStatic", MSG.common_title_name());
- descriptionTextField = new TextAreaItem("description", "Description");
+ descriptionTextField = new TextAreaItem("description", MSG.common_title_description());
descriptionTextField.setWidth(300);
descriptionTextField.setDefaultValue("");
- descriptionStatic = new StaticTextItem("descriptionStatic", "Description");
+ descriptionStatic = new StaticTextItem("descriptionStatic", MSG.common_title_description());
- prioritySelection = new SelectItem("priority", "Priority");
+ prioritySelection = new SelectItem("priority", MSG.view_alerts_field_priority());
LinkedHashMap<String, String> priorities = new LinkedHashMap<String, String>(3);
priorities.put(AlertPriority.HIGH.name(), AlertPriority.HIGH.name());
priorities.put(AlertPriority.MEDIUM.name(), AlertPriority.MEDIUM.name());
@@ -226,26 +226,25 @@ public class GeneralPropertiesAlertDefinitionForm extends LocatableDynamicForm i
prioritySelection.setValueMap(priorities);
prioritySelection.setValueIcons(priorityIcons);
prioritySelection.setDefaultValue(AlertPriority.MEDIUM.name());
- priorityStatic = new StaticTextItem("priorityStatic", "Priority");
+ priorityStatic = new StaticTextItem("priorityStatic", MSG.view_alerts_field_priority());
priorityStatic.setValueIcons(priorityIcons);
- enabledSelection = new RadioGroupItem("enabled", "Enabled");
+ enabledSelection = new RadioGroupItem("enabled", MSG.view_alerts_field_enabled());
LinkedHashMap<String, String> enabledYesNo = new LinkedHashMap<String, String>(2);
- enabledYesNo.put("yes", "Yes");
- enabledYesNo.put("no", "No");
+ enabledYesNo.put("yes", MSG.common_val_yes());
+ enabledYesNo.put("no", MSG.common_val_no());
enabledSelection.setValueMap(enabledYesNo);
enabledSelection.setDefaultValue("yes");
- enabledStatic = new StaticTextItem("enabledStatic", "Enabled");
+ enabledStatic = new StaticTextItem("enabledStatic", MSG.view_alerts_field_enabled());
- readOnlySelection = new RadioGroupItem("readOnly", "Protected");
+ readOnlySelection = new RadioGroupItem("readOnly", MSG.view_alerts_field_protected());
LinkedHashMap<String, String> readOnlyYesNo = new LinkedHashMap<String, String>(2);
- readOnlyYesNo.put("yes", "Yes");
- readOnlyYesNo.put("no", "No");
+ readOnlyYesNo.put("yes", MSG.common_val_yes());
+ readOnlyYesNo.put("no", MSG.common_val_no());
readOnlySelection.setValueMap(readOnlyYesNo);
readOnlySelection.setDefaultValue("yes");
- readOnlySelection
- .setPrompt("If true, this definition is protected from being changed by the parent definition. In other words, the parent definition settings will not override this definition.");
- readOnlyStatic = new StaticTextItem("readOnlyStatic", "Protected");
+ readOnlySelection.setPrompt(MSG.view_alerts_field_protected_tooltip());
+ readOnlyStatic = new StaticTextItem("readOnlyStatic", MSG.view_alerts_field_protected());
setFields(nameTextField, nameStatic, descriptionTextField, descriptionStatic, prioritySelection,
priorityStatic, enabledSelection, enabledStatic, readOnlySelection, readOnlyStatic);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
index e632915..eeac74a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
@@ -53,7 +53,7 @@ public class GroupAlertDefinitionsView extends AbstractAlertDefinitionsView {
private ResourcePermission permissions;
public GroupAlertDefinitionsView(String locatorId, ResourceGroupComposite groupComposite) {
- super(locatorId, "Group Alert Definitions");
+ super(locatorId, MSG.view_alert_definitions_table_title_group());
this.group = groupComposite.getResourceGroup();
this.permissions = groupComposite.getResourcePermission();
@@ -131,13 +131,13 @@ public class GroupAlertDefinitionsView extends AbstractAlertDefinitionsView {
@Override
public void onSuccess(Integer result) {
CoreGUI.getMessageCenter().notify(
- new Message("[" + result + "] group alert definitions enabled.", Severity.Info));
+ new Message(MSG.view_alert_definitions_enable_success(String.valueOf(result)), Severity.Info));
GroupAlertDefinitionsView.this.refresh();
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to enable group alert definitions", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_enable_failure(), caught);
}
});
}
@@ -159,13 +159,13 @@ public class GroupAlertDefinitionsView extends AbstractAlertDefinitionsView {
@Override
public void onSuccess(Integer result) {
CoreGUI.getMessageCenter().notify(
- new Message("[" + result + "] group alert definitions disabled.", Severity.Info));
+ new Message(MSG.view_alert_definitions_disable_success(String.valueOf(result)), Severity.Info));
GroupAlertDefinitionsView.this.refresh();
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to disable group alert definitions.", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_disable_failure(), caught);
}
});
}
@@ -187,13 +187,13 @@ public class GroupAlertDefinitionsView extends AbstractAlertDefinitionsView {
@Override
public void onSuccess(Integer result) {
CoreGUI.getMessageCenter().notify(
- new Message("[" + result + "] group alert definitions deleted.", Severity.Info));
+ new Message(MSG.view_alert_definitions_delete_success(String.valueOf(result)), Severity.Info));
GroupAlertDefinitionsView.this.refresh();
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to delete group alert definitions.", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_delete_failure(), caught);
}
});
}
@@ -205,13 +205,14 @@ public class GroupAlertDefinitionsView extends AbstractAlertDefinitionsView {
Integer.valueOf(this.group.getId()), new AsyncCallback<Integer>() {
@Override
public void onSuccess(Integer result) {
- CoreGUI.getMessageCenter().notify(new Message("Alert definition is created", Severity.Info));
+ CoreGUI.getMessageCenter().notify(
+ new Message(MSG.view_alert_definitions_create_success(), Severity.Info));
alertDefinition.setId(result.intValue());
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to create alert definition.", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_create_failure(), caught);
}
});
} else {
@@ -220,12 +221,12 @@ public class GroupAlertDefinitionsView extends AbstractAlertDefinitionsView {
@Override
public void onSuccess(AlertDefinition result) {
CoreGUI.getMessageCenter().notify(
- new Message("Group alert definition is updated.", Severity.Info));
+ new Message(MSG.view_alert_definitions_update_success(), Severity.Info));
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to update group alert definition.", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_update_failure(), caught);
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java
index 361ad78..3f4a4bd 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java
@@ -145,29 +145,40 @@ public class NewConditionEditor extends LocatableDynamicForm {
setMargin(20);
- conditionTypeSelectItem = new SelectItem("conditionType", "Condition Type");
+ conditionTypeSelectItem = new SelectItem("conditionType", MSG
+ .view_alert_definition_condition_editor_option_label());
LinkedHashMap<String, String> condTypes = new LinkedHashMap<String, String>(7);
- condTypes.put(AlertConditionCategory.AVAILABILITY.name(), "Availability Change");
+ condTypes.put(AlertConditionCategory.AVAILABILITY.name(), MSG
+ .view_alert_definition_condition_editor_option_availability());
if (supportsMetrics) {
- condTypes.put(AlertConditionCategory.THRESHOLD.name(), "Measurement Absolute Value Threshold");
- condTypes.put(AlertConditionCategory.BASELINE.name(), "Measurement Baseline Threshold");
- condTypes.put(AlertConditionCategory.CHANGE.name(), "Measurement Value Change");
+ condTypes.put(AlertConditionCategory.THRESHOLD.name(), MSG
+ .view_alert_definition_condition_editor_option_metric_threshold());
+ condTypes.put(AlertConditionCategory.BASELINE.name(), MSG
+ .view_alert_definition_condition_editor_option_metric_baseline());
+ condTypes.put(AlertConditionCategory.CHANGE.name(), MSG
+ .view_alert_definition_condition_editor_option_metric_change());
}
if (supportsCalltimeMetrics) {
- condTypes.put(ALERT_CONDITION_CATEGORY_CALLTIME_THRESHOLD, "Calltime Value Threshold");
- condTypes.put(ALERT_CONDITION_CATEGORY_CALLTIME_CHANGE, "Calltime Value Change");
+ condTypes.put(ALERT_CONDITION_CATEGORY_CALLTIME_THRESHOLD, MSG
+ .view_alert_definition_condition_editor_option_metric_calltime_threshold());
+ condTypes.put(ALERT_CONDITION_CATEGORY_CALLTIME_CHANGE, MSG
+ .view_alert_definition_condition_editor_option_metric_calltime_change());
}
if (supportsTraits) {
- condTypes.put(AlertConditionCategory.TRAIT.name(), "Trait Value Change");
+ condTypes.put(AlertConditionCategory.TRAIT.name(), MSG
+ .view_alert_definition_condition_editor_option_metric_trait_change());
}
if (supportsOperations) {
- condTypes.put(AlertConditionCategory.CONTROL.name(), "Operation Execution");
+ condTypes.put(AlertConditionCategory.CONTROL.name(), MSG
+ .view_alert_definition_condition_editor_option_operation());
}
if (supportsResourceConfig) {
- condTypes.put(AlertConditionCategory.RESOURCE_CONFIG.name(), "Resource Configuration Change");
+ condTypes.put(AlertConditionCategory.RESOURCE_CONFIG.name(), MSG
+ .view_alert_definition_condition_editor_option_resource_configuration());
}
if (supportsEvents) {
- condTypes.put(AlertConditionCategory.EVENT.name(), "Event Detection");
+ condTypes.put(AlertConditionCategory.EVENT.name(), MSG
+ .view_alert_definition_condition_editor_option_event());
}
conditionTypeSelectItem.setValueMap(condTypes);
conditionTypeSelectItem.setDefaultValue(AlertConditionCategory.AVAILABILITY.name());
@@ -183,7 +194,7 @@ public class NewConditionEditor extends LocatableDynamicForm {
spacer2.setColSpan(2);
spacer2.setHeight(5);
- ButtonItem ok = new ButtonItem("okButtonItem", "OK");
+ ButtonItem ok = new ButtonItem("okButtonItem", MSG.common_button_ok());
ok.setEndRow(false);
ok.setAlign(Alignment.RIGHT);
ok.addClickHandler(new ClickHandler() {
@@ -196,7 +207,7 @@ public class NewConditionEditor extends LocatableDynamicForm {
}
});
- ButtonItem cancel = new ButtonItem("cancelButtonItem", "Cancel");
+ ButtonItem cancel = new ButtonItem("cancelButtonItem", MSG.common_button_cancel());
cancel.setStartRow(false);
cancel.setAlign(Alignment.LEFT);
cancel.addClickHandler(new ClickHandler() {
@@ -354,7 +365,8 @@ public class NewConditionEditor extends LocatableDynamicForm {
}
default: {
- CoreGUI.getErrorHandler().handleError("Invalid alert category selected: " + category); // should never happen
+ CoreGUI.getErrorHandler()
+ .handleError(MSG.view_alert_common_tab_invalid_condition_category(category.name())); // should never happen
break;
}
}
@@ -367,17 +379,17 @@ public class NewConditionEditor extends LocatableDynamicForm {
ShowIfCategoryFunction ifFunc = new ShowIfCategoryFunction(AlertConditionCategory.THRESHOLD);
- String helpStr = "Specify the threshold value that, when violated, triggers the condition. The value you specify is an absolute value with an optional units specifier.";
+ String helpStr = MSG.view_alert_definition_condition_editor_metric_threshold_tooltip();
StaticTextItem helpItem = buildHelpTextItem("thresholdHelp", helpStr, ifFunc);
formItems.add(helpItem);
formItems.add(buildMetricDropDownMenu(THRESHOLD_METRIC_ITEMNAME, false, ifFunc));
formItems.add(buildComparatorDropDownMenu(THRESHOLD_COMPARATOR_ITEMNAME, ifFunc));
- TextItem absoluteValue = new TextItem(THRESHOLD_ABSVALUE_ITEMNAME, "Metric Value");
+ TextItem absoluteValue = new TextItem(THRESHOLD_ABSVALUE_ITEMNAME, MSG
+ .view_alert_definition_condition_editor_metric_threshold_value());
absoluteValue.setWrapTitle(false);
absoluteValue.setRequired(true);
- absoluteValue
- .setTooltip("The threshold value of the metric that will trigger the condition when compared using the selected comparator.");
+ absoluteValue.setTooltip(MSG.view_alert_definition_condition_editor_metric_threshold_value_tooltip());
absoluteValue.setShowIfCondition(ifFunc);
formItems.add(absoluteValue);
@@ -390,7 +402,7 @@ public class NewConditionEditor extends LocatableDynamicForm {
ShowIfCategoryFunction ifFunc = new ShowIfCategoryFunction(AlertConditionCategory.BASELINE);
- String helpStr = "Specify the baseline value that must be violated to trigger the condition. The value you specify is a percentage of the given baseline value.";
+ String helpStr = MSG.view_alert_definition_condition_editor_metric_baseline_tooltip();
StaticTextItem helpItem = buildHelpTextItem("baselineHelp", helpStr, ifFunc);
formItems.add(helpItem);
@@ -398,19 +410,20 @@ public class NewConditionEditor extends LocatableDynamicForm {
formItems.add(buildMetricDropDownMenu(BASELINE_METRIC_ITEMNAME, true, ifFunc));
formItems.add(buildComparatorDropDownMenu(BASELINE_COMPARATOR_ITEMNAME, ifFunc));
- TextItem baselinePercentage = new TextItem(BASELINE_PERCENTAGE_ITEMNAME, "Baseline Percentage");
+ TextItem baselinePercentage = new TextItem(BASELINE_PERCENTAGE_ITEMNAME, MSG
+ .view_alert_definition_condition_editor_metric_baseline_percentage());
baselinePercentage.setWrapTitle(false);
baselinePercentage.setRequired(true);
- baselinePercentage
- .setTooltip("A collected metric value will trigger this condition when compared to this percentage of the selected baseline value using the selected comparator");
+ baselinePercentage.setTooltip(MSG.view_alert_definition_condition_editor_metric_baseline_percentage_tooltip());
baselinePercentage.setShowIfCondition(ifFunc);
formItems.add(baselinePercentage);
- SelectItem baselineSelection = new SelectItem(BASELINE_SELECTION_ITEMNAME, "Baseline");
+ SelectItem baselineSelection = new SelectItem(BASELINE_SELECTION_ITEMNAME, MSG
+ .view_alert_definition_condition_editor_metric_baseline_value());
LinkedHashMap<String, String> baselines = new LinkedHashMap<String, String>(3);
- baselines.put("min", "Minimum"); // TODO can we have the current value of the min baseline
- baselines.put("mean", "Average"); // TODO can we have the current value of the avg baseline
- baselines.put("max", "Maximum"); // TODO can we have the current value of the max baseline
+ baselines.put("min", MSG.view_alert_definition_condition_editor_common_min()); // TODO can we have the current value of the min baseline
+ baselines.put("mean", MSG.view_alert_definition_condition_editor_common_avg()); // TODO can we have the current value of the avg baseline
+ baselines.put("max", MSG.view_alert_definition_condition_editor_common_max()); // TODO can we have the current value of the max baseline
baselineSelection.setValueMap(baselines);
baselineSelection.setDefaultValue("mean");
baselineSelection.setWrapTitle(false);
@@ -427,7 +440,7 @@ public class NewConditionEditor extends LocatableDynamicForm {
ShowIfCategoryFunction ifFunc = new ShowIfCategoryFunction(AlertConditionCategory.CHANGE);
- String helpStr = "Specify the metric whose value must change to trigger the condition.";
+ String helpStr = MSG.view_alert_definition_condition_editor_metric_change_tooltip();
StaticTextItem helpItem = buildHelpTextItem("changeMetricHelp", helpStr, ifFunc);
formItems.add(helpItem);
@@ -441,18 +454,20 @@ public class NewConditionEditor extends LocatableDynamicForm {
ShowIfCategoryFunction ifFunc = new ShowIfCategoryFunction(ALERT_CONDITION_CATEGORY_CALLTIME_THRESHOLD);
- String helpStr = "Specify the calltime threshold value that, when violated, triggers the condition. The value you specify is an absolute value with an optional units specifier. You also must specify which calltime limit to compare the value with (minimum, maximum or average calltime value).";
+ String helpStr = MSG.view_alert_definition_condition_editor_metric_calltime_threshold_tooltip();
StaticTextItem helpItem = buildHelpTextItem("calltimeThresholdHelp", helpStr, ifFunc);
formItems.add(helpItem);
formItems.add(buildCalltimeMetricDropDownMenu(CALLTIME_THRESHOLD_METRIC_ITEMNAME, ifFunc));
- SelectItem minMaxAvgSelection = new SelectItem(CALLTIME_THRESHOLD_MINMAXAVG_ITEMNAME, "Calltime Limit");
+ SelectItem minMaxAvgSelection = new SelectItem(CALLTIME_THRESHOLD_MINMAXAVG_ITEMNAME, MSG
+ .view_alert_definition_condition_editor_metric_calltime_common_limit());
LinkedHashMap<String, String> limits = new LinkedHashMap<String, String>(3);
- limits.put("MIN", "Minimum");
- limits.put("AVG", "Average");
- limits.put("MAX", "Maximum");
- minMaxAvgSelection.setTooltip("The calltime limit value that is to be compared with the given value");
+ limits.put("MIN", MSG.view_alert_definition_condition_editor_common_min());
+ limits.put("AVG", MSG.view_alert_definition_condition_editor_common_avg());
+ limits.put("MAX", MSG.view_alert_definition_condition_editor_common_max());
+ minMaxAvgSelection
+ .setTooltip(MSG.view_alert_definition_condition_editor_metric_calltime_common_limit_tooltip());
minMaxAvgSelection.setValueMap(limits);
minMaxAvgSelection.setDefaultValue("AVG");
minMaxAvgSelection.setWrapTitle(false);
@@ -462,18 +477,18 @@ public class NewConditionEditor extends LocatableDynamicForm {
formItems.add(minMaxAvgSelection);
formItems.add(buildComparatorDropDownMenu(CALLTIME_THRESHOLD_COMPARATOR_ITEMNAME, ifFunc));
- TextItem absoluteValue = new TextItem(CALLTIME_THRESHOLD_ABSVALUE_ITEMNAME, "Calltime Value");
+ TextItem absoluteValue = new TextItem(CALLTIME_THRESHOLD_ABSVALUE_ITEMNAME, MSG
+ .view_alert_definition_condition_editor_metric_calltime_threshold_value());
absoluteValue.setWrapTitle(false);
absoluteValue.setRequired(true);
- absoluteValue
- .setTooltip("The threshold value of the metric that will trigger the condition when compared using the selected comparator.");
+ absoluteValue.setTooltip(MSG.view_alert_definition_condition_editor_metric_calltime_threshold_value_tooltip());
absoluteValue.setShowIfCondition(ifFunc);
formItems.add(absoluteValue);
- TextItem regex = new TextItem(CALLTIME_THRESHOLD_REGEX_ITEMNAME, "Regular Expression");
+ TextItem regex = new TextItem(CALLTIME_THRESHOLD_REGEX_ITEMNAME, MSG
+ .view_alert_definition_condition_editor_metric_calltime_common_regex());
regex.setRequired(false);
- regex
- .setTooltip("If specified, this is a regular expression that must match a call destination in order to trigger the condition.");
+ regex.setTooltip(MSG.view_alert_definition_condition_editor_metric_calltime_common_regex_tooltip());
regex.setWrapTitle(false);
regex.setShowIfCondition(ifFunc);
formItems.add(regex);
@@ -486,18 +501,20 @@ public class NewConditionEditor extends LocatableDynamicForm {
ShowIfCategoryFunction ifFunc = new ShowIfCategoryFunction(ALERT_CONDITION_CATEGORY_CALLTIME_CHANGE);
- String helpStr = "Specify the calltime value that, when changed at least a specified amount, triggers the condition. You must specify which calltime limit to check (minimum, maximum or average calltime value) and the percentage of change that must occur.";
+ String helpStr = MSG.view_alert_definition_condition_editor_metric_calltime_change_tooltip();
StaticTextItem helpItem = buildHelpTextItem("calltimeChangeHelp", helpStr, ifFunc);
formItems.add(helpItem);
formItems.add(buildCalltimeMetricDropDownMenu(CALLTIME_CHANGE_METRIC_ITEMNAME, ifFunc));
- SelectItem minMaxAvgSelection = new SelectItem(CALLTIME_CHANGE_MINMAXAVG_ITEMNAME, "Calltime Limit");
+ SelectItem minMaxAvgSelection = new SelectItem(CALLTIME_CHANGE_MINMAXAVG_ITEMNAME, MSG
+ .view_alert_definition_condition_editor_metric_calltime_common_limit());
LinkedHashMap<String, String> limits = new LinkedHashMap<String, String>(3);
- limits.put("MIN", "Minimum");
- limits.put("AVG", "Average");
- limits.put("MAX", "Maximum");
- minMaxAvgSelection.setTooltip("The calltime limit value that is to be checked for change");
+ limits.put("MIN", MSG.view_alert_definition_condition_editor_common_min());
+ limits.put("AVG", MSG.view_alert_definition_condition_editor_common_avg());
+ limits.put("MAX", MSG.view_alert_definition_condition_editor_common_max());
+ minMaxAvgSelection
+ .setTooltip(MSG.view_alert_definition_condition_editor_metric_calltime_common_limit_tooltip());
minMaxAvgSelection.setValueMap(limits);
minMaxAvgSelection.setDefaultValue("AVG");
minMaxAvgSelection.setWrapTitle(false);
@@ -508,18 +525,18 @@ public class NewConditionEditor extends LocatableDynamicForm {
formItems.add(buildCalltimeComparatorDropDownMenu(CALLTIME_CHANGE_COMPARATOR_ITEMNAME, ifFunc));
- TextItem percentage = new TextItem(CALLTIME_CHANGE_PERCENTAGE_ITEMNAME, "Percentage Change");
+ TextItem percentage = new TextItem(CALLTIME_CHANGE_PERCENTAGE_ITEMNAME, MSG
+ .view_alert_definition_condition_editor_metric_calltime_change_percentage());
percentage.setWrapTitle(false);
percentage.setRequired(true);
- percentage
- .setTooltip("A collected calltime value will trigger this condition when it differs by at least this percentage of the selected calltime limit value");
+ percentage.setTooltip(MSG.view_alert_definition_condition_editor_metric_calltime_change_percentage_tooltip());
percentage.setShowIfCondition(ifFunc);
formItems.add(percentage);
- TextItem regex = new TextItem(CALLTIME_CHANGE_REGEX_ITEMNAME, "Regular Expression");
+ TextItem regex = new TextItem(CALLTIME_CHANGE_REGEX_ITEMNAME, MSG
+ .view_alert_definition_condition_editor_metric_calltime_common_regex());
regex.setRequired(false);
- regex
- .setTooltip("If specified, this is a regular expression that must match a call destination in order to trigger the condition.");
+ regex.setTooltip(MSG.view_alert_definition_condition_editor_metric_calltime_common_regex_tooltip());
regex.setWrapTitle(false);
regex.setShowIfCondition(ifFunc);
formItems.add(regex);
@@ -532,7 +549,7 @@ public class NewConditionEditor extends LocatableDynamicForm {
ShowIfCategoryFunction ifFunc = new ShowIfCategoryFunction(AlertConditionCategory.TRAIT);
- String helpStr = "Specify the trait whose value must change to trigger the condition.";
+ String helpStr = MSG.view_alert_definition_condition_editor_metric_trait_change_tooltip();
StaticTextItem helpItem = buildHelpTextItem("traitHelp", helpStr, ifFunc);
formItems.add(helpItem);
@@ -543,7 +560,8 @@ public class NewConditionEditor extends LocatableDynamicForm {
}
}
- SelectItem traitSelection = new SelectItem(TRAIT_METRIC_ITEMNAME, "Trait");
+ SelectItem traitSelection = new SelectItem(TRAIT_METRIC_ITEMNAME, MSG
+ .view_alert_definition_condition_editor_metric_trait_change_value());
traitSelection.setValueMap(traitsMap);
traitSelection.setDefaultValue(traitsMap.keySet().iterator().next()); // just use the first one
traitSelection.setWidth("*");
@@ -559,14 +577,15 @@ public class NewConditionEditor extends LocatableDynamicForm {
ShowIfCategoryFunction ifFunc = new ShowIfCategoryFunction(AlertConditionCategory.AVAILABILITY);
- String helpStr = "Specify the availability state change that will trigger the condition.";
+ String helpStr = MSG.view_alert_definition_condition_editor_avilability_tooltip();
StaticTextItem helpItem = buildHelpTextItem("availabilityHelp", helpStr, ifFunc);
formItems.add(helpItem);
- SelectItem selection = new SelectItem(AVAILABILITY_ITEMNAME, "Availability");
+ SelectItem selection = new SelectItem(AVAILABILITY_ITEMNAME, MSG
+ .view_alert_definition_condition_editor_avilability_value());
LinkedHashMap<String, String> avails = new LinkedHashMap<String, String>(2);
- avails.put(AvailabilityType.UP.name(), "Goes UP");
- avails.put(AvailabilityType.DOWN.name(), "Goes DOWN");
+ avails.put(AvailabilityType.UP.name(), MSG.view_alert_definition_condition_editor_avilability_option_up());
+ avails.put(AvailabilityType.DOWN.name(), MSG.view_alert_definition_condition_editor_avilability_option_down());
selection.setValueMap(avails);
selection.setDefaultValue(AvailabilityType.DOWN.name());
selection.setShowIfCondition(ifFunc);
@@ -580,7 +599,7 @@ public class NewConditionEditor extends LocatableDynamicForm {
ShowIfCategoryFunction ifFunc = new ShowIfCategoryFunction(AlertConditionCategory.CONTROL);
- String helpStr = "Specify the result that must occur when the selected operation is executed in order to trigger the condition.";
+ String helpStr = MSG.view_alert_definition_condition_editor_operation_tooltip();
StaticTextItem helpItem = buildHelpTextItem("operationHelp", helpStr, ifFunc);
formItems.add(helpItem);
@@ -589,7 +608,8 @@ public class NewConditionEditor extends LocatableDynamicForm {
ops.put(opDef.getName(), opDef.getDisplayName());
}
- SelectItem opSelection = new SelectItem(OPERATION_NAME_ITEMNAME, "Operation");
+ SelectItem opSelection = new SelectItem(OPERATION_NAME_ITEMNAME, MSG
+ .view_alert_definition_condition_editor_operation_value());
opSelection.setValueMap(ops);
opSelection.setDefaultValue(ops.keySet().iterator().next()); // just use the first one
opSelection.setWidth("*");
@@ -597,12 +617,17 @@ public class NewConditionEditor extends LocatableDynamicForm {
opSelection.setShowIfCondition(ifFunc);
formItems.add(opSelection);
- SelectItem opResultsSelection = new SelectItem(OPERATION_RESULTS_ITEMNAME, "Operation Status");
+ SelectItem opResultsSelection = new SelectItem(OPERATION_RESULTS_ITEMNAME, MSG
+ .view_alert_definition_condition_editor_operation_status());
LinkedHashMap<String, String> operationStatuses = new LinkedHashMap<String, String>(4);
- operationStatuses.put(OperationRequestStatus.INPROGRESS.name(), OperationRequestStatus.INPROGRESS.name());
- operationStatuses.put(OperationRequestStatus.SUCCESS.name(), OperationRequestStatus.SUCCESS.name());
- operationStatuses.put(OperationRequestStatus.FAILURE.name(), OperationRequestStatus.FAILURE.name());
- operationStatuses.put(OperationRequestStatus.CANCELED.name(), OperationRequestStatus.CANCELED.name());
+ operationStatuses.put(OperationRequestStatus.INPROGRESS.name(), MSG
+ .view_alert_definition_condition_editor_operation_status_inprogress());
+ operationStatuses.put(OperationRequestStatus.SUCCESS.name(), MSG
+ .view_alert_definition_condition_editor_operation_status_success());
+ operationStatuses.put(OperationRequestStatus.FAILURE.name(), MSG
+ .view_alert_definition_condition_editor_operation_status_failure());
+ operationStatuses.put(OperationRequestStatus.CANCELED.name(), MSG
+ .view_alert_definition_condition_editor_operation_status_canceled());
opResultsSelection.setValueMap(operationStatuses);
opResultsSelection.setDefaultValue(OperationRequestStatus.FAILURE.name());
opResultsSelection.setWrapTitle(false);
@@ -617,27 +642,28 @@ public class NewConditionEditor extends LocatableDynamicForm {
ShowIfCategoryFunction ifFunc = new ShowIfCategoryFunction(AlertConditionCategory.EVENT);
- String helpStr = "Specify the event severity that an event message must be reported with in order to trigger this condition. If you specify an optional regular expression, the event message must also match that regular expression in order for the condition to trigger.";
+ String helpStr = MSG.view_alert_definition_condition_editor_event_tooltip();
StaticTextItem helpItem = buildHelpTextItem("eventHelp", helpStr, ifFunc);
formItems.add(helpItem);
- SelectItem eventSeveritySelection = new SelectItem(EVENT_SEVERITY_ITEMNAME, "Event Severity");
+ SelectItem eventSeveritySelection = new SelectItem(EVENT_SEVERITY_ITEMNAME, MSG
+ .view_alert_definition_condition_editor_event_severity());
LinkedHashMap<String, String> severities = new LinkedHashMap<String, String>(5);
- severities.put(EventSeverity.DEBUG.name(), EventSeverity.DEBUG.name());
- severities.put(EventSeverity.INFO.name(), EventSeverity.INFO.name());
- severities.put(EventSeverity.WARN.name(), EventSeverity.WARN.name());
- severities.put(EventSeverity.ERROR.name(), EventSeverity.ERROR.name());
- severities.put(EventSeverity.FATAL.name(), EventSeverity.FATAL.name());
+ severities.put(EventSeverity.DEBUG.name(), MSG.view_alert_definition_condition_editor_event_severity_debug());
+ severities.put(EventSeverity.INFO.name(), MSG.view_alert_definition_condition_editor_event_severity_info());
+ severities.put(EventSeverity.WARN.name(), MSG.view_alert_definition_condition_editor_event_severity_warn());
+ severities.put(EventSeverity.ERROR.name(), MSG.view_alert_definition_condition_editor_event_severity_error());
+ severities.put(EventSeverity.FATAL.name(), MSG.view_alert_definition_condition_editor_event_severity_fatal());
eventSeveritySelection.setValueMap(severities);
eventSeveritySelection.setDefaultValue(EventSeverity.ERROR.name());
eventSeveritySelection.setWrapTitle(false);
eventSeveritySelection.setShowIfCondition(ifFunc);
formItems.add(eventSeveritySelection);
- TextItem eventRegex = new TextItem(EVENT_REGEX_ITEMNAME, "Regular Expression");
+ TextItem eventRegex = new TextItem(EVENT_REGEX_ITEMNAME, MSG
+ .view_alert_definition_condition_editor_event_regex());
eventRegex.setRequired(false);
- eventRegex
- .setTooltip("If specified, this is a regular expression that must match a collected event message in order to trigger the condition.");
+ eventRegex.setTooltip(MSG.view_alert_definition_condition_editor_event_regex_tooltip());
eventRegex.setWrapTitle(false);
eventRegex.setShowIfCondition(ifFunc);
formItems.add(eventRegex);
@@ -650,7 +676,7 @@ public class NewConditionEditor extends LocatableDynamicForm {
ShowIfCategoryFunction ifFunc = new ShowIfCategoryFunction(AlertConditionCategory.RESOURCE_CONFIG);
- String helpStr = "This condition is triggered when the resource configuration changes.";
+ String helpStr = MSG.view_alert_definition_condition_editor_resource_configuration_tooltip();
StaticTextItem helpItem = buildHelpTextItem("changeConfigHelp", helpStr, ifFunc);
formItems.add(helpItem);
@@ -668,7 +694,8 @@ public class NewConditionEditor extends LocatableDynamicForm {
}
}
- SelectItem metricSelection = new SelectItem(itemName, "Metric");
+ SelectItem metricSelection = new SelectItem(itemName, MSG
+ .view_alert_definition_condition_editor_metric_threshold_name());
metricSelection.setValueMap(metricsMap);
metricSelection.setDefaultValue(metricsMap.keySet().iterator().next()); // just use the first one
metricSelection.setWidth("*");
@@ -686,7 +713,8 @@ public class NewConditionEditor extends LocatableDynamicForm {
}
}
- SelectItem metricSelection = new SelectItem(itemName, "Metric");
+ SelectItem metricSelection = new SelectItem(itemName, MSG
+ .view_alert_definition_condition_editor_metric_calltime_common_name());
metricSelection.setValueMap(metricsMap);
metricSelection.setDefaultValue(metricsMap.keySet().iterator().next()); // just use the first one
metricSelection.setWidth("*");
@@ -698,14 +726,19 @@ public class NewConditionEditor extends LocatableDynamicForm {
private SelectItem buildComparatorDropDownMenu(String itemName, FormItemIfFunction ifFunc) {
LinkedHashMap<String, String> comparators = new LinkedHashMap<String, String>(3);
- comparators.put("<", "< (Less than)");
- comparators.put("=", "= (Equal to)");
- comparators.put(">", "> (Greater than)");
-
- SelectItem comparatorSelection = new SelectItem(itemName, "Comparator");
+ comparators.put("<", "< (" + MSG.view_alert_definition_condition_editor_metric_threshold_comparator_less()
+ + ")");
+ comparators.put("=", "= (" + MSG.view_alert_definition_condition_editor_metric_threshold_comparator_equal()
+ + ")");
+ comparators.put(">", "> (" + MSG.view_alert_definition_condition_editor_metric_threshold_comparator_greater()
+ + ")");
+
+ SelectItem comparatorSelection = new SelectItem(itemName, MSG
+ .view_alert_definition_condition_editor_metric_threshold_comparator());
comparatorSelection.setValueMap(comparators);
comparatorSelection.setDefaultValue("<");
- comparatorSelection.setTooltip("How a collected metric value should be compared to the given threshold value");
+ comparatorSelection
+ .setTooltip(MSG.view_alert_definition_condition_editor_metric_threshold_comparator_tooltip());
comparatorSelection.setShowIfCondition(ifFunc);
return comparatorSelection;
}
@@ -713,14 +746,16 @@ public class NewConditionEditor extends LocatableDynamicForm {
private SelectItem buildCalltimeComparatorDropDownMenu(String itemName, FormItemIfFunction ifFunc) {
LinkedHashMap<String, String> comparators = new LinkedHashMap<String, String>(3);
- comparators.put("LO", "Shrinks");
- comparators.put("CH", "Changes");
- comparators.put("HI", "Grows");
+ comparators.put("LO", MSG.view_alert_definition_condition_editor_metric_calltime_common_comparator_shrinks());
+ comparators.put("CH", MSG.view_alert_definition_condition_editor_metric_calltime_common_comparator_changes());
+ comparators.put("HI", MSG.view_alert_definition_condition_editor_metric_calltime_common_comparator_grows());
- SelectItem comparatorSelection = new SelectItem(itemName, "Comparator");
+ SelectItem comparatorSelection = new SelectItem(itemName, MSG
+ .view_alert_definition_condition_editor_metric_calltime_common_comparator());
comparatorSelection.setValueMap(comparators);
comparatorSelection.setDefaultValue("CH");
- comparatorSelection.setTooltip("How a collected calltime value should be compared to the given calltime limit");
+ comparatorSelection.setTooltip(MSG
+ .view_alert_definition_condition_editor_metric_calltime_common_comparator_tooltip());
comparatorSelection.setShowIfCondition(ifFunc);
return comparatorSelection;
}
@@ -742,7 +777,8 @@ public class NewConditionEditor extends LocatableDynamicForm {
return def;
}
}
- CoreGUI.getErrorHandler().handleError("Should have found metric definition - something is wrong");
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_alert_definition_condition_editor_metric_common_definition_not_found());
return null;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java
index 68c07f4..c1eb705 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java
@@ -81,7 +81,8 @@ public class NewNotificationEditor extends LocatableDynamicForm {
senderCanvasItem.setShowTitle(false);
senderCanvasItem.setColSpan(2);
- notificationSenderSelectItem = new SelectItem("notificationSender", "Notification Sender");
+ notificationSenderSelectItem = new SelectItem("notificationSender", MSG
+ .view_alert_definition_notification_editor_sender());
notificationSenderSelectItem.setDefaultToFirstOption(true);
notificationSenderSelectItem.setWrapTitle(false);
notificationSenderSelectItem.setRedrawOnChange(true);
@@ -115,13 +116,15 @@ public class NewNotificationEditor extends LocatableDynamicForm {
switchToAlertSender(result[0]);
senderCanvasItem.show();
} else {
- CoreGUI.getErrorHandler().handleError("No alert senders available");
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_alert_definition_notification_editor_none_available());
}
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Cannot get alert senders", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definition_notification_editor_loadFailed(),
+ caught);
}
});
}
@@ -142,7 +145,7 @@ public class NewNotificationEditor extends LocatableDynamicForm {
spacer2.setColSpan(2);
spacer2.setHeight(5);
- ButtonItem ok = new ButtonItem("okButtonItem", "OK");
+ ButtonItem ok = new ButtonItem("okButtonItem", MSG.common_button_ok());
ok.setEndRow(false);
ok.setAlign(Alignment.RIGHT);
ok.addClickHandler(new ClickHandler() {
@@ -159,7 +162,7 @@ public class NewNotificationEditor extends LocatableDynamicForm {
}
});
- ButtonItem cancel = new ButtonItem("cancelButtonItem", "Cancel");
+ ButtonItem cancel = new ButtonItem("cancelButtonItem", MSG.common_button_cancel());
cancel.setStartRow(false);
cancel.setAlign(Alignment.LEFT);
cancel.addClickHandler(new ClickHandler() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java
index 947ca60..f72846d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java
@@ -178,10 +178,12 @@ public class NotificationsAlertDefinitionForm extends LocatableVLayout implement
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField senderField = new DataSourceTextField(FIELD_SENDER, "Sender");
+ DataSourceTextField senderField = new DataSourceTextField(FIELD_SENDER, MSG
+ .view_alert_definition_notification_editor_field_sender());
fields.add(senderField);
- DataSourceTextField configField = new DataSourceTextField(FIELD_CONFIGURATION, "Configuration");
+ DataSourceTextField configField = new DataSourceTextField(FIELD_CONFIGURATION, MSG
+ .view_alert_definition_notification_editor_field_configuration());
fields.add(configField);
return fields;
@@ -198,7 +200,8 @@ public class NotificationsAlertDefinitionForm extends LocatableVLayout implement
record.setAttribute(FIELD_OBJECT, from);
record.setAttribute(FIELD_SENDER, from.getSenderName());
// our executeFetch will fill in the real value for FIELD_CONFIGURATION
- record.setAttribute(FIELD_CONFIGURATION, "(unknown)");
+ record.setAttribute(FIELD_CONFIGURATION, "("
+ + MSG.view_alert_definition_notification_editor_field_configuration_not_loaded() + ")");
return record;
}
@@ -221,8 +224,8 @@ public class NotificationsAlertDefinitionForm extends LocatableVLayout implement
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to get notification configuration preview",
- caught);
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_alert_definition_notification_editor_field_configuration_loadFailed(), caught);
response.setData(records);
processResponse(request.getRequestId(), response);
}
@@ -241,9 +244,11 @@ public class NotificationsAlertDefinitionForm extends LocatableVLayout implement
@Override
protected void configureTable() {
- ListGridField senderField = new ListGridField(FIELD_SENDER, "Sender");
+ ListGridField senderField = new ListGridField(FIELD_SENDER, MSG
+ .view_alert_definition_notification_editor_field_sender());
senderField.setWidth("25%");
- ListGridField configField = new ListGridField(FIELD_CONFIGURATION, "Configuration");
+ ListGridField configField = new ListGridField(FIELD_CONFIGURATION, MSG
+ .view_alert_definition_notification_editor_field_configuration());
configField.setWidth("75%");
getListGrid().setFields(senderField, configField);
@@ -260,34 +265,34 @@ public class NotificationsAlertDefinitionForm extends LocatableVLayout implement
}
});
- addTableAction(this.extendLocatorId("add"), "Add", null, new AbstractTableAction() {
+ addTableAction(this.extendLocatorId("add"), MSG.common_button_add(), null, new AbstractTableAction() {
@Override
public void executeAction(ListGridRecord[] selection, Object actionValue) {
popupNotificationEditor(null);
}
});
- addTableAction(this.extendLocatorId("delete"), "Delete",
- "Are you sure you want to delete the selected alert notifications?", new AbstractTableAction(
- TableActionEnablement.ANY) {
- @Override
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- for (ListGridRecord record : selection) {
- AlertNotification notif = ((NotificationDataSource) getDataSource()).copyValues(record);
- notifications.remove(notif);
- }
- table.refresh();
+ addTableAction(this.extendLocatorId("delete"), MSG.common_button_delete(), MSG
+ .view_alert_definition_notification_editor_delete_confirm(), new AbstractTableAction(
+ TableActionEnablement.ANY) {
+ @Override
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ for (ListGridRecord record : selection) {
+ AlertNotification notif = ((NotificationDataSource) getDataSource()).copyValues(record);
+ notifications.remove(notif);
}
- });
+ table.refresh();
+ }
+ });
}
private void popupNotificationEditor(AlertNotification notifToEdit) {
final Window winModal = new LocatableWindow(NotificationsAlertDefinitionForm.this
.extendLocatorId("notificationEditorWindow"));
if (notifToEdit == null) {
- winModal.setTitle("Add Notification");
+ winModal.setTitle(MSG.view_alert_definition_notification_editor_title_add());
} else {
- winModal.setTitle("Edit Notification");
+ winModal.setTitle(MSG.view_alert_definition_notification_editor_title_edit());
}
winModal.setOverflow(Overflow.VISIBLE);
winModal.setShowMinimizeButton(false);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/RecoveryAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/RecoveryAlertDefinitionForm.java
index cf8af6a..a3cfea1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/RecoveryAlertDefinitionForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/RecoveryAlertDefinitionForm.java
@@ -95,7 +95,7 @@ public class RecoveryAlertDefinitionForm extends LocatableDynamicForm implements
refreshWidgets(allAlertDefinitions);
disableWhenFiredSelection.setValue(alertDef.getWillRecover() ? "yes" : "no");
- disableWhenFiredStatic.setValue(alertDef.getWillRecover() ? "Yes" : "No");
+ disableWhenFiredStatic.setValue(alertDef.getWillRecover() ? MSG.common_val_yes() : MSG.common_val_no());
}
markForRedraw();
@@ -150,28 +150,31 @@ public class RecoveryAlertDefinitionForm extends LocatableDynamicForm implements
private void buildForm() {
if (!formBuilt) {
- disableWhenFiredSelection = new RadioGroupItem("disableWhenFired", "Disable When Fired");
+ disableWhenFiredSelection = new RadioGroupItem("disableWhenFired", MSG
+ .view_alert_definition_recovery_editor_disable_when_fired());
LinkedHashMap<String, String> yesNo = new LinkedHashMap<String, String>(2);
- yesNo.put("yes", "Yes");
- yesNo.put("no", "No");
+ yesNo.put("yes", MSG.common_val_yes());
+ yesNo.put("no", MSG.common_val_no());
disableWhenFiredSelection.setValueMap(yesNo);
disableWhenFiredSelection.setDefaultValue("no");
disableWhenFiredSelection.setWrapTitle(false);
disableWhenFiredSelection.setWidth(300);
disableWhenFiredSelection.setHoverWidth(300);
disableWhenFiredSelection
- .setTooltip("Indicates if this alert will be disabled after it fires. Once disabled, the alert can be manually re-enabled or a recovery alert can be set up to automatically re-enable it. If this alert is a recovery alert itself, this setting cannot be turned on.");
- disableWhenFiredStatic = new StaticTextItem("disableWhenFiredStatic", "Disable When Fired");
+ .setTooltip(MSG.view_alert_definition_recovery_editor_disable_when_fired_tooltip());
+ disableWhenFiredStatic = new StaticTextItem("disableWhenFiredStatic", MSG
+ .view_alert_definition_recovery_editor_disable_when_fired());
disableWhenFiredStatic.setWrapTitle(false);
- recoverAlertSelection = new SelectItem("recoveryAlert", "Recover Alert");
+ recoverAlertSelection = new SelectItem("recoveryAlert", MSG
+ .view_alert_definition_recovery_editor_recovery_alert());
recoverAlertSelection.setDefaultValue("0");
recoverAlertSelection.setWrapTitle(false);
recoverAlertSelection.setHoverWidth(300);
- recoverAlertSelection
- .setTooltip("The target alert that will be recovered (i.e. re-enabled) after this alert triggers. Do not select an alert here if you are not defining a recovery alert.");
+ recoverAlertSelection.setTooltip(MSG.view_alert_definition_recovery_editor_recovery_alert_tooltip());
- recoverAlertStatic = new StaticTextItem("recoveryAlertStatic", "Recover Alert");
+ recoverAlertStatic = new StaticTextItem("recoveryAlertStatic", MSG
+ .view_alert_definition_recovery_editor_recovery_alert());
recoverAlertStatic.setDefaultValue(getNoRecoveryMenuItemTitle());
recoverAlertStatic.setWrapTitle(false);
recoverAlertStatic.setWidth(300);
@@ -217,7 +220,8 @@ public class RecoveryAlertDefinitionForm extends LocatableDynamicForm implements
GWTServiceLookup.getAlertDefinitionService().findAlertDefinitionsByCriteria(criteria,
new AsyncCallback<PageList<AlertDefinition>>() {
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Cannot build recovery menu", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definition_recovery_editor_loadFailed(),
+ caught);
}
public void onSuccess(PageList<AlertDefinition> result) {
@@ -275,7 +279,7 @@ public class RecoveryAlertDefinitionForm extends LocatableDynamicForm implements
private String getNoRecoveryMenuItemTitle() {
StringBuilder str = new StringBuilder();
str.append("-- ");
- str.append("None");
+ str.append(MSG.view_alert_definition_recovery_editor_none_available());
str.append(" --");
return str.toString();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java
index b9c4dca..97acbd2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java
@@ -64,17 +64,17 @@ public class ResourceAlertDefinitionsDataSource extends AbstractAlertDefinitions
if ((parentId == null || parentId.intValue() == 0) && (groupAlertDefinition == null)) {
record.setAttribute(FIELD_PARENT, "");
record.setLinkText("");
- record.setAttribute(FIELD_READONLY, "N/A");
+ record.setAttribute(FIELD_READONLY, MSG.common_val_na());
} else {
// TODO: fix the URLs so they point to the new GWT pages when they are implemented
if (parentId != null && parentId.intValue() != 0) {
record.setAttribute(FIELD_PARENT, "/alerts/Config.do?mode=viewRoles&type="
+ this.resource.getResourceType().getId() + "&from=" + from.getId() + "&ad=" + parentId);
- record.setLinkText("View Template");
+ record.setLinkText(MSG.view_alert_definition_for_type());
} else {
record.setAttribute(FIELD_PARENT, "#ResourceGroup/" + groupAlertDefinition.getResourceGroup().getId()
+ "/Alerts/Definitions/" + groupAlertDefinition.getId());
- record.setLinkText("View Group Definition");
+ record.setLinkText(MSG.view_alert_definition_for_group());
}
record.setAttribute(FIELD_READONLY, readOnly);
}
@@ -87,10 +87,10 @@ public class ResourceAlertDefinitionsDataSource extends AbstractAlertDefinitions
List<DataSourceField> fields = super.addDataSourceFields();
// add two more columns
- DataSourceLinkField parentIdField = new DataSourceLinkField(FIELD_PARENT, "Parent");
+ DataSourceLinkField parentIdField = new DataSourceLinkField(FIELD_PARENT, MSG.view_alerts_field_parent());
fields.add(parentIdField);
- DataSourceTextField readOnlyField = new DataSourceTextField(FIELD_READONLY, "Read Only");
+ DataSourceTextField readOnlyField = new DataSourceTextField(FIELD_READONLY, MSG.view_alerts_field_protected());
fields.add(readOnlyField);
return fields;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java
index d7d499c..cf8398c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java
@@ -129,13 +129,13 @@ public class ResourceAlertDefinitionsView extends AbstractAlertDefinitionsView {
@Override
public void onSuccess(Integer result) {
CoreGUI.getMessageCenter().notify(
- new Message("[" + result + "] alert definitions enabled.", Severity.Info));
+ new Message(MSG.view_alert_definitions_enable_success(String.valueOf(result)), Severity.Info));
ResourceAlertDefinitionsView.this.refresh();
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to enable alert definitions", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_enable_failure(), caught);
}
});
}
@@ -156,13 +156,13 @@ public class ResourceAlertDefinitionsView extends AbstractAlertDefinitionsView {
@Override
public void onSuccess(Integer result) {
CoreGUI.getMessageCenter().notify(
- new Message("[" + result + "] alert definitions disabled.", Severity.Info));
+ new Message(MSG.view_alert_definitions_disable_success(String.valueOf(result)), Severity.Info));
ResourceAlertDefinitionsView.this.refresh();
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to disable alert definitions.", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_disable_failure(), caught);
}
});
}
@@ -183,13 +183,13 @@ public class ResourceAlertDefinitionsView extends AbstractAlertDefinitionsView {
@Override
public void onSuccess(Integer result) {
CoreGUI.getMessageCenter().notify(
- new Message("[" + result + "] alert definitions deleted.", Severity.Info));
+ new Message(MSG.view_alert_definitions_delete_success(String.valueOf(result)), Severity.Info));
ResourceAlertDefinitionsView.this.refresh();
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to delete alert definitions.", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_delete_failure(), caught);
}
});
}
@@ -201,13 +201,14 @@ public class ResourceAlertDefinitionsView extends AbstractAlertDefinitionsView {
Integer.valueOf(resource.getId()), new AsyncCallback<Integer>() {
@Override
public void onSuccess(Integer result) {
- CoreGUI.getMessageCenter().notify(new Message("Alert definition is created", Severity.Info));
+ CoreGUI.getMessageCenter().notify(
+ new Message(MSG.view_alert_definitions_create_success(), Severity.Info));
alertDefinition.setId(result.intValue());
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to create alert definition.", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_create_failure(), caught);
}
});
} else {
@@ -215,12 +216,13 @@ public class ResourceAlertDefinitionsView extends AbstractAlertDefinitionsView {
alertDefinition, true, new AsyncCallback<AlertDefinition>() {
@Override
public void onSuccess(AlertDefinition result) {
- CoreGUI.getMessageCenter().notify(new Message("Alert definition is updated.", Severity.Info));
+ CoreGUI.getMessageCenter().notify(
+ new Message(MSG.view_alert_definitions_update_success(), Severity.Info));
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to update alert definition.", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_update_failure(), caught);
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationInfo.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationInfo.java
index d8f4b46..c4df95a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationInfo.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationInfo.java
@@ -20,6 +20,8 @@
package org.rhq.enterprise.gui.coregui.client.alert.definitions;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.Messages;
/**
* Convienence class that encapsulates the different configuration properties that a notification
@@ -28,6 +30,9 @@ import org.rhq.core.domain.configuration.Configuration;
* @author John Mazzitelli
*/
public class ResourceOperationNotificationInfo {
+
+ static Messages MSG = CoreGUI.getMessages();
+
public enum Constants {
SELECTION_MODE("selection-mode"), // self, specific, relative
SPECIFIC_RESOURCE_ID("selection-specific-resource-id"), //
@@ -55,16 +60,16 @@ public class ResourceOperationNotificationInfo {
public String getDisplayString() {
switch (ordinal()) {
case 0: {
- return "This Resource";
+ return MSG.view_alert_definition_notification_operation_editor_mode_this();
}
case 1: {
- return "Specific Resource";
+ return MSG.view_alert_definition_notification_operation_editor_mode_specific();
}
case 2: {
- return "Relative Resource";
+ return MSG.view_alert_definition_notification_operation_editor_mode_relative();
}
default: {
- return "UNKNOWN OPTION - THIS IS A BUG"; // should never happen
+ return MSG.view_alert_definition_notification_operation_editor_mode_unknown(); // should never happen
}
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java
index cf3adb4..22f5569 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java
@@ -108,7 +108,8 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
operationArgumentsCanvasItem.setHeight(400);
operationArgumentsCanvasItem.setWidth(500);
- operationSelectItem = new SelectItem("operationSelectItem", "Operation");
+ operationSelectItem = new SelectItem("operationSelectItem", MSG
+ .view_alert_definition_notification_operation_editor_common_operation());
operationSelectItem.setStartRow(true);
operationSelectItem.setEndRow(true);
operationSelectItem.setWrapTitle(false);
@@ -125,7 +126,8 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
// for SPECIFIC mode
- singleResourceTextItem = new StaticTextItem("singleResourceTextItem", "Resource");
+ singleResourceTextItem = new StaticTextItem("singleResourceTextItem", MSG
+ .view_alert_definition_notification_operation_editor_specific_resource());
singleResourceTextItem.setStartRow(true);
singleResourceTextItem.setEndRow(false);
singleResourceTextItem.setValue("Pick a resource...");
@@ -133,7 +135,8 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
singleResourceTextItem.setAttribute(RESOURCE_ID_ATTRIBUTE, 0); // we hide the resource ID in this attribute
singleResourceTextItem.setValidators(new ResourceIdValidator(singleResourceTextItem));
- ButtonItem singleResourceButtonItem = new ButtonItem("singleResourceButtonItem", "Pick");
+ ButtonItem singleResourceButtonItem = new ButtonItem("singleResourceButtonItem", MSG
+ .view_alert_definition_notification_operation_editor_specific_pick_button());
singleResourceButtonItem.setStartRow(false);
singleResourceButtonItem.setEndRow(true);
singleResourceButtonItem.setShowTitle(false);
@@ -156,15 +159,16 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
// for RELATIVE mode
- ancestorTypeSelectItem = new SelectItem("ancestorTypeSelectItem", "Start Search From");
+ ancestorTypeSelectItem = new SelectItem("ancestorTypeSelectItem", MSG
+ .view_alert_definition_notification_operation_editor_relative_ancestor());
ancestorTypeSelectItem.setStartRow(true);
ancestorTypeSelectItem.setEndRow(true);
ancestorTypeSelectItem.setWrapTitle(false);
ancestorTypeSelectItem.setRedrawOnChange(true);
ancestorTypeSelectItem.setDefaultToFirstOption(true);
ancestorTypeSelectItem.setHoverWidth(200);
- ancestorTypeSelectItem
- .setTooltip("Select the top of the type hierarchy from which to search its descedant tree for the Filter By type");
+ ancestorTypeSelectItem.setTooltip(MSG
+ .view_alert_definition_notification_operation_editor_relative_ancestor_tooltip());
ancestorTypeSelectItem.setShowIfCondition(new ShowIfModeFunction(ResourceSelectionMode.RELATIVE));
ancestorTypeSelectItem.addChangedHandler(new ChangedHandler() {
@Override
@@ -173,15 +177,16 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
}
});
- descendantTypeSelectItem = new SelectItem("descendantTypeSelectItem", "Then Filter By");
+ descendantTypeSelectItem = new SelectItem("descendantTypeSelectItem", MSG
+ .view_alert_definition_notification_operation_editor_relative_descendant());
descendantTypeSelectItem.setStartRow(true);
descendantTypeSelectItem.setEndRow(false);
descendantTypeSelectItem.setWrapTitle(false);
descendantTypeSelectItem.setRedrawOnChange(true);
descendantTypeSelectItem.setDefaultToFirstOption(true);
descendantTypeSelectItem.setHoverWidth(200);
- descendantTypeSelectItem
- .setTooltip("The resource type to search for under the root type defined in the Start Search From selection.");
+ descendantTypeSelectItem.setTooltip(MSG
+ .view_alert_definition_notification_operation_editor_relative_descendant_tooltip());
descendantTypeSelectItem.setShowIfCondition(new ShowIfModeFunction(ResourceSelectionMode.RELATIVE));
descendantTypeSelectItem.addChangedHandler(new ChangedHandler() {
@Override
@@ -195,14 +200,15 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
descendantNameTextItem.setEndRow(true);
descendantNameTextItem.setShowTitle(false);
descendantNameTextItem.setRequired(false);
- descendantNameTextItem
- .setTooltip("A specific name to uniquely identify a resource when more than one resource of the selected type might exist. This is optional if there will only ever be one resource of the resource type in the selected type hierarchy.");
+ descendantNameTextItem.setTooltip(MSG
+ .view_alert_definition_notification_operation_editor_relative_descendant_filter_tooltip());
descendantNameTextItem.setHoverWidth(200);
descendantNameTextItem.setShowIfCondition(new ShowIfModeFunction(ResourceSelectionMode.RELATIVE));
// the mode selector menu
- modeSelectItem = new SelectItem("modeSelectItem", "Resource Selection Mode");
+ modeSelectItem = new SelectItem("modeSelectItem", MSG
+ .view_alert_definition_notification_operation_editor_mode_title());
modeSelectItem.setStartRow(true);
modeSelectItem.setEndRow(true);
modeSelectItem.setWrapTitle(false);
@@ -222,7 +228,8 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
break;
}
case SPECIFIC: {
- singleResourceTextItem.setValue("Pick a resource...");
+ singleResourceTextItem.setValue(MSG
+ .view_alert_definition_notification_operation_editor_specific_pick_text());
singleResourceTextItem.setAttribute(RESOURCE_ID_ATTRIBUTE, 0);
hideOperationDropDownMenu();
break;
@@ -299,7 +306,8 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Cannot get type ancestry", caught);
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_alert_definition_notification_operation_editor_relative_ancestor_loadFailed(), caught);
}
};
@@ -331,7 +339,8 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
@Override
public void onSuccess(HashMap<Integer, String> results) {
LinkedHashMap<String, String> map = new LinkedHashMap<String, String>(results.size() + 1);
- map.put(String.valueOf(rootResourceTypeId), "Root Ancestor Type");
+ map.put(String.valueOf(rootResourceTypeId), MSG
+ .view_alert_definition_notification_operation_editor_relative_ancestor_root());
for (Map.Entry<Integer, String> entry : results.entrySet()) {
map.put(entry.getKey().toString(), entry.getValue());
}
@@ -349,7 +358,9 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Cannot get type descendants", caught);
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_alert_definition_notification_operation_editor_relative_descendant_loadFailed(),
+ caught);
}
});
}
@@ -418,7 +429,9 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
@Override
public void onSuccess(PageList<ResourceType> result) {
if (result == null || result.size() != 1) {
- CoreGUI.getErrorHandler().handleError("Error getting operations: " + result);
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_alert_definition_notification_operation_editor_operations_loadFailed() + ": "
+ + result);
hideOperationDropDownMenu();
return;
}
@@ -453,7 +466,8 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to load the list of available operations", caught);
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_alert_definition_notification_operation_editor_operations_loadFailed(), caught);
hideOperationDropDownMenu();
}
});
@@ -480,13 +494,15 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
singleResourceTextItem.setValue(resource.getName());
setOperationDropDownMenuValues(resource.getResourceType().getId(), opId, args);
} else {
- onFailure(new Exception("query returns no results"));
+ onFailure(new Exception(MSG
+ .view_alert_definition_notification_operation_editor_operations_loadFailed()));
}
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Cannot determine resource name", caught);
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_alert_definition_notification_operation_editor_operations_loadFailed(), caught);
singleResourceTextItem.setValue(resourceId);
hideOperationDropDownMenu();
}
@@ -526,7 +542,7 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
ConfigurationEditor configEditor = new ConfigurationEditor(extendLocatorId("opArgs"), def, config);
operationArgumentsCanvasItem.addMember(configEditor);
} else {
- Label l = new Label("This operation does not take any parameters");
+ Label l = new Label(MSG.view_alert_definition_notification_operation_editor_operations_no_parameters());
l.setWrap(false);
operationArgumentsCanvasItem.addMember(l);
}
@@ -607,7 +623,7 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
return false;
}
} catch (Exception e) {
- CoreGUI.getErrorHandler().handleError("Cannot save the notification configuration", e);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definition_notification_editor_saveFailed(), e);
return false;
}
}
@@ -638,13 +654,14 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
Integer id = Integer.valueOf(idItem.getAttributeAsInt(RESOURCE_ID_ATTRIBUTE));
boolean valid = (id != null && id.intValue() != 0);
if (!valid) {
- setErrorMessage("Please pick a resource");
+ setErrorMessage(MSG.view_alert_definition_notification_operation_editor_specific_pick_error_invalid());
} else {
LinkedHashMap<Integer, OperationDefinition> ops = (LinkedHashMap<Integer, OperationDefinition>) operationSelectItem
.getAttributeAsObject(OPERATION_DEFS_ATTRIBUTE);
if (ops == null || ops.isEmpty()) {
valid = false;
- setErrorMessage("Please pick a resource that has one or more operations");
+ setErrorMessage(MSG
+ .view_alert_definition_notification_operation_editor_specific_pick_error_no_operation());
}
}
return valid;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SimpleNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SimpleNotificationSenderForm.java
index 65ddcd9..1095a28 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SimpleNotificationSenderForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SimpleNotificationSenderForm.java
@@ -65,7 +65,7 @@ public class SimpleNotificationSenderForm extends AbstractNotificationSenderForm
@Override
public void onFailure(Throwable caught) {
- String errMsg = "Cannot get alert sender configuration definition";
+ String errMsg = MSG.view_alert_definition_notification_editor_loadFailed_single();
CoreGUI.getErrorHandler().handleError(errMsg, caught);
Label label = new Label(errMsg);
label.setIcon("[SKIN]/Dialog/error.png");
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
index 2e3caf0..6ef3b00 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
@@ -65,25 +65,28 @@ public class SingleAlertDefinitionView extends LocatableVLayout {
LocatableTabSet tabSet = new LocatableTabSet(this.getLocatorId());
tabSet.setHeight100();
- Tab generalPropertiesTab = new LocatableTab(tabSet.extendLocatorId("General"), "General Properties");
+ Tab generalPropertiesTab = new LocatableTab(tabSet.extendLocatorId("General"), MSG
+ .view_alert_common_tab_general());
generalProperties = new GeneralPropertiesAlertDefinitionForm(this.getLocatorId(), alertDefinition);
generalPropertiesTab.setPane(generalProperties);
- Tab conditionsTab = new LocatableTab(tabSet.extendLocatorId("Conditions"), "Conditions");
+ Tab conditionsTab = new LocatableTab(tabSet.extendLocatorId("Conditions"), MSG
+ .view_alert_common_tab_conditions());
conditions = new ConditionsAlertDefinitionForm(this.getLocatorId(), alertDefView.getResourceType(),
alertDefinition);
conditionsTab.setPane(conditions);
- Tab notificationsTab = new LocatableTab(tabSet.extendLocatorId("Notifications"), "Notifications");
+ Tab notificationsTab = new LocatableTab(tabSet.extendLocatorId("Notifications"), MSG
+ .view_alert_common_tab_notifications());
notifications = new NotificationsAlertDefinitionForm(this.getLocatorId(), alertDefinition);
notificationsTab.setPane(notifications);
- Tab recoveryTab = new LocatableTab(tabSet.extendLocatorId("Recovery"), "Recovery");
+ Tab recoveryTab = new LocatableTab(tabSet.extendLocatorId("Recovery"), MSG.view_alert_common_tab_recovery());
recovery = new RecoveryAlertDefinitionForm(this.getLocatorId(), alertDefView.getAlertDefinitionDataSource(),
alertDefinition);
recoveryTab.setPane(recovery);
- Tab dampeningTab = new LocatableTab(tabSet.extendLocatorId("Dampening"), "Dampening");
+ Tab dampeningTab = new LocatableTab(tabSet.extendLocatorId("Dampening"), MSG.view_alert_common_tab_dampening());
dampening = new DampeningAlertDefinitionForm(this.getLocatorId(), alertDefinition);
dampeningTab.setPane(dampening);
@@ -92,9 +95,9 @@ public class SingleAlertDefinitionView extends LocatableVLayout {
final HLayout buttons = new HLayout();
buttons.setMembersMargin(20);
- editButton = new LocatableButton(this.extendLocatorId("Edit"), "Edit");
- saveButton = new LocatableButton(this.extendLocatorId("Save"), "Save");
- cancelButton = new LocatableButton(this.extendLocatorId("Cancel"), "Cancel");
+ editButton = new LocatableButton(this.extendLocatorId("Edit"), MSG.common_button_edit());
+ saveButton = new LocatableButton(this.extendLocatorId("Save"), MSG.common_button_save());
+ cancelButton = new LocatableButton(this.extendLocatorId("Cancel"), MSG.common_button_cancel());
editButton.show();
saveButton.hide();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java
index 8319e36..a0d3e52 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java
@@ -78,13 +78,14 @@ public class SystemRolesNotificationSenderForm extends AbstractNotificationSende
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler()
- .handleError("Cannot determine current roles - starting empty", caught);
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_alert_definition_notification_role_editor_loadFailed(), caught);
createNewSelector(null);
}
});
} catch (Exception e) {
- CoreGUI.getErrorHandler().handleError("Cannot use current roles - starting empty", e);
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_alert_definition_notification_role_editor_restoreFailed(), e);
createNewSelector(null);
}
} else {
@@ -110,7 +111,8 @@ public class SystemRolesNotificationSenderForm extends AbstractNotificationSende
getConfiguration().put(new PropertySimple(PROPNAME, newPropValue));
return true;
} catch (Exception e) {
- CoreGUI.getErrorHandler().handleError("Cannot save the selected roles", e);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definition_notification_role_editor_saveFailed(),
+ e);
return false;
}
}
@@ -187,5 +189,5 @@ public class SystemRolesNotificationSenderForm extends AbstractNotificationSende
return "role";
}
}
-
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java
index ef91200..0394520 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java
@@ -128,13 +128,14 @@ public class TemplateAlertDefinitionsView extends AbstractAlertDefinitionsView {
@Override
public void onSuccess(Void v) {
CoreGUI.getMessageCenter().notify(
- new Message("[" + alertDefIds.length + "] alert templates enabled.", Severity.Info));
+ new Message(MSG.view_alert_definitions_enable_success(String.valueOf(alertDefIds.length)),
+ Severity.Info));
TemplateAlertDefinitionsView.this.refresh();
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to enable alert templates", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_enable_failure(), caught);
}
});
}
@@ -156,13 +157,14 @@ public class TemplateAlertDefinitionsView extends AbstractAlertDefinitionsView {
@Override
public void onSuccess(Void v) {
CoreGUI.getMessageCenter().notify(
- new Message("[" + alertDefIds.length + "] alert templates disabled.", Severity.Info));
+ new Message(MSG.view_alert_definitions_disable_success(String.valueOf(alertDefIds.length)),
+ Severity.Info));
TemplateAlertDefinitionsView.this.refresh();
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to disable alert templates", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_disable_failure(), caught);
}
});
}
@@ -184,13 +186,14 @@ public class TemplateAlertDefinitionsView extends AbstractAlertDefinitionsView {
@Override
public void onSuccess(Void v) {
CoreGUI.getMessageCenter().notify(
- new Message("[" + alertDefIds.length + "] alert templates deleted.", Severity.Info));
+ new Message(MSG.view_alert_definitions_delete_success(String.valueOf(alertDefIds.length)),
+ Severity.Info));
TemplateAlertDefinitionsView.this.refresh();
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to delete alert templates", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_delete_failure(), caught);
}
});
}
@@ -202,13 +205,14 @@ public class TemplateAlertDefinitionsView extends AbstractAlertDefinitionsView {
Integer.valueOf(this.resourceType.getId()), new AsyncCallback<Integer>() {
@Override
public void onSuccess(Integer result) {
- CoreGUI.getMessageCenter().notify(new Message("Alert template is created", Severity.Info));
+ CoreGUI.getMessageCenter().notify(
+ new Message(MSG.view_alert_definitions_create_success(), Severity.Info));
alertDefinition.setId(result.intValue());
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to create alert template.", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_create_failure(), caught);
}
});
} else {
@@ -216,12 +220,13 @@ public class TemplateAlertDefinitionsView extends AbstractAlertDefinitionsView {
new AsyncCallback<AlertDefinition>() {
@Override
public void onSuccess(AlertDefinition result) {
- CoreGUI.getMessageCenter().notify(new Message("Alert template is updated.", Severity.Info));
+ CoreGUI.getMessageCenter().notify(
+ new Message(MSG.view_alert_definitions_update_success(), Severity.Info));
}
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to update alert template.", caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_update_failure(), caught);
}
});
}
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 106476e..eca963e 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
@@ -15,6 +15,7 @@ common_buildInfo_gwtVersion = ${gwt.version}~
#--------------
common_button_ack = Ack~
common_button_ack_all = Ack All~
+common_button_add = Add~
common_button_advanced = Advanced...~
common_button_apply = Apply~
common_button_cancel = Cancel~
@@ -24,6 +25,7 @@ common_button_create_child = Create Child~
common_button_delete = Delete~
common_button_delete_all = Delete All~
common_button_disable = Disable~
+common_button_edit = Edit~
common_button_enable = Enable~
common_button_finish = Finish~
common_button_import = Import~
@@ -61,6 +63,7 @@ common_label_unlimited = unlimited~
common_label_user = user~
common_label_users = users~
common_label_week=week~
+common_label_weeks=weeks~
# Common Titles
#--------------
@@ -499,6 +502,8 @@ view_alerts_table_title_group=Group Alert History~
view_alerts_table_title_resource=Resource Alert History~
view_alerts_table_filter_priority=Priority Filter~
view_alerts_field_created_time=Creation Time~
+view_alerts_field_modified_time=Modified Time~
+view_alerts_field_enabled=Enabled~
view_alerts_field_ack_time=Ack Time~
view_alerts_field_ack_subject=Ack Subject~
view_alerts_field_ack_status=Status~
@@ -511,6 +516,9 @@ view_alerts_field_condition_text_many=Multiple Conditions~
view_alerts_field_condition_value=Condition Value~
view_alerts_field_resource=Resource~
view_alerts_field_priority=Priority~
+view_alerts_field_parent=Parent~
+view_alerts_field_protected=Protected~
+view_alerts_field_protected_tooltip=If true, this definition is protected from being changed by the parent definition. In other words, the parent definition settings will not override this definition.~
view_alerts_loadFailed=Failed to fetch alerts data~
view_alerts_delete_confirm=Delete the selected alert(s)?~
view_alerts_delete_confirm_all=Delete all alerts from this source?~
@@ -527,13 +535,148 @@ view_alert_details_breadcrumb=Details~
view_alert_details_field_ack_by=Acknowledged by~
view_alert_details_field_ack_at=Acknowledged at~
view_alert_details_field_recovery_info=Recovery Info~
-view_alert_common_tab_general=General~
+view_alert_definition_for_type=View Template~
+view_alert_definition_for_group=View Group Definition~
+view_alert_definitions_table_title_group=Group Alert Definitions~
+view_alert_definitions_table_title_resource=Resource Alert Definitions~
+view_alert_definitions_loadFailed=Failed to fetch alert definition data~
+view_alert_definitions_loadFailed_single=Failed to fetch data for alert definition with id {0}~
+view_alert_definitions_enable_confirm=Enable the selected alert definition(s)?~
+view_alert_definitions_enable_success=Successfully enabled {0} alert definitions~
+view_alert_definitions_enable_failure=Failed to enable the selected alert definitions~
+view_alert_definitions_disable_confirm=Disable the selected alert definition(s)?~
+view_alert_definitions_disable_success=Successfully disabled {0} alert definitions~
+view_alert_definitions_disable_failure=Failed to disable the selected alert definitions~
+view_alert_definitions_delete_confirm=Delete the selected alert definition(s)?~
+view_alert_definitions_delete_success=Successfully deleted {0} alert definitions~
+view_alert_definitions_delete_failure=Failed to deleted the selected alert definitions~
+view_alert_definitions_create_success=Alert definition successfully created~
+view_alert_definitions_create_failure=Alert definition creation failed~
+view_alert_definitions_update_success=Alert definition successfully updated~
+view_alert_definitions_update_failure=Alert definition update failed~
+view_alert_definition_condition_editor_option_label=Condition Type~
+view_alert_definition_condition_editor_option_availability=Availability Change~
+view_alert_definition_condition_editor_option_metric_threshold=Measurement Absolute Value Threshold~
+view_alert_definition_condition_editor_option_metric_baseline=Measurement Baseline Threshold~
+view_alert_definition_condition_editor_option_metric_change=Measurement Value Change~
+view_alert_definition_condition_editor_option_metric_calltime_threshold=Call Time Value Threshold~
+view_alert_definition_condition_editor_option_metric_calltime_change=Call Time Value Change~
+view_alert_definition_condition_editor_option_metric_trait_change=Trait Value Change~
+view_alert_definition_condition_editor_option_operation=Operation Execution~
+view_alert_definition_condition_editor_option_resource_configuration=Resource Configuration Change~
+view_alert_definition_condition_editor_option_event=Event Detection~
+view_alert_definition_condition_editor_avilability_tooltip=Specify the availability state change that will trigger the condition.~
+view_alert_definition_condition_editor_avilability_value=Availability~
+view_alert_definition_condition_editor_avilability_option_up=Comes up~
+view_alert_definition_condition_editor_avilability_option_down=Goes down~
+view_alert_definition_condition_editor_metric_common_definition_not_found=Should have found metric definition - something is wrong~
+view_alert_definition_condition_editor_metric_threshold_tooltip=Specify the threshold value that, when violated, triggers the condition. The value you specify is an absolute value with an optional units specifier.~
+view_alert_definition_condition_editor_metric_threshold_name=Metric~
+view_alert_definition_condition_editor_metric_threshold_value=Metric Value~
+view_alert_definition_condition_editor_metric_threshold_value_tooltip=The threshold value of the metric that will trigger the condition when compared using the selected comparator.~
+view_alert_definition_condition_editor_metric_threshold_comparator=Comparator~
+view_alert_definition_condition_editor_metric_threshold_comparator_less=Less than~
+view_alert_definition_condition_editor_metric_threshold_comparator_equal=Equal to~
+view_alert_definition_condition_editor_metric_threshold_comparator_greater=Greater Than~
+view_alert_definition_condition_editor_metric_threshold_comparator_tooltip=How a collected metric value should be compared to the given threshold value~
+view_alert_definition_condition_editor_metric_baseline_tooltip=Specify the baseline value that must be violated to trigger the condition. The value you specify is a percentage of the given baseline value.~
+view_alert_definition_condition_editor_metric_baseline_percentage=Baseline Percentage~
+view_alert_definition_condition_editor_metric_baseline_percentage_tooltip=A collected metric value will trigger this condition when compared to this percentage of the selected baseline value using the selected comparator~
+view_alert_definition_condition_editor_metric_baseline_value=Baseline~
+view_alert_definition_condition_editor_metric_change_tooltip=Specify the metric whose value must change to trigger the condition.~
+view_alert_definition_condition_editor_metric_calltime_threshold_tooltip=Specify the calltime threshold value that, when violated, triggers the condition. The value you specify is an absolute value with an optional units specifier. You also must specify which calltime limit to compare the value with (minimum, maximum or average calltime value).~
+view_alert_definition_condition_editor_metric_calltime_common_name=Call Time Metric~
+view_alert_definition_condition_editor_metric_calltime_common_limit=Call Time Limit~
+view_alert_definition_condition_editor_metric_calltime_common_limit_tooltip=The calltime limit value that is to be compared with the given value~
+view_alert_definition_condition_editor_metric_calltime_common_regex=Regular Expression~
+view_alert_definition_condition_editor_metric_calltime_common_regex_tooltip=If specified, this is a regular expression that must match a call destination in order to trigger the condition.~
+view_alert_definition_condition_editor_metric_calltime_common_comparator=Comparator~
+view_alert_definition_condition_editor_metric_calltime_common_comparator_shrinks=Shrinks~
+view_alert_definition_condition_editor_metric_calltime_common_comparator_grows=Grows~
+view_alert_definition_condition_editor_metric_calltime_common_comparator_changes=Changes~
+view_alert_definition_condition_editor_metric_calltime_common_comparator_tooltip=How a collected calltime value should be compared to the given calltime limit~
+view_alert_definition_condition_editor_metric_calltime_threshold_value=Call Time Value~
+view_alert_definition_condition_editor_metric_calltime_threshold_value_tooltip=The threshold value of the metric that will trigger the condition when compared using the selected comparator.~
+view_alert_definition_condition_editor_metric_calltime_change_tooltip=Specify the calltime value that, when changed at least a specified amount, triggers the condition. You must specify which calltime limit to check (minimum, maximum or average calltime value) and the percentage of change that must occur.~
+view_alert_definition_condition_editor_metric_calltime_change_percentage=Percentage Change~
+view_alert_definition_condition_editor_metric_calltime_change_percentage_tooltip=A collected calltime value will trigger this condition when it differs by at least this percentage of the selected calltime limit value~
+view_alert_definition_condition_editor_metric_trait_change_tooltip=Specify the trait whose value must change to trigger the condition.~
+view_alert_definition_condition_editor_metric_trait_change_value=Trait~
+view_alert_definition_condition_editor_operation_tooltip=Specify the result that must occur when the selected operation is executed in order to trigger the condition.~
+view_alert_definition_condition_editor_operation_value=Operation~
+view_alert_definition_condition_editor_operation_status=Operation Status~
+view_alert_definition_condition_editor_operation_status_inprogress=In Progress~
+view_alert_definition_condition_editor_operation_status_success=Success~
+view_alert_definition_condition_editor_operation_status_failure=Failure~
+view_alert_definition_condition_editor_operation_status_canceled=Canceled~
+view_alert_definition_condition_editor_resource_configuration_tooltip=This condition is triggered when the resource configuration changes.~
+view_alert_definition_condition_editor_event_tooltip=Specify the event severity that an event message must be reported with in order to trigger this condition. If you specify an optional regular expression, the event message must also match that regular expression in order for the condition to trigger.~
+view_alert_definition_condition_editor_event_severity=Event Severity~
+view_alert_definition_condition_editor_event_severity_debug=Debug~
+view_alert_definition_condition_editor_event_severity_info=Info~
+view_alert_definition_condition_editor_event_severity_warn=Warn~
+view_alert_definition_condition_editor_event_severity_error=Error~
+view_alert_definition_condition_editor_event_severity_fatal=Fatal~
+view_alert_definition_condition_editor_event_regex=Regular Expression~
+view_alert_definition_condition_editor_event_regex_tooltip=If specified, this is a regular expression that must match a collected event message in order to trigger the condition.~
+view_alert_definition_condition_editor_common_min=Minimum~
+view_alert_definition_condition_editor_common_avg=Average~
+view_alert_definition_condition_editor_common_max=Maximum~
+view_alert_definition_notification_editor_title_add=Add Notification~
+view_alert_definition_notification_editor_title_edit=Edit Notification~
+view_alert_definition_notification_editor_sender=Notification Sender~
+view_alert_definition_notification_editor_none_available=No alert senders available~
+view_alert_definition_notification_editor_loadFailed=Cannot get alert senders~
+view_alert_definition_notification_editor_loadFailed_single=Cannot get alert sender configuration definition~
+view_alert_definition_notification_editor_saveFailed=Cannot save the notification configuration~
+view_alert_definition_notification_editor_field_sender=Sender~
+view_alert_definition_notification_editor_field_configuration=Configuration~
+view_alert_definition_notification_editor_field_configuration_not_loaded=Unknown~
+view_alert_definition_notification_editor_field_configuration_loadFailed=Failed to get notification configuration preview~
+view_alert_definition_notification_editor_delete_confirm=Are you sure you want to delete the selected alert notifications?~
+view_alert_definition_notification_operation_editor_mode_title=Resource Selection Mode~
+view_alert_definition_notification_operation_editor_mode_this=This Resource~
+view_alert_definition_notification_operation_editor_mode_specific=Specific Resource~
+view_alert_definition_notification_operation_editor_mode_relative=Relative Resource~
+view_alert_definition_notification_operation_editor_mode_unknown=UNKNOWN OPTION - THIS IS A BUG~
+view_alert_definition_notification_operation_editor_common_operation=Operation~
+view_alert_definition_notification_operation_editor_specific_resource=Resource~
+view_alert_definition_notification_operation_editor_specific_pick_button=Pick~
+view_alert_definition_notification_operation_editor_specific_pick_text=Pick a resource...~
+view_alert_definition_notification_operation_editor_specific_pick_error_invalid=Please pick a resource~
+view_alert_definition_notification_operation_editor_specific_pick_error_no_operation=Please pick a resource that has one or more operations~
+view_alert_definition_notification_operation_editor_relative_ancestor=Start Search From~
+view_alert_definition_notification_operation_editor_relative_ancestor_tooltip=Select the top of the type hierarchy from which to search its descedant tree for the Filter By type~
+view_alert_definition_notification_operation_editor_relative_ancestor_loadFailed=Cannot get type ancestry~
+view_alert_definition_notification_operation_editor_relative_ancestor_root=Root Ancestor Type~
+view_alert_definition_notification_operation_editor_relative_descendant=Then Filter By~
+view_alert_definition_notification_operation_editor_relative_descendant_tooltip=The resource type to search for under the root type defined in the Start Search From selection.~
+view_alert_definition_notification_operation_editor_relative_descendant_filter_tooltip=A specific name to uniquely identify a resource when more than one resource of the selected type might exist. This is optional if there will only ever be one resource of the resource type in the selected type hierarchy.~
+view_alert_definition_notification_operation_editor_relative_descendant_loadFailed=Cannot get type descendants~
+view_alert_definition_notification_operation_editor_operations_loadFailed=Failed to load the list of available operations~
+view_alert_definition_notification_operation_editor_operations_no_parameters=This operation does not take any parameters~
+view_alert_definition_notification_role_editor_loadFailed=Cannot determine current roles - starting empty~
+view_alert_definition_notification_role_editor_restoreFailed=Cannot use current roles - starting empty~
+view_alert_definition_notification_role_editor_saveFailed=Cannot save the selected roles~
+view_alert_definition_notification_user_editor_loadFailed=Cannot determine current users - starting empty~
+view_alert_definition_notification_user_editor_restoreFailed=Cannot use current users - starting empty~
+view_alert_definition_notification_user_editor_saveFailed=Cannot save the selected users~
+view_alert_definition_recovery_editor_disable_when_fired=Disable When Fired~
+view_alert_definition_recovery_editor_disable_when_fired_tooltip=Indicates if this alert will be disabled after it fires. Once disabled, the alert can be manually re-enabled or a recovery alert can be set up to automatically re-enable it. If this alert is a recovery alert itself, this setting cannot be turned on.~
+view_alert_definition_recovery_editor_recovery_alert=Recover Alert~
+view_alert_definition_recovery_editor_recovery_alert_tooltip=The target alert that will be recovered (i.e. re-enabled) after this alert triggers. Do not select an alert here if you are not defining a recovery alert.~
+view_alert_definition_recovery_editor_loadFailed=Cannot build recovery menu~
+view_alert_definition_recovery_editor_none_available=None~
+view_alert_common_tab_general=General Properties~
view_alert_common_tab_conditions=Conditions~
-view_alert_common_tab_conditions_text=Matching Condition~
+view_alert_common_tab_conditions_modal_title=Add Condition~
+view_alert_common_tab_conditions_expression=Fire alert when~
+view_alert_common_tab_conditions_expression_tooltip=Determines if ANY or ALL of the conditions must evaluate to true in order for the entire condition set to be considered true.~
+view_alert_common_tab_conditions_text=Condition~
view_alert_common_tab_conditions_value=Value~
view_alert_common_tab_conditions_type_availability=Availability Change~
-view_alert_common_tab_conditions_type_availability_down=Went down
-view_alert_common_tab_conditions_type_availability_up=Came up
+view_alert_common_tab_conditions_type_availability_down=Went down~
+view_alert_common_tab_conditions_type_availability_up=Came up~
view_alert_common_tab_conditions_type_metric_threshold=Metric Value Exceeds Threshold~
view_alert_common_tab_conditions_type_metric_calltime_threshold=Call Time Value Exceeds Threshold~
view_alert_common_tab_conditions_type_metric_calltime_destination=with call destination matching~
@@ -546,12 +689,11 @@ view_alert_common_tab_conditions_type_metric_baseline=Metric Value Exceeds Basel
view_alert_common_tab_conditions_type_metric_baseline_verb=of~
view_alert_common_tab_conditions_type_metric_change=Metric Value Change~
view_alert_common_tab_conditions_type_metric_trait_change=Trait Change~
-view_alert_common_tab_conditions_type_metric_operation=Operation Execution~
-view_alert_common_tab_conditions_type_metric_status=with result status~
-view_alert_common_tab_conditions_type_metric_resource_configuration=Resource Configuration Change~
-view_alert_common_tab_conditions_type_metric_event=Event Detection~
-view_alert_common_tab_conditions_type_metric_event_matching=with event source matching~
-view_alert_common_tab_conditions_type_invalid=Unsupported Category: {0}~
+view_alert_common_tab_conditions_type_operation=Operation Execution~
+view_alert_common_tab_conditions_type_operation_status=with result status~
+view_alert_common_tab_conditions_type_resource_configuration=Resource Configuration Change~
+view_alert_common_tab_conditions_type_event=Event Detection~
+view_alert_common_tab_conditions_type_event_matching=with event source matching~
view_alert_common_tab_conditions_recovery_enabled=Triggered ''{0}'' to be re-enabled~
view_alert_common_tab_conditions_recovery_disabled=This alert caused its alert definition to be disabled~
view_alert_common_tab_notifications=Notifications~
@@ -561,6 +703,28 @@ view_alert_common_tab_notifications_message=Message~
view_alert_common_tab_notifications_all_emails=All Emails~
view_alert_common_tab_notifications_bad_emails=Bad Emails~
view_alert_common_tab_dampening=Dampening~
+view_alert_common_tab_dampening_category_none=None~
+view_alert_common_tab_dampening_category_none_tooltip=Dampening is disabled. Every time the condition set is true, an alert will be triggered.~
+view_alert_common_tab_dampening_category_consecutive_count=Consecutive~
+view_alert_common_tab_dampening_category_consecutive_count_tooltip=An alert is triggered once every X occurrences the condition set is true consecutively.~
+view_alert_common_tab_dampening_category_partial_count=Last N Evaluations~
+view_alert_common_tab_dampening_category_partial_count_tooltip=An alert is triggered once every X occurrences the condition set is true during the last N evaluations of the condition set.~
+view_alert_common_tab_dampening_category_duration_count=Time Period~
+view_alert_common_tab_dampening_category_duration_count_tooltip=An alert is triggered once every X occurrences the condition set is true within a given time period.~
+view_alert_common_tab_dampening_consecutive_occurrences_label=Occurrences~
+view_alert_common_tab_dampening_consecutive_occurrences_label_tooltip=The number of times the condition set must be consecutively true before the alert is triggered~
+view_alert_common_tab_dampening_partial_occurrences_label=Occurrences~
+view_alert_common_tab_dampening_partial_occurrences_label_tooltip=The number of times the condition set must be true during the last N evaluations before the alert is triggered.~
+view_alert_common_tab_dampening_partial_evalatuions_label=Evaluations~
+view_alert_common_tab_dampening_partial_evalatuions_label_tooltip=The total number of times the condition set will be tested to see if the given number of occurrences are true.~
+view_alert_common_tab_dampening_duration_occurrences_label=Occurrences~
+view_alert_common_tab_dampening_duration_occurrences_label_tooltip=The number of times the condition set must be true during the given time period before the alert is triggered.~
+view_alert_common_tab_dampening_duration_period_label=Time Period~
+view_alert_common_tab_dampening_duration_period_label_tooltip=The time span in which the condition set will be tested to see if the given number of occurrences are true.~
+view_alert_common_tab_recovery=Recovery~
+view_alert_common_tab_invalid_condition_category=Invalid condition category - please report this as a bug: {0}~
+view_alert_common_tab_invalid_dampening_category=Invalid dampening category - please report this as a bug: {0}~
+view_alert_common_tab_invalid_time_units=Invalid time units - please report this as a bug: {0}~
# Auto Discovery Queue
#----------------------------