refactor: make locale handling truly centralized and robust

- Added getPathWithoutLocale() and buildLocalePath() helpers to locales.ts
- Updated Header to use centralized helpers instead of hardcoded regex
- Updated middleware to use SUPPORTED_LOCALES in matcher config
- Updated LocaleProvider to use isValidLocale() instead of hardcoded array

To add a new language now, only update:
1. SUPPORTED_LOCALES in locales.ts
2. LOCALE_CONFIG entry with label, flag, saleorLocale
3. Add translation keys to all message files

All routing now uses centralized constants - no more hardcoded locale lists.
This commit is contained in:
Unchained
2026-03-24 11:52:22 +02:00
parent 0a7c555549
commit 03becb6ce7
4 changed files with 37 additions and 26 deletions

View File

@@ -9,7 +9,7 @@ import { useTranslations } from "next-intl";
import { useSaleorCheckoutStore } from "@/stores/saleorCheckoutStore";
import { User, ShoppingBag, Menu, X, Globe } from "lucide-react";
import CartDrawer from "@/components/cart/CartDrawer";
import { SUPPORTED_LOCALES, LOCALE_COOKIE, LOCALE_CONFIG, isValidLocale } from "@/lib/i18n/locales";
import { SUPPORTED_LOCALES, LOCALE_COOKIE, LOCALE_CONFIG, isValidLocale, getPathWithoutLocale, buildLocalePath } from "@/lib/i18n/locales";
import type { Locale } from "@/lib/i18n/locales";
interface HeaderProps {
@@ -48,8 +48,8 @@ export default function Header({ locale = "sr" }: HeaderProps) {
return;
}
document.cookie = `${LOCALE_COOKIE}=${newLocale}; path=/; max-age=31536000`;
const pathWithoutLocale = pathname.replace(/^\/(sr|en|de|fr)/, "") || "/";
const newPath = `/${newLocale}${pathWithoutLocale}`;
const pathWithoutLocale = getPathWithoutLocale(pathname);
const newPath = buildLocalePath(newLocale as Locale, pathWithoutLocale);
window.location.replace(newPath);
setLangDropdownOpen(false);
};

View File

@@ -3,6 +3,7 @@
import { NextIntlClientProvider } from "next-intl";
import { getMessages } from "next-intl/server";
import { notFound } from "next/navigation";
import { SUPPORTED_LOCALES, isValidLocale } from "@/lib/i18n/locales";
export default async function LocaleProvider({
children,
@@ -11,8 +12,7 @@ export default async function LocaleProvider({
children: React.ReactNode;
locale: string;
}) {
const locales = ["en", "sr"];
if (!locales.includes(locale)) notFound();
if (!isValidLocale(locale)) notFound();
const messages = await getMessages();

View File

@@ -21,6 +21,19 @@ export function getSaleorLocale(locale: Locale): string {
}
export function getLocaleFromPath(pathname: string): string {
const match = pathname.match(/^\/(sr|en|de|fr)/);
const pattern = SUPPORTED_LOCALES.join("|");
const match = pathname.match(new RegExp(`^\\/(${pattern})`));
return match ? match[1] : DEFAULT_LOCALE;
}
export function getPathWithoutLocale(pathname: string): string {
const pattern = SUPPORTED_LOCALES.join("|");
return pathname.replace(new RegExp(`^\\/(${pattern})`), "") || "/";
}
export function buildLocalePath(locale: Locale, path: string): string {
if (locale === DEFAULT_LOCALE) {
return path === "/" ? "/" : path;
}
return `/${locale}${path === "/" ? "" : path}`;
}