From 04d8d773bf0a0b004da251f9f885c87ed745b929 Mon Sep 17 00:00:00 2001
From: Unchained <unchained@nodecrew.me>
Date: Thu, 9 Apr 2026 10:03:26 +0200
Subject: [PATCH] fix: ensure all links are properly localized with locale
 prefix

- Update basePath to always include locale prefix (/)
- Fix productsHref to use basePath consistently
- Fix product links in ProductsGrid to use basePath
- Ensure /sr/pages link to /sr/products, /en to /en/products, etc.
---
 src/app/[locale]/solutions/[slug]/page.tsx            | 2 +-
 src/components/programmatic-seo/OilForConcernPage.tsx | 4 ++--
 src/components/programmatic-seo/ProductsGrid.tsx      | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/app/[locale]/solutions/[slug]/page.tsx b/src/app/[locale]/solutions/[slug]/page.tsx
index d82e73e..f69ab9b 100644
--- a/src/app/[locale]/solutions/[slug]/page.tsx
+++ b/src/app/[locale]/solutions/[slug]/page.tsx
@@ -88,7 +88,7 @@ export default async function SolutionPage({ params }: PageProps) {
   // Filter out bundle products (2x, 3x versions) - only show original 4 products
   const products = filterOutBundles(allProducts).slice(0, 4);
   
-  const basePath = validLocale === DEFAULT_LOCALE ? "" : `/${validLocale}`;
+  const basePath = `/${validLocale}`;
   
   const faqQuestions = page.faqs.map((faq) => ({
     question: getLocalizedString(faq.question, validLocale),
diff --git a/src/components/programmatic-seo/OilForConcernPage.tsx b/src/components/programmatic-seo/OilForConcernPage.tsx
index 81244dd..c911040 100644
--- a/src/components/programmatic-seo/OilForConcernPage.tsx
+++ b/src/components/programmatic-seo/OilForConcernPage.tsx
@@ -26,7 +26,7 @@ export function OilForConcernPageTemplate({ page, locale, basePath, products }:
   const howToApply = getLocalizedArray(page.howToApply, locale);
   const expectedResults = getLocalizedString(page.expectedResults, locale);
   const timeframe = getLocalizedString(page.timeframe, locale);
-  const productsHref = locale === "sr" ? "/products" : `/${locale}/products`;
+  const productsHref = `${basePath}/products`;
   
   return (
     <>
@@ -149,7 +149,7 @@ export function OilForConcernPageTemplate({ page, locale, basePath, products }:
           </div>
         </section>
 
-        <ProductsGrid products={products} locale={locale} />
+        <ProductsGrid products={products} locale={locale} basePath={basePath} />
       </main>
       <Footer locale={locale} />
     </>
diff --git a/src/components/programmatic-seo/ProductsGrid.tsx b/src/components/programmatic-seo/ProductsGrid.tsx
index ccc49c6..0beeb9f 100644
--- a/src/components/programmatic-seo/ProductsGrid.tsx
+++ b/src/components/programmatic-seo/ProductsGrid.tsx
@@ -14,9 +14,10 @@ import Link from "next/link";
 interface ProductsGridProps {
   products: Product[];
   locale: string;
+  basePath?: string;
 }
 
-function ProductCardWithAddToCart({ product, index, locale }: { product: Product; index: number; locale: string }) {
+function ProductCardWithAddToCart({ product, index, locale, basePath = "" }: { product: Product; index: number; locale: string; basePath?: string }) {
   const t = useTranslations("ProductCard");
   const tProduct = useTranslations("Product");
   const [isAdding, setIsAdding] = useState(false);
@@ -29,7 +30,7 @@ function ProductCardWithAddToCart({ product, index, locale }: { product: Product
   const localized = getLocalizedProduct(product, saleorLocale);
   const variant = product.variants?.[0];
   const isAvailable = (variant?.quantityAvailable || 0) > 0;
-  const productHref = locale === "sr" ? `/products/${localized.slug}` : `/${locale}/products/${localized.slug}`;
+  const productHref = `${basePath}/products/${localized.slug}`;
 
   const handleAddToCart = async (e: React.MouseEvent) => {
     e.preventDefault();
@@ -127,7 +128,7 @@ function ProductCardWithAddToCart({ product, index, locale }: { product: Product
   );
 }
 
-export default function ProductsGrid({ products, locale }: ProductsGridProps) {
+export default function ProductsGrid({ products, locale, basePath = "" }: ProductsGridProps) {
   const t = useTranslations("Solutions");
   const validProducts = products.filter(p => p && p.id);
 
@@ -150,6 +151,7 @@ export default function ProductsGrid({ products, locale }: ProductsGridProps) {
               product={product}
               index={index}
               locale={locale}
+              basePath={basePath}
             />
           ))}
         </div>