Browse Source

Merge pull request #2433 from weseek/fix/null-check-of-currentUser

null check of currentUser
itizawa 5 years ago
parent
commit
5ef8f23276
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/client/js/services/AppContainer.js
  2. 1 1
      src/client/js/util/i18n.js

+ 1 - 1
src/client/js/services/AppContainer.js

@@ -47,7 +47,7 @@ export default class AppContainer extends Container {
       this.currentUser = JSON.parse(currentUserElem.textContent);
     }
 
-    const userLocaleId = this.currentUser.lang;
+    const userLocaleId = this.currentUser?.lang;
     this.i18n = i18nFactory(userLocaleId);
 
     this.containerInstances = {};

+ 1 - 1
src/client/js/util/i18n.js

@@ -7,7 +7,7 @@ import locales from '@root/resource/locales';
 // extract metadata list from 'resource/locales/${locale}/meta.json'
 export const localeMetadatas = Object.values(locales).map(locale => locale.meta);
 
-export const i18nFactory = (userLocaleId) => {
+export const i18nFactory = (userLocaleId = 'en_US') => {
   // setup LanguageDetector
   const langDetector = new LanguageDetector();
   langDetector.addDetector({