getLocale from next-intl #3862 (#3878)

Author: padms

web/app/[locale]/(pages)/[...slug]/page.tsx

@@ -4,8 +4,7 @@ import type { Metadata } from 'next'
 import dynamic from 'next/dynamic'
 import { draftMode } from 'next/headers'
 import { notFound } from 'next/navigation'
-import { locale as rootLocale } from 'next/root-params'
-import { getValidLanguagesLocales } from '@/languageConfig'
+import { getLocale } from 'next-intl/server'
 import { decodeSlugs } from '@/lib/helpers/getFullUrl'
 import { Flags } from '@/sanity/helpers/datasetHelpers'
 import { getNameFromIso } from '@/sanity/helpers/localization'
@@ -35,7 +34,7 @@ export async function generateMetadata({
 }: PageProps<'/[locale]/[...slug]'>): Promise<Metadata> {
   //array, separated by /. e.g. [news, last slug]
   const { slug: encodedSlug } = await params
-  const locale = await rootLocale()
+  const locale = await getLocale()
   const slug = decodeSlugs(encodedSlug) as string[]
 
   const sanityLang = getNameFromIso(locale)

web/app/[locale]/(pages)/news/page.tsx

@@ -3,7 +3,7 @@ import { algoliasearch } from 'algoliasearch'
 import type { Metadata } from 'next'
 import { unstable_cache } from 'next/cache'
 import dynamic from 'next/dynamic'
-import { locale as rootLocale } from 'next/root-params'
+import { getLocale } from 'next-intl/server'
 import { algolia } from '@/lib/config'
 import { Flags } from '@/sanity/helpers/datasetHelpers'
 import { getNameFromIso } from '@/sanity/helpers/localization'
@@ -18,7 +18,7 @@ import NewsRoomTemplate from '@/templates/newsroom/Newsroom'
 const TopicPage = dynamic(() => import('@/templates/topic/TopicPage'))
 
 export async function generateMetadata(): Promise<Metadata> {
-  const locale = await rootLocale()
+  const locale = await getLocale()
   const pageSlug = newsSlug[getNameFromIso(locale)]
   if (Flags.HAS_NEWSROOM) {
     const { data: metaData }: { data: any } = await routeSanityFetch({
@@ -70,7 +70,7 @@ const getInitialResponse = unstable_cache(
 )
 
 export default async function NewsroomPage(_: PageProps<'/[locale]/news'>) {
-  const locale = await rootLocale()
+  const locale = await getLocale()
   const [siteMenuResult, pageResults] = await Promise.all([
     routeSanityFetch({
       query: Flags.HAS_FANCY_MENU ? globalMenuQuery : simpleMenuQuery,

web/app/[locale]/layout.tsx

@@ -3,12 +3,10 @@ import { GoogleTagManager } from '@next/third-parties/google'
 import localFont from 'next/font/local'
 import { draftMode } from 'next/headers'
 import NextLink from 'next/link'
-import { locale as rootLocale } from 'next/root-params'
 import Script from 'next/script'
 import { NextIntlClientProvider } from 'next-intl'
-import { getTranslations } from 'next-intl/server'
+import { getLocale, getTranslations } from 'next-intl/server'
 import { PageProvider } from '@/contexts/pageContext'
-import { languages } from '@/languageConfig'
 import { getLocaleFromIso, getNameFromIso } from '@/sanity/helpers/localization'
 import { dataset } from '@/sanity/lib/api'
 import { routeSanityFetch, SanityLive } from '@/sanity/lib/live'
@@ -38,7 +36,7 @@ export default async function LocaleLayout({
   children,
 }: LayoutProps<'/[locale]'>) {
   const t = await getTranslations()
-  const locale = await rootLocale()
+  const locale = await getLocale()
 
   const queryParams = {
     lang: getNameFromIso(locale) ?? 'en_GB',

web/app/[locale]/page.tsx

@@ -2,7 +2,7 @@ import { stegaClean } from '@sanity/client/stega'
 import type { Metadata } from 'next'
 import { draftMode } from 'next/headers'
 import { notFound } from 'next/navigation'
-import { locale as rootLocale } from 'next/root-params'
+import { getLocale } from 'next-intl/server'
 import { OrganizationJsonLd } from 'next-seo'
 import { Flags } from '@/sanity/helpers/datasetHelpers'
 import { getNameFromIso } from '@/sanity/helpers/localization'
@@ -16,7 +16,7 @@ import HomePage from '@/templates/homepage/HomePage'
 import { FriendlyCaptchaSdkWrapper } from './FriendlyCaptchaWrapper'
 
 export async function generateMetadata(): Promise<Metadata> {
-  const locale = await rootLocale()
+  const locale = await getLocale()
   const { data: metaData }: { data: any } = await routeSanityFetch({
     query: homePageMetaQuery,
     params: {
@@ -33,7 +33,7 @@ export default async function Home(_: PageProps<'/[locale]'>) {
   //const isInPresentationToolContext =
   //  (await cookies()).get('preview-fetch-dest')?.value === 'iframe'
   const { isEnabled: isDraftMode } = await draftMode()
-  const locale = await rootLocale()
+  const locale = await getLocale()
 
   let pageContent = null
   const [siteMenuResult, homePageData] = await Promise.all([