diff --git a/app/coffee/modules/base/http.coffee b/app/coffee/modules/base/http.coffee index e8847601..25e49e7d 100644 --- a/app/coffee/modules/base/http.coffee +++ b/app/coffee/modules/base/http.coffee @@ -22,9 +22,9 @@ taiga = @.taiga class HttpService extends taiga.Service - @.$inject = ["$http", "$q", "$tgStorage", "$rootScope", "$cacheFactory"] + @.$inject = ["$http", "$q", "$tgStorage", "$rootScope", "$cacheFactory", "$translate"] - constructor: (@http, @q, @storage, @rootScope, @cacheFactory) -> + constructor: (@http, @q, @storage, @rootScope, @cacheFactory, @translate) -> super() @.cache = @cacheFactory("httpget"); @@ -37,7 +37,7 @@ class HttpService extends taiga.Service headers["Authorization"] = "Bearer #{token}" # Accept-Language - lang = @rootScope.user?.lang + lang = @rootScope.user?.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 5e8c0427..d4cd6671 100644 --- a/app/coffee/modules/user-settings/main.coffee +++ b/app/coffee/modules/user-settings/main.coffee @@ -96,6 +96,7 @@ UserProfileDirective = ($confirm, $auth, $repo, $translate) -> changeEmail = $scope.user.isAttributeModified("email") $scope.user.lang = $scope.lang + $translate.preferredLanguage($scope.lang) onSuccess = (data) => $auth.setUser(data)