Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into l10n_main
Browse files Browse the repository at this point in the history
  • Loading branch information
catalinred committed Nov 24, 2024
2 parents fbb1489 + 86475ed commit ba4bc8f
Show file tree
Hide file tree
Showing 45 changed files with 2,412 additions and 401 deletions.
2 changes: 0 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ LUMA_PRIVATE_API_KEY=
# Builder
NEXT_PUBLIC_BUILDER_API_KEY=
NEXT_PUBLIC_BUILDER_NEWS_SETTINGS_ID=
# Airtable
AIRTABLE_TOKEN=
# River
RIVER_KEY=
# RPC Endpoint
Expand Down
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ labels: "Status: Unconfirmed"

## Steps To Reproduce



## The current behavior



## The expected behavior

9 changes: 9 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
### Problem



### Summary of Changes



Fixes #
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.github/*.md
public
packages
.vercel
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added assets/wallets/icons/enkrypt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 35 additions & 25 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,33 +72,43 @@ const moduleExports = () => {
})),
];

return builder
.getAll("url-redirects", {
apiKey:
process.env.NEXT_PUBLIC_BUILDER_API_KEY ||
"ce0c7323a97a4d91bd0baa7490ec9139",
options: { noTargeting: true },
cachebust: true,
})
.then(
(results) => [
...existingRedirects,
...results
.filter((content) => {
const data = (content || {}).data || {};
return !!(data.sourceUrl && data.destinationUrl);
})
.map(({ data }) => ({
source: data.sourceUrl,
destination: data.destinationUrl,
permanent: !!data.permanentRedirect,
})),
],
(error) => {
try {
return builder
.getAll("url-redirects", {
apiKey:
process.env.NEXT_PUBLIC_BUILDER_API_KEY ||
"ce0c7323a97a4d91bd0baa7490ec9139",
options: { noTargeting: true },
cachebust: true,
})
.then((results) => {
try {
return [
...existingRedirects,
...results
.filter((content) => {
const data = (content || {}).data || {};
return !!(data.sourceUrl && data.destinationUrl);
})
.map(({ data }) => ({
source: data.sourceUrl,
destination: data.destinationUrl,
permanent: !!data.permanentRedirect,
})),
];
} catch (error) {
console.log("Error processing redirects", error);
return existingRedirects;
}
})
.catch((error) => {
console.log("Error setting up redirects", error);
return existingRedirects;
},
);
});
} catch (error) {
console.log("Error fetching redirects from Builder:", error);
return existingRedirects;
}
},
webpack(config) {
config.module.rules.push({
Expand Down
10 changes: 7 additions & 3 deletions public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
"logo": {
"title": "Solana Brand",
"sub-title": "Logotype",
"description": "Solana’s wordmark is constructed from custom-built, modular type. The angular and uniform lettering take cues from 1980s tech aesthetics, updated to feel fresh and futuristic. The logomark is created by stacking three identical parallelograms. It conveys speed and celebrates the concept of building."
"description": "Solana’s wordmark is constructed from custom-built, modular type. The angular and uniform lettering takes cues from 1980s tech aesthetics, updated to feel fresh and futuristic. The logomark is created by stacking three identical parallelograms. It conveys speed and celebrates the concept of building."
},
"welcome": {
"title": "Welcome to Solana Brand & Marketing page",
Expand Down Expand Up @@ -744,7 +744,7 @@
"email-error": "Please enter a valid email address",
"signup": "Sign up",
"signup-success": "You are successfully signed up!",
"unexpected-error": "An unexpected error occured. Please try again!"
"unexpected-error": "An unexpected error occurred. Please try again!"
}
},
"resources": {
Expand Down Expand Up @@ -791,6 +791,10 @@
"title": "Solana Program Library Documentation",
"description": "Official docs the Solana Program Library."
},
"cookbook": {
"title": "Cookbook",
"description": "Snippets and copyable example code for Solana applications."
},
"resources": {
"title": "Resources",
"description": "Extensive developer tooling for building on Solana."
Expand All @@ -810,7 +814,7 @@
"hello-world": "Hello World",
"bootcamp": "Bootcamp",
"evm-to-svm": "EVM to SVM",
"local-setup": "Local Setup"
"local-setup": "Installation"
}
},
"solutions": {
Expand Down
2 changes: 1 addition & 1 deletion public/locales/es/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"card-1": {
"title": "Solana Audits AI",
"subtitle": "Ryan Trat @ryan_trat",
"content": "Utiliza LLLMs para identificar vulnerabilidades en contratos inteligentes de Solana"
"content": "Utiliza LLMs para identificar vulnerabilidades en contratos inteligentes de Solana"
},
"card-2": {
"title": "Búsqueda Ecosistema Solana",
Expand Down
20 changes: 10 additions & 10 deletions public/locales/hi/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -337,28 +337,28 @@
"hero-old": "क्रिप्टो क्रांति में शामिल हों",
"subheader": "निम्नलिखित हमारे सबसे अधिक बार उपयोग किए जाने वाले और अपडेट किए गए संचार चैनल हैं। आप नाम लें, हमारे पास है!",
"telegram": "टेलीग्राम",
"approx-members": "~ {number} सदस्य",
"gt-members": "~ {number} सदस्य",
"approx-members": "सदस्य",
"gt-members": "सदस्य",
"announcements": "घोषणाएँ",
"discord": "डिस्कॉर्ड",
"engineering": "इंजीनियरिंग",
"twitter": "ट्विटर",
"approx-followers": "~ {number} अनुयायी",
"approx-followers": "अनुयायी",
"medium": "समाचार",
"approx-write-ups": "~ {number} लेख",
"approx-write-ups": "लेख",
"blogposts": "ब्लॉग पोस्ट",
"github": "गिटहब",
"vk": "वीके",
"vk-subscribers": "~ {number} अनुयायी",
"vk-subscribers": "अनुयायी",
"weibo": "वीबो",
"weibo-subscribers": "> {number} ग्राहक",
"weibo-subscribers": "ग्राहक",
"twitter-jp": "ट्विटर जापान",
"twitter-jp-subscribers": "> {number} सदस्य",
"twitter-jp-subscribers": "सदस्य",
"forum": "सोलाना फोरम",
"forum-subscribers": "> {number} पोस्ट",
"gt-stars": "> {number} सितारे",
"forum-subscribers": "पोस्ट",
"gt-stars": "सितारे",
"youtube": "यूट्यूब",
"gt-subscribers": "> {number} ग्राहक",
"gt-subscribers": "ग्राहक",
"yt-subscribers": "K ग्राहक",
"videos": "वीडियो",
"email": "ईमेल",
Expand Down
14 changes: 7 additions & 7 deletions public/locales/ja/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -337,28 +337,28 @@
"hero-old": "暗号革命に参加する",
"subheader": "以下は、私たちの最も頻繁に利用され、更新されているコミュニケーションチャネルです。あなたが名前を挙げれば、私たちはそれを持っています!",
"telegram": "テレグラム",
"approx-members": "〜{number} ",
"approx-members": "",
"gt-members": "",
"announcements": "アナウンス",
"discord": "ディスコード",
"engineering": "エンジニアリング",
"twitter": "ツイッター",
"approx-followers": "〜{number} フォロワー",
"approx-followers": "フォロワー",
"medium": "ニュース",
"approx-write-ups": "〜{number} 件の投稿",
"approx-write-ups": "件の投稿",
"blogposts": "ブログ",
"github": "GitHub",
"vk": "VK",
"vk-subscribers": "〜{number} フォロワー",
"vk-subscribers": "フォロワー",
"weibo": "Weibo",
"weibo-subscribers": "{number} 人以上の登録者",
"weibo-subscribers": "人以上の登録者",
"twitter-jp": "Twitter Japan",
"twitter-jp-subscribers": "",
"forum": "Solanaフォーラム",
"forum-subscribers": " 投稿",
"gt-stars": "{number} 個以上のスター",
"gt-stars": "個以上のスター",
"youtube": "YouTube",
"gt-subscribers": "{number} 人以上の登録者",
"gt-subscribers": "人以上の登録者",
"yt-subscribers": "K 登録者",
"videos": "動画",
"email": "メール",
Expand Down
4 changes: 2 additions & 2 deletions public/locales/tr/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,8 @@
"hero-old": "Kripto devrimine katılın",
"subheader": "Aşağıdakiler en sık kullanılan ve güncellenen iletişim kanallarımızdır. Adını siz koyun, bizde var!",
"telegram": "Telegram",
"approx-members": "~ {number} üyeler",
"gt-members": "> {number} üyeler",
"approx-members": "üyeler",
"gt-members": "üyeler",
"announcements": "Duyurular",
"discord": "Discord",
"engineering": "Mühendislik",
Expand Down
4 changes: 2 additions & 2 deletions public/locales/uk/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"point-1": "Фонд грантів ІІ у розмірі $10M",
"point-2": "Плагін ChatGPT для Solana",
"point-3": "Екосистема розробників на перетині ІІ + Web3",
"cta": "Зв'яжіться з нами"
"cta": "Зв’язатися з нами"
},
"why-ai": {
"caption": "Чому ІІ на блокчейні?",
Expand Down Expand Up @@ -176,7 +176,7 @@
"hackathon": {
"index": {
"title": "Приєднуйтесь до онлайн-хакатону Solana, щоб розпочати свою крипто-подорож",
"description": "Хакатони Solana надають амбітним розробникам платформу для створення проектів, які просувають криптопростір вперед. Зареєструйтесь на Colosseum, щоб знайти співзасновників, поділитися ідеями та зареєструватися на наступний хакатон Solana.",
"description": "Хакатони Solana надають амбітним розробникам платформу для створення проектів, які просувають криптопростір вперед. Зареєструйтеся на Colosseum, щоб знайти співзасновників, поділитися ідеями та зареєструватися на наступний хакатон Solana.",
"cta": "Приєднатися до Colosseum",
"hero": {
"developers": {
Expand Down
10 changes: 5 additions & 5 deletions public/locales/vi/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -337,15 +337,15 @@
"hero-old": "Tham gia cuộc cách mạng tiền điện tử",
"subheader": "Dưới đây là các kênh liên lạc được cập nhật và truy cập nhiều nhất của chúng tôi. Bạn gọi tên nó, chúng tôi có nó!",
"telegram": "Telegram\n",
"approx-members": "~ {number} thành viên",
"approx-members": "thành viên",
"gt-members": " thành viên",
"announcements": "Thông báo",
"discord": "Bất hòa\n",
"engineering": "Kỹ thuật",
"twitter": "Twitter",
"approx-followers": "người theo dõi",
"medium": "Tin tức",
"approx-write-ups": "~ {number} bài viết",
"approx-write-ups": "bài viết",
"blogposts": "Bài đăng trên blog",
"github": "GitHub",
"vk": "VK",
Expand All @@ -355,10 +355,10 @@
"twitter-jp": "Twitter Nhật Bản",
"twitter-jp-subscribers": " thành viên",
"forum": "Diễn đàn Solana",
"forum-subscribers": "> {number} bài viết",
"gt-stars": "> {number} sao",
"forum-subscribers": "bài viết",
"gt-stars": "sao",
"youtube": "YouTube",
"gt-subscribers": "> {number} người đăng ký",
"gt-subscribers": "người đăng ký",
"yt-subscribers": "K người đăng ký",
"videos": "Video",
"email": "Email",
Expand Down
6 changes: 5 additions & 1 deletion rewrites-redirects.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@
"source": "/environment",
"destination": "https://climate.solana.com/"
},
{ "source": "/breakpoint/side-events", "destination": "/breakpoint" }
{ "source": "/breakpoint/side-events", "destination": "/breakpoint" },
{
"source": "/verifiable-builds",
"destination": "/developers/guides/advanced/verified-builds#install-the-solana-verify-cli"
}
]
}
24 changes: 17 additions & 7 deletions src/components/header/HeaderListBuild.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,34 @@ const HeaderListBuild = () => {
{t("nav.developers.items.docs.description")}
</Link>
<Link
to="/developers/resources"
to="/developers/courses"
className="nav-link nav-link--secondary"
activeClassName="active"
>
<strong className="d-block text-white">
{t("nav.developers.items.resources.title")}
{t("nav.developers.items.courses.title")}
</strong>
{t("nav.developers.items.resources.description")}
{t("nav.developers.items.courses.description")}
</Link>
<Link
to="/developers#courses"
to="/developers/cookbook"
className="nav-link nav-link--secondary"
activeClassName="active"
>
<strong className="d-block text-white">
{t("nav.developers.items.courses.title")}
{t("nav.developers.items.cookbook.title")}
</strong>
{t("nav.developers.items.courses.description")}
{t("nav.developers.items.cookbook.description")}
</Link>
<Link
to="/developers/resources"
className="nav-link nav-link--secondary"
activeClassName="active"
>
<strong className="d-block text-white">
{t("nav.developers.items.resources.title")}
</strong>
{t("nav.developers.items.resources.description")}
</Link>
</div>
</div>
Expand All @@ -74,7 +84,7 @@ const HeaderListBuild = () => {
{t("nav.developers.tutorials.hello-world")}
</Link>
<Link
to="/developers/guides/getstarted/setup-local-development"
to="/docs/intro/installation"
className="nav-link nav-link--secondary text-white d-block text-white fw-bold"
activeClassName="active font-weight-bold"
>
Expand Down
Loading

0 comments on commit ba4bc8f

Please sign in to comment.