From 9bf6d57f1f788b15ca9faa86edade54d376cac32 Mon Sep 17 00:00:00 2001
From: Jessie Ssebuliba <jessiessebuliba@gmail.com>
Date: Thu, 5 Feb 2026 13:27:59 +0300
Subject: [PATCH] language switcher should not point to the home page

Signed-off-by: Jessie Ssebuliba <jessiessebuliba@gmail.com>
---
 src/app/[locale]/layout.tsx |  3 ++-
 src/components/Navbar.tsx   | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx
index 2b626fba..3310716f 100644
--- a/src/app/[locale]/layout.tsx
+++ b/src/app/[locale]/layout.tsx
@@ -7,6 +7,7 @@ import { Montserrat } from 'next/font/google'
 import '../globals.css'
 import Navbar from '@/components/Navbar'
 import Footer from '@/components/Footer'
+import Script from 'next/script';
 
 const montserrat = Montserrat({ 
   subsets: ['latin'],
@@ -85,7 +86,7 @@ export default async function LocaleLayout({
             <main>{children}</main>
             <Footer locale={locale} />
           </div>
-          <script src="https://code.iconify.design/2/2.2.1/iconify.min.js"></script>
+          <Script src="https://code.iconify.design/2/2.2.1/iconify.min.js"></Script>
         </NextIntlClientProvider>
       </body>
     </html>
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index 1bf35c77..76f9caa4 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import { useTranslations } from 'next-intl'
-import { Link } from '@/i18n/routing'
+import { Link, usePathname } from '@/i18n/routing'
 import Image from 'next/image'
 import { useState } from 'react'
 import mainMenu from '@/data/mainMenu.json'
@@ -14,6 +14,7 @@ interface NavbarProps {
 export default function Navbar({ locale }: NavbarProps) {
   const [isOpen, setIsOpen] = useState(false)
   const t = useTranslations()
+  const pathname = usePathname()
 
   const otherLocale = locale === 'en' ? 'de' : 'en'
 
@@ -77,10 +78,10 @@ export default function Navbar({ locale }: NavbarProps) {
                       </svg>
                       <div className="flex items-center gap-2">
                         <span className={`rounded-full px-2.5 py-1 text-sm font-medium leading-none text-center ${locale === 'en' ? 'bg-green text-blue' : 'bg-transparent text-white hover:bg-white/20'} transition-all ease-in-out duration-150`}>
-                          <Link href="/" locale="en">EN</Link>
+                          <Link href={pathname} locale="en">EN</Link>
                         </span>
                         <span className={`rounded-full px-2.5 py-1 text-sm font-medium leading-none text-center ${locale === 'de' ? 'bg-green text-blue' : 'bg-transparent text-white hover:bg-white/20'} transition-all ease-in-out duration-150`}>
-                          <Link href="/" locale="de">DE</Link>
+                          <Link href={pathname} locale="de">DE</Link>
                         </span>
                       </div>
                     </div>
@@ -194,10 +195,10 @@ export default function Navbar({ locale }: NavbarProps) {
                   </svg>
                   <div className="flex items-center gap-3">
                     <span className={`rounded-full px-2 py-[3px] text-xs font-medium leading-none text-center ${locale === 'en' ? 'bg-green text-blue' : 'bg-transparent text-white hover:bg-white/20'} transition-all ease-in-out duration-150`}>
-                      <Link href="/" locale="en">EN</Link>
+                      <Link href={pathname} locale="en">EN</Link>
                     </span>
                     <span className={`rounded-full px-2 py-[3px] text-xs font-medium leading-none text-center ${locale === 'de' ? 'bg-green text-blue' : 'bg-transparent text-white hover:bg-white/20'} transition-all ease-in-out duration-150`}>
-                      <Link href="/" locale="de">DE</Link>
+                      <Link href={pathname} locale="de">DE</Link>
                     </span>
                   </div>
                 </div>