From 8d8b4818ae3fae455eb32e8a6cd8cfc0012998ea Mon Sep 17 00:00:00 2001
From: Jay <admin@trj.tw>
Date: Wed, 5 Apr 2017 15:36:29 +0800
Subject: [PATCH] fix locale 404 not default

---
 public/js/admin_bundle.js | 3 ++-
 src/admin.js              | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/js/admin_bundle.js b/public/js/admin_bundle.js
index b99bb89..8d372c9 100644
--- a/public/js/admin_bundle.js
+++ b/public/js/admin_bundle.js
@@ -92816,7 +92816,8 @@ var PageRoot = function (_React$Component) {
                 return response.json();
             }).then(function (json) {
                 if (json.status != 1) return location.replace('/');
-                var lang = navigator.language.substring(0, 2);
+                var slang = sessionStorage.getItem('lang');
+                var lang = slang || navigator.language.substring(0, 2);
                 fetch('/locales/' + lang + '.json').then(function (response) {
                     if (response.status == 200) return response.json();
                     return {};
diff --git a/src/admin.js b/src/admin.js
index 209f658..d4d00e6 100644
--- a/src/admin.js
+++ b/src/admin.js
@@ -39,7 +39,8 @@ class PageRoot extends React.Component {
             .then(response=>response.json())
             .then(json => {
                 if(json.status != 1) return location.replace('/');
-                let lang = navigator
+                let slang = sessionStorage.getItem('lang');
+                let lang = slang || navigator
                     .language
                     .substring(0, 2);
                 fetch(`/locales/${lang}.json`).then(response => {