From eb6987c393597fa0fb74ebff76c8360b4df5328a Mon Sep 17 00:00:00 2001
From: Mihaela Stoica <mihaela.stoica@citrix.com>
Date: Fri, 8 Aug 2014 15:19:50 +0100
Subject: [PATCH] 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.federle@citrix.com>
(cherry picked from commit f212aa57c32eb05d6a69730e37ac50bdb1f0a268)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	ui/scripts/cloudStack.js
---
 ui/scripts/cloudStack.js |  9 ++++++---
 ui/scripts/ui/utils.js   | 25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 5195a7b817f..0a20aa8e48e 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -474,8 +474,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) {
@@ -483,6 +481,11 @@
             };
         }
 
-        document.title = _l('label.app.name');
+        // Localize validation messages
+        cloudStack.localizeValidatorMessages();
+
+        cloudStack.uiCustom.login(loginArgs);
+
+        document.title = _l('label.app.name');            
     });
 })(cloudStack, jQuery);
diff --git a/ui/scripts/ui/utils.js b/ui/scripts/ui/utils.js
index 769aea7fa54..542365ad0b1 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);