apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7293: UI: Fixed localization issues on the login page

Browse Source 
- Reverted the validator.messages to the original values (jquery.validator.js).
- Added a function to localize validator.messages which is called before login.

Signed-off-by: Brian Federle <brian.federle@citrix.com>
This commit is contained in:
Mihaela Stoica 2014-08-08 15:19:50 +01:00 committed by Brian Federle
parent aac8b91cbe
commit f212aa57c3
3 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ui/lib/jquery.validate.js vendored
View File

@ -260,23 +260,23 @@ $.extend($.validator, {
},
messages: {
required: 'message.validate.fieldrequired',
remote: 'message.validate.fixfield',
email: 'message.validate.email.address',
url: 'message.validate.URL',
date: 'message.validate.date',
dateISO: 'message.validate.date.ISO',
number: 'message.validate.number',
digits: 'message.validate.digits',
creditcard: 'message.validate.creditcard',
equalTo: 'message.validate.equalto',
accept: 'message.validate.accept',
maxlength: $.validator.format('message.validate.maxlength'),
minlength: $.validator.format('message.validate.minlength'),
rangelength: $.validator.format('message.validate.range.length'),
range: $.validator.format('message.validate.range'),
max: $.validator.format('message.validate.max'),
min: $.validator.format('messgae.validate.min')
required: "This field is required.",
remote: "Please fix this field.",
email: "Please enter a valid email address.",
url: "Please enter a valid URL.",
date: "Please enter a valid date.",
dateISO: "Please enter a valid date (ISO).",
number: "Please enter a valid number.",
digits: "Please enter only digits.",
creditcard: "Please enter a valid credit card number.",
equalTo: "Please enter the same value again.",
accept: "Please enter a value with a valid extension.",
maxlength: $.validator.format("Please enter no more than {0} characters."),
minlength: $.validator.format("Please enter at least {0} characters."),
rangelength: $.validator.format("Please enter a value between {0} and {1} characters long."),
range: $.validator.format("Please enter a value between {0} and {1}."),
max: $.validator.format("Please enter a value less than or equal to {0}."),
min: $.validator.format("Please enter a value greater than or equal to {0}.")
},
autoCreateRanges: false,

7
ui/scripts/cloudStack.js
View File

@ -480,8 +480,6 @@
loginArgs.hideLoginScreen = true;
}
cloudStack.uiCustom.login(loginArgs);
// Localization
if (!$.isFunction(cloudStack.localizationFn)) { // i.e., localize is overridden by a plugin/module
cloudStack.localizationFn = function(str) {
@ -489,6 +487,11 @@
};
}
// Localize validation messages
cloudStack.localizeValidatorMessages();
cloudStack.uiCustom.login(loginArgs);
document.title = _l('label.app.name');
});
})(cloudStack, jQuery);

25
ui/scripts/ui/utils.js
View File

@ -120,4 +120,29 @@
return str;
}
};
/**
* Localize validator messages
*/
cloudStack.localizeValidatorMessages = function() {
$.extend($.validator.messages, {
required: _l('message.validate.fieldrequired'),
remote: _l('message.validate.fixfield'),
email: _l('message.validate.email.address'),
url: _l('message.validate.URL'),
date: _l('message.validate.date'),
dateISO: _l('message.validate.date.ISO'),
number: _l('message.validate.number'),
digits: _l('message.validate.digits'),
creditcard: _l('message.validate.creditcard'),
equalTo: _l('message.validate.equalto'),
accept: _l('message.validate.accept'),
maxlength: $.validator.format(_l('message.validate.maxlength')),
minlength: $.validator.format(_l('message.validate.minlength')),
rangelength: $.validator.format(_l('message.validate.range.length')),
range: $.validator.format(_l('message.validate.range')),
max: $.validator.format(_l('message.validate.max')),
min: $.validator.format(_l('messgae.validate.min'))
});
};
})(jQuery, cloudStack);