summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-08-23 01:37:05 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-08-23 01:37:05 +0900
commit8dc9ec06f806bc8a2e6f128e99aa76af3e9b4647 (patch)
tree5d8d92b673674898b19f26b4c0c426eb494d81c0 /src/client
parentMerge pull request #2408 from syuilo/l10n_develop (diff)
downloadsharkey-8dc9ec06f806bc8a2e6f128e99aa76af3e9b4647.tar.gz
sharkey-8dc9ec06f806bc8a2e6f128e99aa76af3e9b4647.tar.bz2
sharkey-8dc9ec06f806bc8a2e6f128e99aa76af3e9b4647.zip
良い感じに
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/boot.js14
1 files changed, 10 insertions, 4 deletions
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;