From 25eeac60743fa65478cecb780c24add428402ec9 Mon Sep 17 00:00:00 2001 From: SleepWalker Date: Sat, 28 May 2016 22:23:34 +0300 Subject: [PATCH] #107: preserve user language after logout. Preserve user guest language after page refresh --- src/components/user/actions.js | 8 +++++--- src/components/user/factory.js | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/user/actions.js b/src/components/user/actions.js index 0b43a10..0ce8074 100644 --- a/src/components/user/actions.js +++ b/src/components/user/actions.js @@ -44,9 +44,11 @@ export function setUser(payload) { } export function logout() { - return (dispatch) => { - dispatch(setUser({isGuest: true})); - dispatch(changeLang()); + return (dispatch, getState) => { + dispatch(setUser({ + lang: getState().user.lang, + isGuest: true + })); dispatch(routeActions.push('/login')); }; } diff --git a/src/components/user/factory.js b/src/components/user/factory.js index 07a6d8a..bcf9846 100644 --- a/src/components/user/factory.js +++ b/src/components/user/factory.js @@ -17,6 +17,6 @@ export function factory(store) { } // auto-detect guests language - store.dispatch(changeLang()).then(resolve, reject); + store.dispatch(changeLang(user.lang)).then(resolve, reject); }); }