From bc3db70bd9b01d925967f8d83f526e31305bd8ce Mon Sep 17 00:00:00 2001
From: Sol Irvine <sol@zenzen.io>
Date: Sun, 8 Oct 2023 21:36:08 +0900
Subject: [PATCH] revert for japan-first settings

---
 components/cart/index.tsx                     | 2 +-
 components/layout/navbar/language-control.tsx | 2 +-
 middleware.ts                                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/cart/index.tsx b/components/cart/index.tsx
index f82c7a67f..d5e9103ef 100644
--- a/components/cart/index.tsx
+++ b/components/cart/index.tsx
@@ -14,7 +14,7 @@ export default async function Cart({ locale }: { locale?: SupportedLocale }) {
 
   const promotedItem: Product | undefined = await getProduct({
     handle: 'gift-bag-and-postcard-set',
-    language: locale?.toUpperCase() || 'EN'
+    language: locale?.toUpperCase() || 'JA'
   });
 
   return <CartModal cart={cart} promotedItem={promotedItem} />;
diff --git a/components/layout/navbar/language-control.tsx b/components/layout/navbar/language-control.tsx
index 13457f763..993fbf32a 100644
--- a/components/layout/navbar/language-control.tsx
+++ b/components/layout/navbar/language-control.tsx
@@ -19,7 +19,7 @@ export const LanguageControl = ({ lang }: { lang?: SupportedLocale }) => {
 
   const basePathName = () => {
     const unjoined = pathName.split('/');
-    const unjoinedWithoutLocale = removeItem(unjoined, 'ja');
+    const unjoinedWithoutLocale = removeItem(unjoined, 'en');
     return unjoinedWithoutLocale.join('/') || '/';
   };
 
diff --git a/middleware.ts b/middleware.ts
index b0a3d6402..f7520bddd 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -2,10 +2,10 @@ import createMiddleware from 'next-intl/middleware';
 
 export default createMiddleware({
   // A list of all locales that are supported
-  locales: ['en', 'ja'],
+  locales: ['ja', 'en'],
 
   // If this locale is matched, pathnames work without a prefix (e.g. `/about`)
-  defaultLocale: 'en'
+  defaultLocale: 'ja'
 });
 
 export const config = {