Updates for checking cookie status.

src/ui/controllers/base.go

@@ -42,10 +42,12 @@ var mappingLangNames map[string]string
 func (b *BaseController) Prepare() {
 
 	var lang string
+	var langHasChanged bool
 
 	langRequest := b.GetString("lang")
 	if langRequest != "" {
 		lang = langRequest
+		langHasChanged = true
 	} else {
 		langCookie, err := b.Ctx.Request.Cookie("language")
 		if err != nil {
@@ -53,12 +55,6 @@ func (b *BaseController) Prepare() {
 		}
 		if langCookie != nil {
 			lang = langCookie.Value
-		}
-		if lang == "" {
-			sessionLang := b.GetSession("lang")
-			if sessionLang != nil {
-				b.SetSession("lang", lang)
-				lang = sessionLang.(string)
 		} else {
 			al := b.Ctx.Request.Header.Get("Accept-Language")
 			if len(al) > 4 {
@@ -67,14 +63,14 @@ func (b *BaseController) Prepare() {
 					lang = al
 				}
 			}
-			}
+			langHasChanged = true
 		}
 	}
 
+	if langHasChanged {
 		if _, exist := supportLanguages[lang]; !exist { //Check if support the request language.
 			lang = defaultLang //Set default language if not supported.
 		}
-
 		cookies := &http.Cookie{
 			Name:     "language",
 			Value:    lang,
@@ -82,8 +78,7 @@ func (b *BaseController) Prepare() {
 			Domain:   "/",
 		}
 		http.SetCookie(b.Ctx.ResponseWriter, cookies)
-
+	}
-	b.SetSession("lang", lang)
 
 	curLang := langType{
 		Lang: lang,

src/ui/views/sections/header-content.htm

@@ -25,7 +25,7 @@
     </div>
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class="collapse navbar-collapse" id="bs-harbor-navbar-collapse-1">
-		  <optional-menu version="dev" language="{{ .Lang }}" login-status="//vm.loginStatus//"></optional-menu>     
+		  <optional-menu version="{{.Version}}" language="{{.Lang}}" login-status="//vm.loginStatus//"></optional-menu>     
 	    <ul class="nav navbar-nav navbar-right">
 		    <li>
 		      <navigation-header></navigation-header>