Ivan - Avoid english language as default

oneWaveAdrian · Jun 28, 2017 · fdbcbd6 · fdbcbd6
1 parent 36bac5d
commit fdbcbd6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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;
         }