etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 4556: localize validation error message.

This commit is contained in:
Jessica Wang 2011-01-28 15:54:44 -08:00
parent 60518dc226
commit 80640f9d01
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/WEB-INF/classes/resources/messages.properties
View File

@ -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

7
ui/index.jsp
View File

@ -70,7 +70,12 @@
'label.adding.failed': '<fmt:message key="label.adding.failed"/>',
'label.succeeded': '<fmt:message key="label.succeeded"/>',
'label.failed': '<fmt:message key="label.failed"/>',
'label.error.code': '<fmt:message key="label.error.code"/>',
'label.error.code': '<fmt:message key="label.error.code"/>',
'label.required': '<fmt:message key="label.required"/>',
'label.invalid.number': '<fmt:message key="label.invalid.number"/>',
'label.invalid.integer': '<fmt:message key="label.invalid.integer"/>',
'label.minimum': '<fmt:message key="label.minimum"/>',
'label.maximum': '<fmt:message key="label.maximum"/>',
};
</script>
</head>

21
ui/scripts/cloud.core.js
View File

@ -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) {