sim1222/misskey
1
0
Fork 0
mirror of https://github.com/sim1222/misskey.git synced 2025-04-29 02:37:22 +09:00
Code Issues Projects Releases Wiki Activity

fix locale unmerged error

Browse Source
This commit is contained in:
sim1222 2023-04-02 22:22:22 +09:00
parent b57588e312
commit 22715c05bd
No known key found for this signature in database
GPG Key ID: 04EF48D01BEB0298
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/backend/src/server/web/boot.js
View File

@ -46,9 +46,12 @@
} }
const res = await fetch(`/assets/locales/${lang}.${v}.json`); const res = await fetch(`/assets/locales/${lang}.${v}.json`);
if (res.status === 200) { const fallback = await fetch(`/assets/locales/ja-JP.${v}.json`);
if (res.status === 200 && fallback.status === 200) {
const merged = {...await res.json(),...await fallback.json()}
localStorage.setItem('lang', lang); localStorage.setItem('lang', lang);
localStorage.setItem('locale', await res.text()); localStorage.setItem('locale', JSON.stringify(merged));
localStorage.setItem('localeVersion', v); localStorage.setItem('localeVersion', v);
} else { } else {
await checkUpdate(); await checkUpdate();