From 784d92bf0f5d63e56852dff91bb0a177cf60ac12 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 25 Jul 2023 21:56:59 -0700
Subject: [PATCH] fix: :bug: en-US default merge language

Preoperly addresses the issue from !10527
---
 locales/index.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/locales/index.js b/locales/index.js
index 62e55e7e5c..a3cfbaf2bc 100644
--- a/locales/index.js
+++ b/locales/index.js
@@ -71,15 +71,15 @@ module.exports = Object.entries(locales).reduce(
 		(a[k] = (() => {
 			const [lang] = k.split("-");
 			switch (k) {
-				case "ja-JP":
-					return v;
-				case "ja-KS":
 				case "en-US":
-					return merge(locales["ja-JP"], v);
+					return v;
+				case "ja-JP":
+				case "ja-KS":
+					return merge(locales["en-US"], v);
 				default:
 					return merge(
-						locales["ja-JP"],
 						locales["en-US"],
+						locales["ja-JP"],
 						locales[`${lang}-${primaries[lang]}`] || {},
 						v,
 					);