From 5a09beb727a48920cd03f4c2e1431839a85364fa Mon Sep 17 00:00:00 2001 From: gaba Date: Fri, 17 Feb 2017 10:12:37 -0800 Subject: [PATCH 1/2] It has to be translation_key and not message. --- client/coral-admin/src/actions/auth.js | 2 +- client/coral-admin/src/actions/install.js | 4 ++-- client/coral-framework/actions/auth.js | 2 +- client/coral-framework/components/SuspendedAccount.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js index 8bc0d4e4c..bdb101362 100644 --- a/client/coral-admin/src/actions/auth.js +++ b/client/coral-admin/src/actions/auth.js @@ -16,7 +16,7 @@ export const checkLogin = () => dispatch => { }) .catch(error => { console.error(error); - dispatch(checkLoginFailure(`${error.message}`)); + dispatch(checkLoginFailure(`${error.translation_key}`)); }); }; diff --git a/client/coral-admin/src/actions/install.js b/client/coral-admin/src/actions/install.js index a74a1929f..c1d05d253 100644 --- a/client/coral-admin/src/actions/install.js +++ b/client/coral-admin/src/actions/install.js @@ -81,7 +81,7 @@ export const submitUser = () => (dispatch, getState) => { }) .catch(error => { console.error(error); - dispatch(installFailure(`${error.message}`)); + dispatch(installFailure(`${error.translation_key}`)); }); }); }; @@ -104,6 +104,6 @@ export const checkInstall = next => dispatch => { }) .catch(error => { console.error(error); - dispatch(checkInstallFailure(`${error.message}`)); + dispatch(checkInstallFailure(`${error.translation_key}`)); }); }; diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js index 8618cf1d3..92f489ae7 100644 --- a/client/coral-framework/actions/auth.js +++ b/client/coral-framework/actions/auth.js @@ -177,7 +177,7 @@ export const checkLogin = () => dispatch => { }) .catch(error => { console.error(error); - dispatch(checkLoginFailure(`${error.message}`)); + dispatch(checkLoginFailure(`${error.translation_key}`)); }); }; diff --git a/client/coral-framework/components/SuspendedAccount.js b/client/coral-framework/components/SuspendedAccount.js index 00adc9952..446169b37 100644 --- a/client/coral-framework/components/SuspendedAccount.js +++ b/client/coral-framework/components/SuspendedAccount.js @@ -26,7 +26,7 @@ class SuspendedAccount extends Component { editName(username) .then(() => location.reload()) .catch((error) => { - this.setState({alert: lang.t(`error.${error.message}`)}); + this.setState({alert: lang.t(`error.${error.translation_key}`)}); }); } else { this.setState({alert: lang.t('editName.error')}); From 9f168e627adda55a4ac4e93157f2604794494643 Mon Sep 17 00:00:00 2001 From: gaba Date: Fri, 17 Feb 2017 14:19:30 -0800 Subject: [PATCH 2/2] It uses message and not translation key. --- client/coral-framework/actions/auth.js | 2 +- routes/api/users/index.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js index 92f489ae7..4a12245eb 100644 --- a/client/coral-framework/actions/auth.js +++ b/client/coral-framework/actions/auth.js @@ -123,7 +123,7 @@ export const fetchSignUp = (formData, redirectUri) => (dispatch) => { dispatch(signUpSuccess(user)); }) .catch(error => { - dispatch(signUpFailure(lang.t(`error.${error.translation_key}`))); + dispatch(signUpFailure(lang.t(`error.${error.message}`))); }); }; diff --git a/routes/api/users/index.js b/routes/api/users/index.js index 4182beb49..df7369bb3 100644 --- a/routes/api/users/index.js +++ b/routes/api/users/index.js @@ -136,7 +136,7 @@ router.post('/', (req, res, next) => { res.status(201).json(user); }); }) - .catch(err => { + .catch((err) => { next(err); }); }); @@ -163,7 +163,6 @@ router.post('/:user_id/actions', authorization.needed(), (req, res, next) => { res.status(201).json(action); }) .catch((err) => { - console.log('Error', err); next(err); }); });