From 89ee1b481476ccd43def535c264318fe05e47a3f Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 3 May 2012 15:40:01 -0700
Subject: [PATCH] cloudstack 3.0 UI - login page - add a blank option to
 language dropdown. When this blank option is selected, browser's default
 language will be used.

---
 ui/index.jsp                  |  1 +
 ui/scripts/ui-custom/login.js | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index fd8a6171f50..c93836601ee 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -57,6 +57,7 @@
             <!-- Select language -->
             <div class="select-language">
               <select name="language">
+							  <option value=""></option> <!-- when this blank option is selected, browser's default language will be used -->
                 <option value="en"><fmt:message key="label.lang.english"/></option>
                 <option value="ja"><fmt:message key="label.lang.japanese"/></option>
 								<option value="zh_CN"><fmt:message key="label.lang.chinese"/></option>
diff --git a/ui/scripts/ui-custom/login.js b/ui/scripts/ui-custom/login.js
index 60851a32b06..40d8aebbe4c 100644
--- a/ui/scripts/ui-custom/login.js
+++ b/ui/scripts/ui-custom/login.js
@@ -98,15 +98,13 @@
     // Select language
     var $languageSelect = $login.find('select[name=language]');
     $languageSelect.change(function() {
-      $.cookie('lang', $(this).val());
+		  if($(this).val() != '') //language dropdown is not blank
+        $.cookie('lang', $(this).val()); //the selected option in language dropdown will be used (instead of browser's default language) 
+			else //language dropdown is blank
+			  $.cookie('lang', null); //null $.cookie('lang'), so browser's default language will be used.
       document.location.reload();
     });
-
-    // Set default language
-    if (!$.cookie('lang')) {
-      $.cookie('lang', 'en');
-    }
-
+    
     $languageSelect.val($.cookie('lang'));
   };
 })(jQuery, cloudStack);