summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-08-25 19:37:35 +0900
committerGitHub <noreply@github.com>2018-08-25 19:37:35 +0900
commit16520c7b4c797ea7e20e438d83562d41acb6cd65 (patch)
tree32f3a713ed71480721aec6809983b20bb3d7967f /src
parent:v: (diff)
parentUpdate boot.js (diff)
downloadmisskey-16520c7b4c797ea7e20e438d83562d41acb6cd65.tar.gz
misskey-16520c7b4c797ea7e20e438d83562d41acb6cd65.tar.bz2
misskey-16520c7b4c797ea7e20e438d83562d41acb6cd65.zip
Merge pull request #2476 from acid-chicken/patch-4
Fix #2392
Diffstat (limited to 'src')
-rw-r--r--src/client/app/boot.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/client/app/boot.js b/src/client/app/boot.js
index 86d48faf1a..2ee771868f 100644
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -51,9 +51,10 @@
}
}
- if (settings) {
- if (settings.device.lang) lang = settings.device.lang;
- }
+ if (settings &&
+ settings.device.lang &&
+ LANGS.includes(settings.device.lang))
+ lang = settings.device.lang;
//#endregion
// Detect the user agent