diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 942adb63b53..63c4957c09e 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -282,6 +282,10 @@ label.network.offering=Network Offering
label.availability=Availability
label.required=Required
label.optional=Optional
+label.invalid.number=Invalid Number
+label.invalid.integer=Invalid Integer
+label.minimum=Minimum
+label.maximum=Maximum
label.unavailable=Unavailable
label.specify.vlan=Specify VLAN
label.network.rate=Network Rate
diff --git a/ui/index.jsp b/ui/index.jsp
index a160a1b8b06..bff294efbb2 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -70,7 +70,12 @@
'label.adding.failed': '',
'label.succeeded': '',
'label.failed': '',
- 'label.error.code': '',
+ 'label.error.code': '',
+ 'label.required': '',
+ 'label.invalid.number': '',
+ 'label.invalid.integer': '',
+ 'label.minimum': '',
+ 'label.maximum': '',
};
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index c71287665ee..6598971d700 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -1502,7 +1502,8 @@ function validateDropDownBox(label, field, errMsgField, appendErrMsg) {
var errMsg = "";
var value = field.val();
if (value == null || value.length == 0) {
- errMsg = label + " is a required value. ";
+ //errMsg = label + " is a required value. ";
+ errMsg = g_dictionary["label.required"];
isValid = false;
}
showErrorInDropdown(isValid, field, errMsgField, errMsg, appendErrMsg);
@@ -1520,27 +1521,32 @@ function validateNumber(label, field, errMsgField, min, max, isOptional, type) {
if (value != null && value.length != 0) {
if(isNaN(value)) {
- errMsg = label + " must be a number";
+ //errMsg = label + " must be a number";
+ errMsg = g_dictionary["label.invalid.number"];
isValid = false;
}
else {
if(type == "integer" && (value % 1) != 0) {
- errMsg = label + " must be an integer";
+ //errMsg = label + " must be an integer";
+ errMsg = g_dictionary["label.invalid.integer"];
isValid = false;
}
if (min != null && value < min) {
- errMsg = label + " must be a value greater than or equal to " + min;
+ //errMsg = label + " must be a value greater than or equal to " + min;
+ errMsg = g_dictionary["label.minimum"] + ": " + min;
isValid = false;
}
if (max != null && value > max) {
- errMsg = label + " must be a value less than or equal to " + max;
+ //errMsg = label + " must be a value less than or equal to " + max;
+ errMsg = g_dictionary["label.maximum"] + ": " + max;
isValid = false;
}
}
}
else if(isOptional!=true){ //required field
- errMsg = label + " is a required value. ";
+ //errMsg = label + " is a required value. ";
+ errMsg = g_dictionary["label.required"];
isValid = false;
}
showError(isValid, field, errMsgField, errMsg);
@@ -1552,7 +1558,8 @@ function validateString(label, field, errMsgField, isOptional, maxLength) {
var errMsg = "";
var value = field.val();
if (isOptional!=true && (value == null || value.length == 0)) { //required field
- errMsg = label + " is a required value. ";
+ //errMsg = label + " is a required value. ";
+ errMsg = g_dictionary["label.required"];
isValid = false;
}
else if (value!=null && value.length >= maxLength) {