diff --git a/assets/scripts/app/app.coffee b/assets/scripts/app/app.coffee index 164dbd8f..c051ed37 100644 --- a/assets/scripts/app/app.coffee +++ b/assets/scripts/app/app.coffee @@ -147,9 +147,7 @@ unless window.TravisApplication ready: -> location.href = location.href.replace('#!/', '') if location.hash.slice(0, 2) == '#!' - I18n.fallbacks = true - @setLocale 'locale', @get('defaultLocale') currentDate: -> new Date() - ) + ) \ No newline at end of file diff --git a/assets/scripts/app/auth.coffee b/assets/scripts/app/auth.coffee index 565a18c1..40a47c79 100644 --- a/assets/scripts/app/auth.coffee +++ b/assets/scripts/app/auth.coffee @@ -6,11 +6,9 @@ window.addEventListener('message', (e) => @receiveMessage(e)) signOut: -> - Travis.storage.removeItem('travis.locale') Travis.storage.removeItem('travis.user') Travis.storage.removeItem('travis.token') Travis.sessionStorage.clear() - Travis.setLocale Travis.default_locale @set('state', 'signed-out') @set('user', undefined) if user = Travis.__container__.lookup('controller:currentUser').get('content') @@ -67,7 +65,6 @@ Travis.__container__.lookup('controller:currentUser').set('content', user) @set('state', 'signed-in') - Travis.setLocale(data.user.locale || Travis.default_locale) Travis.trigger('user:signed_in', data.user) if router = Travis.__container__.lookup('router:main') Ember.run.next =>