taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing i18n

stable
Alejandro Alonso 2015-06-17 14:38:09 +02:00
parent f0c3dff32a
commit 3cc7aa45bb
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffee/modules/auth.coffee
View File

@ -54,7 +54,7 @@ class AuthService extends taiga.Service
_setLocales: -> _setLocales: ->
lang = @rootscope.user.lang || @config.get("defaultLanguage") || "en" lang = @rootscope.user.lang || @config.get("defaultLanguage") || "en"
@translate.use(lang) @translate.preferredLanguage(lang)
getUser: -> getUser: ->
if @rootscope.user if @rootscope.user

2
app/coffee/modules/base/http.coffee
View File

@ -37,7 +37,7 @@ class HttpService extends taiga.Service
headers["Authorization"] = "Bearer #{token}" headers["Authorization"] = "Bearer #{token}"
# Accept-Language # Accept-Language
lang = @rootScope.user?.lang || @translate.preferredLanguage() lang = @translate.preferredLanguage()
if lang if lang
headers["Accept-Language"] = lang headers["Accept-Language"] = lang

1
app/coffee/modules/user-settings/main.coffee
View File

@ -96,7 +96,6 @@ UserProfileDirective = ($confirm, $auth, $repo, $translate) ->
changeEmail = $scope.user.isAttributeModified("email") changeEmail = $scope.user.isAttributeModified("email")
$scope.user.lang = $scope.lang $scope.user.lang = $scope.lang
$translate.preferredLanguage($scope.lang)
onSuccess = (data) => onSuccess = (data) =>
$auth.setUser(data) $auth.setUser(data)