Merge pull request #15282 from ethereum/fix-load-messages-2

Refactor i18n Message Loading

Author: wackerow

app/[locale]/assets/page.tsx

@@ -1,5 +1,9 @@
 import pick from "lodash.pick"
-import { getTranslations } from "next-intl/server"
+import {
+  getMessages,
+  getTranslations,
+  setRequestLocale,
+} from "next-intl/server"
 
 import { Lang } from "@/lib/types"
 
@@ -10,17 +14,17 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
 
 import AssetsPage from "./_components/assets"
 
-import { loadMessages } from "@/i18n/loadMessages"
-
 export default async function Page({
   params,
 }: {
   params: Promise<{ locale: Lang }>
 }) {
   const { locale } = await params
 
+  setRequestLocale(locale)
+
   // Get i18n messages
-  const allMessages = await loadMessages(locale)
+  const allMessages = await getMessages({ locale })
   const requiredNamespaces = getRequiredNamespacesForPage("/assets")
   const messages = pick(allMessages, requiredNamespaces)
 

app/[locale]/bug-bounty/page.tsx

@@ -1,5 +1,9 @@
 import pick from "lodash.pick"
-import { getTranslations } from "next-intl/server"
+import {
+  getMessages,
+  getTranslations,
+  setRequestLocale,
+} from "next-intl/server"
 
 import { type Params } from "@/lib/types"
 
@@ -10,13 +14,13 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
 
 import BugBountiesPage from "./_components/bug-bounty"
 
-import { loadMessages } from "@/i18n/loadMessages"
-
 export default async function Page({ params }: { params: Promise<Params> }) {
   const { locale } = await params
 
+  setRequestLocale(locale)
+
   // Get i18n messages
-  const allMessages = await loadMessages(locale)
+  const allMessages = await getMessages({ locale })
   const requiredNamespaces = getRequiredNamespacesForPage("/bug-bounty")
   const messages = pick(allMessages, requiredNamespaces)
 

app/[locale]/community/page.tsx

@@ -1,5 +1,9 @@
 import pick from "lodash.pick"
-import { getTranslations } from "next-intl/server"
+import {
+  getMessages,
+  getTranslations,
+  setRequestLocale,
+} from "next-intl/server"
 
 import { Lang } from "@/lib/types"
 
@@ -10,17 +14,17 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
 
 import CommunityPage from "./_components/community"
 
-import { loadMessages } from "@/i18n/loadMessages"
-
 export default async function Page({
   params,
 }: {
   params: Promise<{ locale: Lang }>
 }) {
   const { locale } = await params
 
+  setRequestLocale(locale)
+
   // Get i18n messages
-  const allMessages = await loadMessages(locale)
+  const allMessages = await getMessages({ locale })
   const requiredNamespaces = getRequiredNamespacesForPage("/community")
   const pickedMessages = pick(allMessages, requiredNamespaces)
 

app/[locale]/contributing/translation-program/acknowledgements/page.tsx

@@ -1,5 +1,9 @@
 import pick from "lodash.pick"
-import { getTranslations } from "next-intl/server"
+import {
+  getMessages,
+  getTranslations,
+  setRequestLocale,
+} from "next-intl/server"
 
 import { Lang } from "@/lib/types"
 
@@ -10,13 +14,13 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
 
 import Acknowledgements from "./_components/acknowledgements"
 
-import { loadMessages } from "@/i18n/loadMessages"
-
 const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
   const { locale } = await params
 
+  setRequestLocale(locale)
+
   // Get i18n messages
-  const allMessages = await loadMessages(locale)
+  const allMessages = await getMessages({ locale })
   const requiredNamespaces = getRequiredNamespacesForPage(
     "/contributing/translation-program/acknowledgements"
   )

app/[locale]/contributing/translation-program/contributors/page.tsx

@@ -1,5 +1,9 @@
 import pick from "lodash.pick"
-import { getTranslations } from "next-intl/server"
+import {
+  getMessages,
+  getTranslations,
+  setRequestLocale,
+} from "next-intl/server"
 
 import { Lang } from "@/lib/types"
 
@@ -10,13 +14,13 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
 
 import Contributors from "./_components/contributors"
 
-import { loadMessages } from "@/i18n/loadMessages"
-
 const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
   const { locale } = await params
 
+  setRequestLocale(locale)
+
   // Get i18n messages
-  const allMessages = await loadMessages(locale)
+  const allMessages = await getMessages({ locale })
   const requiredNamespaces = getRequiredNamespacesForPage(
     "/contributing/translation-program/contributors"
   )

app/[locale]/dapps/page.tsx

@@ -1,5 +1,9 @@
 import pick from "lodash.pick"
-import { getTranslations } from "next-intl/server"
+import {
+  getMessages,
+  getTranslations,
+  setRequestLocale,
+} from "next-intl/server"
 
 import { Params } from "@/lib/types"
 
@@ -10,13 +14,11 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
 
 import DappsPage from "./_components/dapps"
 
-import { loadMessages } from "@/i18n/loadMessages"
-
 export default async function Page({ params }: { params: Promise<Params> }) {
   const { locale } = await params
 
   // Get i18n messages
-  const allMessages = await loadMessages(locale)
+  const allMessages = await getMessages({ locale })
   const requiredNamespaces = getRequiredNamespacesForPage("/dapps")
   const pickedMessages = pick(allMessages, requiredNamespaces)
 
@@ -34,6 +36,8 @@ export async function generateMetadata({
 }) {
   const { locale } = await params
 
+  setRequestLocale(locale)
+
   const t = await getTranslations({ locale })
 
   return await getMetadata({

app/[locale]/developers/learning-tools/page.tsx

@@ -1,5 +1,9 @@
 import pick from "lodash.pick"
-import { getTranslations } from "next-intl/server"
+import {
+  getMessages,
+  getTranslations,
+  setRequestLocale,
+} from "next-intl/server"
 
 import { Lang } from "@/lib/types"
 
@@ -10,13 +14,13 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
 
 import LearningTools from "./_components/learning-tools"
 
-import { loadMessages } from "@/i18n/loadMessages"
-
 const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
   const { locale } = await params
 
+  setRequestLocale(locale)
+
   // Get i18n messages
-  const allMessages = await loadMessages(locale)
+  const allMessages = await getMessages({ locale })
   const requiredNamespaces = getRequiredNamespacesForPage(
     "/developers/learning-tools"
   )

app/[locale]/developers/local-environment/page.tsx

@@ -1,5 +1,9 @@
 import pick from "lodash.pick"
-import { getTranslations } from "next-intl/server"
+import {
+  getMessages,
+  getTranslations,
+  setRequestLocale,
+} from "next-intl/server"
 
 import { Lang } from "@/lib/types"
 
@@ -11,7 +15,6 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
 
 import LocalEnvironmentPage from "./_components/local-environment"
 
-import { loadMessages } from "@/i18n/loadMessages"
 import { getLocalEnvironmentFrameworkData } from "@/lib/api/ghRepoData"
 
 const loadData = dataLoader([
@@ -21,10 +24,12 @@ const loadData = dataLoader([
 const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
   const { locale } = await params
 
+  setRequestLocale(locale)
+
   const [frameworksListData] = await loadData()
 
   // Get i18n messages
-  const allMessages = await loadMessages(locale)
+  const allMessages = await getMessages({ locale })
   const requiredNamespaces = getRequiredNamespacesForPage(
     "/developers/local-environment"
   )

app/[locale]/developers/page.tsx

@@ -1,5 +1,9 @@
 import pick from "lodash.pick"
-import { getTranslations } from "next-intl/server"
+import {
+  getMessages,
+  getTranslations,
+  setRequestLocale,
+} from "next-intl/server"
 
 import { Lang } from "@/lib/types"
 
@@ -10,13 +14,13 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
 
 import Developers from "./_components/developers"
 
-import { loadMessages } from "@/i18n/loadMessages"
-
 const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
   const { locale } = await params
 
+  setRequestLocale(locale)
+
   // Get i18n messages
-  const allMessages = await loadMessages(locale)
+  const allMessages = await getMessages({ locale })
   const requiredNamespaces = getRequiredNamespacesForPage("/developers")
   const messages = pick(allMessages, requiredNamespaces)
 

app/[locale]/developers/tutorials/page.tsx

@@ -1,5 +1,9 @@
 import pick from "lodash.pick"
-import { getTranslations } from "next-intl/server"
+import {
+  getMessages,
+  getTranslations,
+  setRequestLocale,
+} from "next-intl/server"
 
 import { Lang } from "@/lib/types"
 
@@ -12,13 +16,13 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
 
 import Tutorials from "./_components/tutorials"
 
-import { loadMessages } from "@/i18n/loadMessages"
-
 const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
   const { locale } = await params
 
+  setRequestLocale(locale)
+
   // Get i18n messages
-  const allMessages = await loadMessages(locale)
+  const allMessages = await getMessages({ locale })
   const requiredNamespaces = getRequiredNamespacesForPage(
     "/developers/tutorials"
   )