CLOUDSTACK-7293: UI: Fixed localization issues on the login page
- 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.fede...@citrix.com>
(cherry picked from commit f212aa57c32eb05d6a69730e37ac50bdb1f0a268)
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
Conflicts:
ui/scripts/cloudStack.js
Conflicts:
ui/scripts/cloudStack.js
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/614ce7de
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/614ce7de
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/614ce7de
Branch: refs/heads/4.4
Commit: 614ce7de96fd1588a224c76cba8c9028fa4eeaa9
Parents: b0e5a30
Author: Mihaela Stoica <mihaela.sto...@citrix.com>
Authored: Fri Aug 8 15:19:50 2014 +0100
Committer: Rohit Yadav <rohit.ya...@shapeblue.com>
Committed: Thu Dec 11 20:39:12 2014 +0530
----------------------------------------------------------------------
ui/scripts/cloudStack.js | 7 +++++--
ui/scripts/ui/utils.js | 25 +++++++++++++++++++++++++
2 files changed, 30 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/614ce7de/ui/scripts/cloudStack.js
----------------------------------------------------------------------
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 2285276..b6dd559 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/614ce7de/ui/scripts/ui/utils.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/utils.js b/ui/scripts/ui/utils.js
index 769aea7..542365a 100644
--- a/ui/scripts/ui/utils.js
+++ b/ui/scripts/ui/utils.js
@@ -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);
