From 22715c05bd21dc64f26b8c73d17bb2c512e236c2 Mon Sep 17 00:00:00 2001
From: sim1222 <kokt@sim1222.com>
Date: Sun, 2 Apr 2023 22:22:22 +0900
Subject: [PATCH] fix locale unmerged error

---
 packages/backend/src/server/web/boot.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index 034acd9f4..8967b7e80 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -46,9 +46,12 @@
 		}
 
 		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('locale', await res.text());
+			localStorage.setItem('locale', JSON.stringify(merged));
 			localStorage.setItem('localeVersion', v);
 		} else {
 			await checkUpdate();