From fdbcbd62c4f1ca866cc7b78b50d698a61e234184 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 27 Jun 2017 23:34:25 -0300 Subject: [PATCH] Ivan - Avoid english language as default --- client/src/data/languages/en.js | 2 +- client/src/lib-app/session-store.js | 4 ---- client/src/reducers/config-reducer.js | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/client/src/data/languages/en.js b/client/src/data/languages/en.js index 288c6fdc..c1893e8a 100644 --- a/client/src/data/languages/en.js +++ b/client/src/data/languages/en.js @@ -177,7 +177,7 @@ export default { 'TICKET_NUMBER': 'Ticket number', 'NEXT': 'Next', 'SEND_EMAIL_ON_NEW_TICKET': 'Send email on new ticket', - 'STAFF_UPDATED': 'Staff member updated', + 'STAFF_UPDATED': 'Staff member has been updated', 'UPDATE': 'Update', 'CHART_CREATE_TICKET': 'Tickets created', diff --git a/client/src/lib-app/session-store.js b/client/src/lib-app/session-store.js index 6164860f..7d2c35eb 100644 --- a/client/src/lib-app/session-store.js +++ b/client/src/lib-app/session-store.js @@ -4,10 +4,6 @@ import date from 'lib-app/date'; class SessionStore { constructor() { this.storage = LocalStorage; - - if (!this.getItem('language')) { - this.setItem('language', 'en'); - } } createSession(userId, token) { diff --git a/client/src/reducers/config-reducer.js b/client/src/reducers/config-reducer.js index 32e63508..51ced243 100644 --- a/client/src/reducers/config-reducer.js +++ b/client/src/reducers/config-reducer.js @@ -35,7 +35,7 @@ class ConfigReducer extends Reducer { onInitConfigs(state, payload) { let currentLanguage = sessionStore.getItem('language'); - if(!_.includes(payload.data.allowedLanguages, currentLanguage)) { + if(payload.data.allowedLanguages && !_.includes(payload.data.allowedLanguages, currentLanguage)) { currentLanguage = payload.data.language; }