Skip to content

Commit 618a2ca

Browse files
authored
Merge pull request #16780 from ethereum/stagingDevMerge
Staging dev merge
2 parents 50ef565 + 7a6b12b commit 618a2ca

27 files changed

+102
-18
lines changed

i18n.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@
441441
"validISO639_1": true
442442
},
443443
{
444-
"code": "se",
444+
"code": "sv",
445445
"crowdinCode": "sv-SE",
446446
"name": "Swedish",
447447
"localName": "Svenska",
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/components/Banners/FusakaBanner/FusakaCountdown.tsx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { useEffect, useState } from "react"
44
import humanizeDuration from "humanize-duration"
5-
import { useLocale, useTranslations } from "next-intl"
5+
import { useLocale } from "next-intl"
66

77
const fusakaDate = new Date("2025-12-03T21:49:11.000Z")
88
const fusakaDateTime = fusakaDate.getTime()
@@ -108,9 +108,8 @@ const getTimeLabels = (locale: string): TimeLabels => {
108108
}
109109
}
110110

111-
const FusakaCountdown = () => {
111+
const FusakaCountdown = ({ liveNowText }: { liveNowText: string }) => {
112112
const locale = useLocale()
113-
const t = useTranslations("page-index")
114113
const [timeUnits, setTimeUnits] = useState<TimeUnits>(() => getTimeUnits())
115114
const [labels, setLabels] = useState<TimeLabels>(() => getTimeLabels(locale))
116115

@@ -129,11 +128,7 @@ const FusakaCountdown = () => {
129128
}, [])
130129

131130
if (timeUnits.isExpired) {
132-
return (
133-
<p className="text-2xl font-extrabold text-white">
134-
{t("page-index-fusaka-live-now")}
135-
</p>
136-
)
131+
return <p className="text-2xl font-extrabold text-white">{liveNowText}</p>
137132
}
138133

139134
return (

src/components/Banners/FusakaBanner/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const FusakaBanner = async () => {
3535
br: () => <br className="md:hidden" />,
3636
})}
3737
</p>
38-
<FusakaCountdown />
38+
<FusakaCountdown liveNowText={t("page-index-fusaka-live-now")} />
3939
</div>
4040
</div>
4141
</LinkBox>

src/i18n/routing.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export const routing = defineRouting({
77
locales: LOCALES_CODES,
88
defaultLocale: DEFAULT_LOCALE,
99
localePrefix: "as-needed",
10+
alternateLinks: false,
1011
})
1112

1213
// Lightweight wrappers around Next.js' navigation APIs
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)