feat: always prefix locales

Blazity · Nov 9, 2023 · 28d9e37 · 28d9e37
1 parent c605a64
commit 28d9e37
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/app/Providers.tsx b/src/app/Providers.tsx
@@ -1,17 +1,21 @@
 "use client"
 
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
+import { NextIntlClientProvider } from "next-intl"
 import { ReactNode, useState } from "react"
 import { TooltipProvider } from "@/components/ui/Tooltip/Tooltip"
+import { Locale } from "@/i18n/i18n"
 import { GlobalTranslations } from "@/i18n/setTranslations"
 import { TranslationsProvider } from "@/i18n/useTranslations"
 
 export default function Providers({
  children,
  translations,
+ locale,
 }: {
  children: ReactNode
  translations: GlobalTranslations
+ locale: Locale
 }) {
  const [queryClient] = useState(
  () =>
@@ -27,7 +31,9 @@ export default function Providers({
  return (
  <QueryClientProvider client={queryClient}>
  <TranslationsProvider translations={translations}>
- <TooltipProvider>{children}</TooltipProvider>
+ <TooltipProvider>
+ <NextIntlClientProvider locale={locale}>{children}</NextIntlClientProvider>
+ </TooltipProvider>
  </TranslationsProvider>
  </QueryClientProvider>
  )

diff --git a/src/app/[lang]/layout.tsx b/src/app/[lang]/layout.tsx
@@ -47,13 +47,11 @@ export default async function Layout({ children, params }: { children: React.Rea
  return (
  <html lang={locale}>
  <GoogleAnalytics />
- <Providers translations={translations}>
+ <Providers translations={translations} locale={locale}>
  <body className="flex min-h-screen flex-col items-center ">
  <div className="z-50 flex w-full justify-center border-b bg-white">
  <nav className="flex w-full max-w-[1200px] items-center justify-end gap-4 py-4">
- <NextIntlClientProvider locale={locale}>
- <Navigation navigation={navigation} />
- </NextIntlClientProvider>
+ <Navigation navigation={navigation} />
  </nav>
  </div>
 

diff --git a/src/middleware.ts b/src/middleware.ts
@@ -4,6 +4,7 @@ import { i18n } from "./i18n/i18n"
 export default createMiddleware({
  locales: i18n.locales,
  defaultLocale: i18n.defaultLocale,
+ localePrefix: "always",
 })
 
 export const config = {