From 8dc9ec06f806bc8a2e6f128e99aa76af3e9b4647 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 23 Aug 2018 01:37:05 +0900
Subject: 良い感じに
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/app/boot.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/client')

diff --git a/src/client/app/boot.js b/src/client/app/boot.js
index 952881f6cb..6bcceec217 100644
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -38,12 +38,18 @@
 	//#endregion
 
 	//#region Detect the user language
-	let lang = navigator.language;
+	let lang = null;
 
-	if (!LANGS.includes(lang)) lang = lang.split('-')[0];
+	if (LANGS.includes(navigator.language)) {
+		lang = navigator.language;
+	} else {
+		lang = LANGS.find(x => x.split('-')[0] == lang);
 
-	// The default language is English
-	if (!LANGS.includes(lang)) lang = 'en';
+		if (lang == null) {
+			// Fallback
+			lang = 'en-US';
+		}
+	}
 
 	if (settings) {
 		if (settings.device.lang) lang = settings.device.lang;
-- 
cgit v1.2.3-freya