Skip to content

Fix load messages 3 #15286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Fix load messages 3 #15286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90a3508
fix(i18n): ensure proper merging of locale messages
pettinarip Apr 14, 2025
515d434
replace removed loadMessages function
pettinarip Apr 14, 2025
43081d2
remove cpu limit
pettinarip Apr 15, 2025
f48051e
test
pettinarip Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions app/[locale]/assets/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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)

Expand Down
12 changes: 8 additions & 4 deletions app/[locale]/bug-bounty/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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)

Expand Down
12 changes: 8 additions & 4 deletions app/[locale]/community/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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)

Expand Down
12 changes: 8 additions & 4 deletions app/[locale]/contributing/translation-program/acknowledgements/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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"
)
Expand Down
12 changes: 8 additions & 4 deletions app/[locale]/contributing/translation-program/contributors/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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"
)
Expand Down
12 changes: 8 additions & 4 deletions app/[locale]/dapps/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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)

Expand All @@ -34,6 +36,8 @@ export async function generateMetadata({
}) {
const { locale } = await params

setRequestLocale(locale)

const t = await getTranslations({ locale })

return await getMetadata({
Expand Down
12 changes: 8 additions & 4 deletions app/[locale]/developers/learning-tools/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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"
)
Expand Down
11 changes: 8 additions & 3 deletions app/[locale]/developers/local-environment/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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([
Expand All @@ -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"
)
Expand Down
12 changes: 8 additions & 4 deletions app/[locale]/developers/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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)

Expand Down
12 changes: 8 additions & 4 deletions app/[locale]/developers/tutorials/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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"
)
Expand Down
12 changes: 8 additions & 4 deletions app/[locale]/eth/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -10,17 +14,17 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"

import EthPage from "./_components/eth"

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("/eth")
const pickedMessages = pick(allMessages, requiredNamespaces)

Expand Down
12 changes: 8 additions & 4 deletions app/[locale]/gas/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -10,13 +14,13 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"

import GasPage from "./_components/gas"

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("/gas")
const messages = pick(allMessages, requiredNamespaces)

Expand Down
12 changes: 8 additions & 4 deletions app/[locale]/get-eth/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -11,21 +15,21 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations"

import GetEthPage from "./_components/get-eth"

import { loadMessages } from "@/i18n/loadMessages"

export default async function Page({
params,
}: {
params: Promise<{ locale: Lang }>
}) {
const { locale } = await params

setRequestLocale(locale)

const lastDataUpdateDate = getLastModifiedDateByPath(
"src/data/exchangesByCountry.ts"
)

// Get i18n messages
const allMessages = await loadMessages(locale)
const allMessages = await getMessages({ locale })
const requiredNamespaces = getRequiredNamespacesForPage("/get-eth")
const pickedMessages = pick(allMessages, requiredNamespaces)

Expand Down
Loading