oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

Revert "表示言語が設定されてない場合、ブラウザの言語と関係なく日本語にする (MisskeyIO#175)" (#28)

Browse source 
This reverts commit e695c60a1d.
This commit is contained in:
Cocoa Hoto 2024-06-20 07:57:33 +09:00 • committed by 무라쿠모
parent dbca9899a5
commit 621d08540b
No known key found for this signature in database
GPG key ID: 139D6573F92DA9F7
3 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
packages/backend/src/server/web/boot.js
View file

@ -34,9 +34,17 @@
//#region Detect language & fetch translations
if (!localStorage.hasOwnProperty('locale')) {
const supportedLangs = LANGS;
let lang = localStorage.getItem('lang');
if (lang == null || lang.toString == null || lang.toString() === 'null') {
lang = 'ja-JP';
if (lang == null || !supportedLangs.includes(lang)) {
if (supportedLangs.includes(navigator.language)) {
lang = navigator.language;
} else {
lang = supportedLangs.find(x => x.split('-')[0] === navigator.language);
// Fallback
if (lang == null) lang = 'en-US';
}
}
const metaRes = await window.fetch('/api/meta', {
@ -59,6 +67,12 @@
return;
}
// for https://github.com/misskey-dev/misskey/issues/10202
if (lang == null || lang.toString == null || lang.toString() === 'null') {
console.error('invalid lang value detected!!!', typeof lang, lang);
lang = 'en-US';
}
const localRes = await window.fetch(`/assets/locales/${lang}.${v}.json`);
if (localRes.status === 200) {
localStorage.setItem('lang', lang);