Skip to content

Commit 16ffa50

Browse files
authored
Merge pull request #16053 from ethereum/stagingToDev
Staging -> dev
2 parents 461f2f3 + 8708d20 commit 16ffa50

File tree

5 files changed

+9
-40
lines changed

5 files changed

+9
-40
lines changed

app/[locale]/10years/page.tsx

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import {
4949
isAddressFiltered,
5050
type TorchHolder,
5151
} from "@/lib/torch"
52-
import TenYearLogo from "@/public/images/10-year-anniversary/10-year-logo.png"
5352
import Curved10YearsText from "@/public/images/10-year-anniversary/10y-torch-heading.svg"
5453

5554
// In seconds
@@ -421,21 +420,6 @@ const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
421420
<Stories stories={stories} />
422421
</I18nProvider>
423422
</div>
424-
425-
<div className="w-full gap-8 px-8 py-8 pt-32">
426-
<div className="flex flex-col items-center gap-4 rounded-2xl bg-ten-year-gradient p-8">
427-
<Image
428-
src={TenYearLogo}
429-
alt="10 year anniversary logo"
430-
className="mb-8 max-h-80 object-contain sm:mb-12"
431-
/>
432-
<h3>{t("page-10-year-ideas-title")}</h3>
433-
<p>{t("page-10-year-ideas-description")}</p>
434-
<ButtonLink href="mailto:[email protected]">
435-
{t("page-10-year-ideas-cta")}
436-
</ButtonLink>
437-
</div>
438-
</div>
439423
</MainArticle>
440424
)
441425
}

app/[locale]/page.tsx

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import type { Lang } from "@/lib/types"
1212
import { CodeExample } from "@/lib/interfaces"
1313

1414
import ActivityStats from "@/components/ActivityStats"
15-
import BannerNotification from "@/components/Banners/BannerNotification"
1615
import { ChevronNext } from "@/components/Chevron"
1716
import HomeHero from "@/components/Hero/HomeHero"
1817
import BentoCard from "@/components/Homepage/BentoCard"
@@ -79,7 +78,6 @@ import {
7978
RSS_DISPLAY_COUNT,
8079
} from "@/lib/constants"
8180

82-
import TenYearHomeBanner from "./10years/_components/TenYearHomeBanner"
8381
import { getActivity, getUpcomingEvents } from "./utils"
8482

8583
import { routing } from "@/i18n/routing"
@@ -429,14 +427,6 @@ const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
429427

430428
return (
431429
<MainArticle className="flex w-full flex-col items-center" dir={dir}>
432-
<BannerNotification shouldShow={locale === DEFAULT_LOCALE}>
433-
<p>
434-
10 years of Ethereum! -{" "}
435-
<Link href="/10years/" className="text-white">
436-
Join us to celebrate 10 years of Ethereum!
437-
</Link>
438-
</p>
439-
</BannerNotification>
440430
<HomeHero heroImg={Hero} className="w-full" locale={locale} />
441431
<div className="w-full space-y-32 px-4 md:mx-6 lg:space-y-48">
442432
<div className="my-20 grid w-full grid-cols-2 gap-x-4 gap-y-8 md:grid-cols-4 md:gap-x-10">
@@ -810,13 +800,6 @@ const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
810800
</SectionContent>
811801
</Section>
812802

813-
<Section
814-
id="10-year-anniversary"
815-
className={cn(locale !== "en" && "hidden")} // TODO: Show again when translations ready
816-
>
817-
<TenYearHomeBanner />
818-
</Section>
819-
820803
{/* Recent posts */}
821804
<Section id="recent">
822805
<h3 className="mb-4 mt-2 text-4xl font-black lg:text-5xl">

src/components/Translatathon/StepByStepInstructions.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import {
1212
const instructions = [
1313
{
1414
title: "Read the rules and details",
15-
description: "Get familiar with the rules, translation process and what to translate",
15+
description:
16+
"Get familiar with the rules, translation process and what to translate",
1617
ctaLink: "/contributing/translation-program/translatathon/details/",
1718
ctaLabel: "Learn",
1819
},
@@ -55,7 +56,8 @@ const instructions = [
5556
description: (
5657
<>
5758
Results will be announced on <strong>September 25th</strong>. Eligible
58-
participants will receive an email with instructions on how to prize claim their prizes.
59+
participants will receive an email with instructions on how to prize
60+
claim their prizes.
5961
</>
6062
),
6163
ctaLink: null,

src/components/Translatathon/TranslatathonInANutshell.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ export const TranslatathonInANutshell = () => {
4646
<Flex className="w-full flex-col gap-2 self-center">
4747
<h3 className="text-2xl">Human translations only</h3>
4848
<p>
49-
Using AI or machine translation is forbidden! All translations will be
50-
reviewed and evaluated, and participants using machine translation
51-
will not be eligible to claim prizes (see{" "}
49+
Using AI or machine translation is forbidden! All translations will
50+
be reviewed and evaluated, and participants using machine
51+
translation will not be eligible to claim prizes (see{" "}
5252
<Link href="/contributing/translation-program/translatathon/terms-and-conditions/">
5353
terms and conditions
5454
</Link>

src/layouts/md/Translatathon.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ export const TranslatathonLayout = ({
154154
<>
155155
<p>Welcome to the ethereum.org Translatathon!</p>
156156
<p>
157-
The translatathon is a translation competition where you can
158-
compete for prizes by translating ethereum.org content into different
157+
The translatathon is a translation competition where you can compete
158+
for prizes by translating ethereum.org content into different
159159
languages.
160160
</p>
161161
</>

0 commit comments

Comments
 (0)