From 5359289dfd76b787b788b496c468aae1dbf1bf9b Mon Sep 17 00:00:00 2001
From: hanif salafi <hanifsalafi456@gmail.com>
Date: Wed, 1 Jan 2025 23:29:11 +0700
Subject: [PATCH] feat: fixing i18n error, remove some template text

---
 components/landing-page/footer.tsx       | 2 +-
 components/partials/customizer/index.tsx | 6 +++---
 components/partials/footer/index.tsx     | 3 +--
 i18n/request.ts                          | 9 +++++++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/components/landing-page/footer.tsx b/components/landing-page/footer.tsx
index 89966169..efee662a 100644
--- a/components/landing-page/footer.tsx
+++ b/components/landing-page/footer.tsx
@@ -27,7 +27,7 @@ const Footer = () => {
     <footer className="bg-[#bb3523] text-white text-xs lg:text-sm py-4">
       <div className="container mx-auto flex flex-col md:flex-row justify-between items-center space-y-2 md:space-y-0 px-4">
         {/* Hak Cipta */}
-        <div className="text-center md:text-left">Hak Cipta © 2023 Divisi Humas Polri. All Right Reserved.</div>
+        <div className="text-center md:text-left">Hak Cipta &copy; {new Date().getFullYear()} Divisi Humas Polri. All Right Reserved.</div>
 
         {/* Menu Links */}
         <div className="flex flex-wrap justify-center items-center space-x-3">
diff --git a/components/partials/customizer/index.tsx b/components/partials/customizer/index.tsx
index 00f5ca55..83bbf61f 100644
--- a/components/partials/customizer/index.tsx
+++ b/components/partials/customizer/index.tsx
@@ -68,7 +68,7 @@ const ThemeCustomize = ({ }) => {
             </div>
           </SheetTitle>
         </SheetHeader>
-        <ScrollArea className="h-[calc(100%-120px)] -mx-6">
+        <ScrollArea className="h-[calc(100%-100px)] -mx-6">
           <div className=" space-y-8 mt-3">
             <Tabs defaultValue="style" className=" w-full">
               <TabsList className="w-full border border-solid border-default-200 dark:border-default-300 rounded-none p-0 divide-x gap-0 ">
@@ -117,9 +117,9 @@ const ThemeCustomize = ({ }) => {
             </Tabs>
           </div>
         </ScrollArea>
-        <SheetFooter className="lg:py-4 lg:gap-3 gap-2 flex justify-between    ">
+        {/* <SheetFooter className="lg:py-4 lg:gap-3 gap-2 flex justify-between    ">
           <BuyButton />
-        </SheetFooter>
+        </SheetFooter> */}
       </SheetContent>
     </Sheet>
   );
diff --git a/components/partials/footer/index.tsx b/components/partials/footer/index.tsx
index e61ba499..e709130d 100644
--- a/components/partials/footer/index.tsx
+++ b/components/partials/footer/index.tsx
@@ -10,8 +10,7 @@ const DashCodeFooter = () => {
       <div className=" md:flex  justify-between text-default-600 hidden">
         <div className="text-center ltr:md:text-start rtl:md:text-right text-sm"></div>
         <div className="ltr:md:text-right rtl:md:text-end text-center text-sm">
-          COPYRIGHT &copy; {new Date().getFullYear()} Media Hub, All rights
-          Reserved
+          Hak Cipta &copy; {new Date().getFullYear()} Divisi Humas Polri Hub. All rights Reserved.
         </div>
       </div>
       <div className="flex md:hidden justify-around items-center">
diff --git a/i18n/request.ts b/i18n/request.ts
index 560e8e6f..80ef9c3c 100644
--- a/i18n/request.ts
+++ b/i18n/request.ts
@@ -2,11 +2,16 @@ import {notFound} from 'next/navigation';
 import {getRequestConfig} from 'next-intl/server';
 import {routing} from './routing';
  
-export default getRequestConfig(async ({locale}) => {
+export default getRequestConfig(async ({requestLocale}) => {
+  let locale = await requestLocale;
   // Validate that the incoming `locale` parameter is valid
-  if (!routing.locales.includes(locale as any)) notFound();
+  // if (!routing.locales.includes(locale as any)) notFound();
+  if (!locale || !routing.locales.includes(locale as any)) {
+    locale = routing.defaultLocale;
+  }
  
   return {
+    locale,
     messages: (await import(`../messages/${locale}.json`)).default
   };
 });
\ No newline at end of file