From c4f3d1e432166e63fdd60e98705bceae6a696160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Wed, 22 Aug 2018 01:48:08 +0900 Subject: [PATCH] Update boot.js --- src/client/app/boot.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/client/app/boot.js b/src/client/app/boot.js index 218d57d8e..b15046c22 100644 --- a/src/client/app/boot.js +++ b/src/client/app/boot.js @@ -32,13 +32,15 @@ //#region Detect app name let app = null; - if (url.pathname == '/docs' || url.pathname.startsWith('/docs/')) app = 'docs'; - if (url.pathname == '/dev' || url.pathname.startsWith('/dev/')) app = 'dev'; - if (url.pathname == '/auth' || url.pathname.startsWith('/auth/')) app = 'auth'; + if (`${url.pathname}/`.startsWith('/docs/')) app = 'docs'; + if (`${url.pathname}/`.startsWith('/dev/')) app = 'dev'; + if (`${url.pathname}/`.startsWith('/auth/')) app = 'auth'; //#endregion //#region Detect the user language - let lang = navigator.language.split('-')[0]; + let lang = navigator.language; + + if (!LANGS.includes(lang)) lang = lang.split('-')[0]; // The default language is English if (!LANGS.includes(lang)) lang = 'en'; @@ -104,7 +106,7 @@ // グローバルにタイマーIDを代入しておく window.mkBootTimer = window.setTimeout(async () => { // Fetch meta - const res = await fetch('/api/meta', { + const res = await fetch(API + '/meta', { method: 'POST', cache: 'no-cache' });