Merge branch 'dev' into ashiskumar-dev

Author: pettinarip

.all-contributorsrc

@@ -12033,6 +12033,51 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "somethingstup",
+      "name": "somethingstup",
+      "avatar_url": "https://avatars.githubusercontent.com/u/166286712?v=4",
+      "profile": "https://github.com/somethingstup",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "woxjro",
+      "name": "woxjro",
+      "avatar_url": "https://avatars.githubusercontent.com/u/63214188?v=4",
+      "profile": "https://github.com/woxjro",
+      "contributions": [
+        "tool"
+      ]
+    },
+    {
+      "login": "SeanXLChen",
+      "name": "bambooskySean",
+      "avatar_url": "https://avatars.githubusercontent.com/u/78134555?v=4",
+      "profile": "https://github.com/SeanXLChen",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "VikVM",
+      "name": "VikVM",
+      "avatar_url": "https://avatars.githubusercontent.com/u/60881781?v=4",
+      "profile": "https://github.com/VikVM",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "checkomkar",
+      "name": "Omkar Kamale",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8987373?v=4",
+      "profile": "https://github.com/checkomkar",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/labeler.yml

@@ -1,22 +1,19 @@
-"needs review 👀":
-  - src/**/*
-  - public/*
-
 "documentation 📖":
   - README.md
+  - docs/**/*
 
 "tooling 🔧":
   - .github/**/*
-  - src/scripts/*
-  - src/lib/*
-  - src/hooks/*
+  - src/scripts/**/*
+  - src/lib/**/*
+  - src/hooks/**/*
+  - .storybook/**/*
 
 "dependencies 📦":
   - package.json
   - yarn.lock
 
-"internal 🏠":
-  - .all-contributorsrc
+"config ⚙️":
   - i18n.config.json
   - next.config.js
   - next-i18next.config,js
@@ -30,13 +27,14 @@
   - netlify.toml
 
 "translation 🌍":
-  - src/content/translations/**/*
+  - public/content/translations/**/*
   - src/intl/**/*
-  - src/lib/utils/translations.ts
+  - !src/intl/en/**
 
 "content 🖋️":
-  - src/pages/*
+  - src/intl/en/**
   - public/content/**/*
+  - !public/content/translations/**/*
 
 "event 📅":
   - src/data/community-events.json

.github/workflows/non-english-warning.yml

@@ -5,7 +5,7 @@ on:
     paths:
       - "public/content/translations/**/*.md"
       - "src/intl/**/*.json"
-      - "!src/intl/en/**
+      - "!src/intl/en/**"
 
 jobs:
   check_branch_name:

.gitignore

@@ -54,4 +54,4 @@ robots.txt
 .vscode
 
 # Crowdin report output
-src/data/crowdin/bucketsAwaitingReviewReport.csv
+src/data/crowdin/bucketsAwaitingReviewReport.csv

README.md

@@ -1843,6 +1843,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/raxhvl"><img src="https://avatars.githubusercontent.com/u/10168946?v=4?s=100" width="100px;" alt="rahul"/><br /><sub><b>rahul</b></sub></a><br /><a href="#content-raxhvl" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://abhayporwals.live/"><img src="https://avatars.githubusercontent.com/u/76243309?v=4?s=100" width="100px;" alt="Abhay Gupta "/><br /><sub><b>Abhay Gupta </b></sub></a><br /><a href="#content-professorabhay" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/somethingstup"><img src="https://avatars.githubusercontent.com/u/166286712?v=4?s=100" width="100px;" alt="somethingstup"/><br /><sub><b>somethingstup</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=somethingstup" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/woxjro"><img src="https://avatars.githubusercontent.com/u/63214188?v=4?s=100" width="100px;" alt="woxjro"/><br /><sub><b>woxjro</b></sub></a><br /><a href="#tool-woxjro" title="Tools">🔧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SeanXLChen"><img src="https://avatars.githubusercontent.com/u/78134555?v=4?s=100" width="100px;" alt="bambooskySean"/><br /><sub><b>bambooskySean</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=SeanXLChen" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/VikVM"><img src="https://avatars.githubusercontent.com/u/60881781?v=4?s=100" width="100px;" alt="VikVM"/><br /><sub><b>VikVM</b></sub></a><br /><a href="#content-VikVM" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/checkomkar"><img src="https://avatars.githubusercontent.com/u/8987373?v=4?s=100" width="100px;" alt="Omkar Kamale"/><br /><sub><b>Omkar Kamale</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=checkomkar" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

netlify.toml

@@ -41,12 +41,14 @@
 [functions]
 
   [functions.___netlify-odb-handler]
+    external_node_modules = ["sharp"]
     included_files = [
       "./src/intl/**/*",
       "!./public/**/*",
       "node_modules/next/dist/server/future/route-modules/pages/vendored/contexts/router-context*",
       "node_modules/next/dist/server/future/route-modules/pages/vendored/contexts/amp-context*",
       "node_modules/next/dist/server/future/route-modules/pages/vendored/contexts/head-manager-context*",
+      "node_modules/sharp/**/*",
     ]
 
   [functions.___netlify-handler]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "8.5.2",
+  "version": "8.6.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -98,4 +98,4 @@
   "resolutions": {
     "jackspeak": "2.1.1"
   }
-}
+}

public/content/community/events/index.md

@@ -11,7 +11,7 @@ hideEditButton: true
 
 <UpcomingEventsList/>
 
-This is a non-exhaustive list maintained by our community. Know of an upcoming Ethereum event to add to this list? [Please add it](https://github.com/ethereum/ethereum-org-website/blob/dev/src/data/community-events.ts)!
+This is a non-exhaustive list maintained by our community. Know of an upcoming Ethereum event to add to this list? [Please add it](https://github.com/ethereum/ethereum-org-website/blob/dev/src/data/community-events.json)!
 
 ## Ethereum meetups {#meetups}
 

public/content/community/get-involved/index.md

@@ -38,6 +38,7 @@ Do you have a background in mathematics, cryptography, or economics? You might b
 - [Ethresear.ch](https://ethresear.ch) - Ethereum’s primary forum for research, and the world’s most influential forum for cryptoeconomics
 - [EF Research AMA](https://old.reddit.com/r/ethereum/comments/vrx9xe/ama_we_are_ef_research_pt_8_07_july_2022) - An ongoing Q&A series with researchers. As each next part opens, anyone can post questions.
 - [Ecosystem Support Program's wishlist](https://esp.ethereum.foundation/wishlist/) - research areas where the Ethereum Ecosystem Support Program is actively seeking grant applications
+- [AllWalletDevs](allwallet.dev) - a forum for Ethereum developers, designers, and interested users to come together regularly and discuss wallets
 
 [Explore more active areas of research](/community/research/).
 

public/content/contributing/translation-program/index.md

@@ -36,7 +36,7 @@ Read more about the ethereum.org Translation Program [mission and vision](/contr
 
 ### Our progress so far {#our-progress}
 
-- [**5,600 +** translators](/contributing/translation-program/contributors/)
+- [**6,000 +** translators](/contributing/translation-program/contributors/)
 - **62** languages live on site
 - [**3 million** words translated in 2023](/contributing/translation-program/acknowledgements/)