From 3cc7aa45bbe6aed81dcdfa2aa6851130d55efa41 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Wed, 17 Jun 2015 14:38:09 +0200
Subject: [PATCH] Fixing i18n

---
 app/coffee/modules/auth.coffee               | 2 +-
 app/coffee/modules/base/http.coffee          | 2 +-
 app/coffee/modules/user-settings/main.coffee | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee
index 7e9f982b..c9c6c904 100644
--- a/app/coffee/modules/auth.coffee
+++ b/app/coffee/modules/auth.coffee
@@ -54,7 +54,7 @@ class AuthService extends taiga.Service
 
     _setLocales: ->
         lang = @rootscope.user.lang || @config.get("defaultLanguage") || "en"
-        @translate.use(lang)
+        @translate.preferredLanguage(lang)
 
     getUser: ->
         if @rootscope.user
diff --git a/app/coffee/modules/base/http.coffee b/app/coffee/modules/base/http.coffee
index 25e49e7d..44647e6b 100644
--- a/app/coffee/modules/base/http.coffee
+++ b/app/coffee/modules/base/http.coffee
@@ -37,7 +37,7 @@ class HttpService extends taiga.Service
             headers["Authorization"] = "Bearer #{token}"
 
         # Accept-Language
-        lang = @rootScope.user?.lang || @translate.preferredLanguage()
+        lang = @translate.preferredLanguage()
         if lang
             headers["Accept-Language"] = lang
 
diff --git a/app/coffee/modules/user-settings/main.coffee b/app/coffee/modules/user-settings/main.coffee
index bd5b02a9..151cc2dc 100644
--- a/app/coffee/modules/user-settings/main.coffee
+++ b/app/coffee/modules/user-settings/main.coffee
@@ -96,7 +96,6 @@ UserProfileDirective = ($confirm, $auth, $repo, $translate) ->
 
             changeEmail = $scope.user.isAttributeModified("email")
             $scope.user.lang = $scope.lang
-            $translate.preferredLanguage($scope.lang)
 
             onSuccess = (data) =>
                 $auth.setUser(data)