Skip to content

Commit c9fa18d

Browse files
authored
Merge pull request #15290 from ethereum/dev
mini release
2 parents ed50ac4 + 109e6de commit c9fa18d

File tree

83 files changed

+607
-694
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+607
-694
lines changed

app/[locale]/_components/home.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ const HomePage = ({
118118

119119
return (
120120
<MainArticle className="flex w-full flex-col items-center" dir={dir}>
121-
<BannerNotification shouldShow>
121+
<BannerNotification shouldShow={locale === "en"}>
122122
<p>
123123
Let&apos;s celebrate 10 years of Ethereum! How did ethereum change
124124
your life? -{" "}

app/[locale]/assets/page.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import pick from "lodash.pick"
2-
import { getTranslations } from "next-intl/server"
2+
import {
3+
getMessages,
4+
getTranslations,
5+
setRequestLocale,
6+
} from "next-intl/server"
37

48
import { Lang } from "@/lib/types"
59

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

1115
import AssetsPage from "./_components/assets"
1216

13-
import { loadMessages } from "@/i18n/loadMessages"
14-
1517
export default async function Page({
1618
params,
1719
}: {
1820
params: Promise<{ locale: Lang }>
1921
}) {
2022
const { locale } = await params
2123

24+
setRequestLocale(locale)
25+
2226
// Get i18n messages
23-
const allMessages = await loadMessages(locale)
27+
const allMessages = await getMessages({ locale })
2428
const requiredNamespaces = getRequiredNamespacesForPage("/assets")
2529
const messages = pick(allMessages, requiredNamespaces)
2630

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import pick from "lodash.pick"
2-
import { getTranslations } from "next-intl/server"
2+
import {
3+
getMessages,
4+
getTranslations,
5+
setRequestLocale,
6+
} from "next-intl/server"
37

48
import { type Params } from "@/lib/types"
59

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

1115
import BugBountiesPage from "./_components/bug-bounty"
1216

13-
import { loadMessages } from "@/i18n/loadMessages"
14-
1517
export default async function Page({ params }: { params: Promise<Params> }) {
1618
const { locale } = await params
1719

20+
setRequestLocale(locale)
21+
1822
// Get i18n messages
19-
const allMessages = await loadMessages(locale)
23+
const allMessages = await getMessages({ locale })
2024
const requiredNamespaces = getRequiredNamespacesForPage("/bug-bounty")
2125
const messages = pick(allMessages, requiredNamespaces)
2226

app/[locale]/community/page.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import pick from "lodash.pick"
2-
import { getTranslations } from "next-intl/server"
2+
import {
3+
getMessages,
4+
getTranslations,
5+
setRequestLocale,
6+
} from "next-intl/server"
37

48
import { Lang } from "@/lib/types"
59

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

1115
import CommunityPage from "./_components/community"
1216

13-
import { loadMessages } from "@/i18n/loadMessages"
14-
1517
export default async function Page({
1618
params,
1719
}: {
1820
params: Promise<{ locale: Lang }>
1921
}) {
2022
const { locale } = await params
2123

24+
setRequestLocale(locale)
25+
2226
// Get i18n messages
23-
const allMessages = await loadMessages(locale)
27+
const allMessages = await getMessages({ locale })
2428
const requiredNamespaces = getRequiredNamespacesForPage("/community")
2529
const pickedMessages = pick(allMessages, requiredNamespaces)
2630

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import pick from "lodash.pick"
2-
import { getTranslations } from "next-intl/server"
2+
import {
3+
getMessages,
4+
getTranslations,
5+
setRequestLocale,
6+
} from "next-intl/server"
37

48
import { Lang } from "@/lib/types"
59

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

1115
import Acknowledgements from "./_components/acknowledgements"
1216

13-
import { loadMessages } from "@/i18n/loadMessages"
14-
1517
const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
1618
const { locale } = await params
1719

20+
setRequestLocale(locale)
21+
1822
// Get i18n messages
19-
const allMessages = await loadMessages(locale)
23+
const allMessages = await getMessages({ locale })
2024
const requiredNamespaces = getRequiredNamespacesForPage(
2125
"/contributing/translation-program/acknowledgements"
2226
)

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import pick from "lodash.pick"
2-
import { getTranslations } from "next-intl/server"
2+
import {
3+
getMessages,
4+
getTranslations,
5+
setRequestLocale,
6+
} from "next-intl/server"
37

48
import { Lang } from "@/lib/types"
59

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

1115
import Contributors from "./_components/contributors"
1216

13-
import { loadMessages } from "@/i18n/loadMessages"
14-
1517
const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
1618
const { locale } = await params
1719

20+
setRequestLocale(locale)
21+
1822
// Get i18n messages
19-
const allMessages = await loadMessages(locale)
23+
const allMessages = await getMessages({ locale })
2024
const requiredNamespaces = getRequiredNamespacesForPage(
2125
"/contributing/translation-program/contributors"
2226
)

0 commit comments

Comments
 (0)