Merge remote-tracking branch 'origin/dev' into feat/stats

Author: TylerAPfledderer

.all-contributorsrc

@@ -10750,7 +10750,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/30328618?v=4",
       "profile": "https://www.darigovresearch.com/",
       "contributions": [
-        "content"
+        "content",
+        "bug"
       ]
     },
     {
@@ -11681,6 +11682,98 @@
       "contributions": [
         "eventOrganizing"
       ]
+    },
+    {
+      "login": "bhargavkakadiya",
+      "name": "Bhargav kakadiya",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26486494?v=4",
+      "profile": "https://github.com/bhargavkakadiya",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "ArtificialPB",
+      "name": "ArtificialPB",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4672155?v=4",
+      "profile": "https://github.com/ArtificialPB",
+      "contributions": [
+        "tool"
+      ]
+    },
+    {
+      "login": "Pedrojok01",
+      "name": "Pedrojok01",
+      "avatar_url": "https://avatars.githubusercontent.com/u/77141890?v=4",
+      "profile": "https://github.com/Pedrojok01",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "Vid201",
+      "name": "Vid Kersic",
+      "avatar_url": "https://avatars.githubusercontent.com/u/38610409?v=4",
+      "profile": "https://github.com/Vid201",
+      "contributions": [
+        "tool"
+      ]
+    },
+    {
+      "login": "futantan",
+      "name": "Tantan Fu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6268441?v=4",
+      "profile": "http://www.futantan.com",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "Dharmik79",
+      "name": "Dharmik Dholariya",
+      "avatar_url": "https://avatars.githubusercontent.com/u/61613931?v=4",
+      "profile": "https://dharmik79.github.io/portfolio.github.io/",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "Destiner",
+      "name": "Timur Badretdinov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4247901?v=4",
+      "profile": "https://destiner.io",
+      "contributions": [
+        "tool"
+      ]
+    },
+    {
+      "login": "finxter",
+      "name": "Finxter",
+      "avatar_url": "https://avatars.githubusercontent.com/u/57671493?v=4",
+      "profile": "https://blog.finxter.com/",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "croath",
+      "name": "Croath Liu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1398729?v=4",
+      "profile": "http://croath.com",
+      "contributions": [
+        "doc",
+        "code"
+      ]
+    },
+    {
+      "login": "HayattiQ",
+      "name": "Hayatti",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5105841?v=4",
+      "profile": "https://github.com/HayattiQ",
+      "contributions": [
+        "content",
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/labeler.yml

@@ -1,21 +1,21 @@
-"review needed :eyes:":
+"needs review 👀":
   - src/**/*
   - public/*
 
-"documentation :book:":
+"documentation 📖":
   - README.md
 
-"tooling :wrench:":
+"tooling 🔧":
   - .github/**/*
   - src/scripts/*
   - src/lib/*
   - src/hooks/*
 
-"dependencies :package:":
+"dependencies 📦":
   - package.json
   - yarn.lock
 
-"internal :house:":
+"internal 🏠":
   - .all-contributorsrc
   - i18n.config.json
   - next.config.js
@@ -29,14 +29,14 @@
   - .prettierrc
   - netlify.toml
 
-"translation :earth_africa:":
+"translation 🌍":
   - src/content/translations/**/*
   - src/intl/**/*
   - src/lib/utils/translations.ts
 
-"content :fountain_pen:":
+"content 🖋️":
   - src/pages/*
   - public/content/**/*
 
-"event :date:":
+"event 📅":
   - src/data/community-events.json

.github/workflows/chromatic.yml

@@ -16,6 +16,7 @@ on:
       - "src/pages/**/*"
       - "src/layouts/**/*"
       - "src/@chakra-ui/**/*"
+      - ".storybook/**/*"
 
 # List of jobs
 jobs:

.github/workflows/get-crowdin-contributors.yml

@@ -59,5 +59,5 @@ jobs:
 
       - name: Create Pull Request
         run: |
-          gh auth login --with-token ${{ secrets.GITHUB_TOKEN }}
+          echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
           gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update translation contributors from Crowdin - ${{ env.READABLE_DATE }}" --body-file pr_body.txt

.github/workflows/get-translation-progress.yml

@@ -60,5 +60,5 @@ jobs:
 
       - name: Create Pull Request
         run: |
-          gh auth login --with-token ${{ secrets.GITHUB_TOKEN }}
+          echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
           gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update translation progress from Crowdin - ${{ env.READABLE_DATE }}" --body-file pr_body.txt

.github/workflows/import-community-events.yml

@@ -55,5 +55,5 @@ jobs:
 
       - name: Create Pull Request
         run: |
-          gh auth login --with-token ${{ secrets.GITHUB_TOKEN }}
+          echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
           gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update community events from external spreadsheet - ${{ env.READABLE_DATE }}" --body-file pr_body.txt

README.md

@@ -1662,7 +1662,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://linkedin.com/in/muhammadaltabba"><img src="https://avatars.githubusercontent.com/u/24407834?v=4?s=100" width="100px;" alt="Muhammad Altabba"/><br /><sub><b>Muhammad Altabba</b></sub></a><br /><a href="#content-Muhammad-Altabba" title="Content">🖋</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.darigovresearch.com/"><img src="https://avatars.githubusercontent.com/u/30328618?v=4?s=100" width="100px;" alt="Darigov Research"/><br /><sub><b>Darigov Research</b></sub></a><br /><a href="#content-darigovresearch" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.darigovresearch.com/"><img src="https://avatars.githubusercontent.com/u/30328618?v=4?s=100" width="100px;" alt="Darigov Research"/><br /><sub><b>Darigov Research</b></sub></a><br /><a href="#content-darigovresearch" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Adarigovresearch" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/shubhusion"><img src="https://avatars.githubusercontent.com/u/96301987?v=4?s=100" width="100px;" alt="SHUBHAM SHARMA "/><br /><sub><b>SHUBHAM SHARMA </b></sub></a><br /><a href="#ideas-shubhusion" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/paulallensuxs"><img src="https://avatars.githubusercontent.com/u/114240091?v=4?s=100" width="100px;" alt="paulallensuxs"/><br /><sub><b>paulallensuxs</b></sub></a><br /><a href="#content-paulallensuxs" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://pseudomata.com"><img src="https://avatars.githubusercontent.com/u/132238190?v=4?s=100" width="100px;" alt="Pseudomata"/><br /><sub><b>Pseudomata</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=pseudomata" title="Code">💻</a></td>
@@ -1793,6 +1793,20 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/nakmr"><img src="https://avatars.githubusercontent.com/u/145886319?v=4?s=100" width="100px;" alt="nace.kimura"/><br /><sub><b>nace.kimura</b></sub></a><br /><a href="#content-nakmr" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/WuRuiLei2023"><img src="https://avatars.githubusercontent.com/u/149141323?v=4?s=100" width="100px;" alt="WuRuiLei2023"/><br /><sub><b>WuRuiLei2023</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AWuRuiLei2023" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.edukids.cz"><img src="https://avatars.githubusercontent.com/u/6020891?v=4?s=100" width="100px;" alt="Radek"/><br /><sub><b>Radek</b></sub></a><br /><a href="#eventOrganizing-radeksvarz" title="Event Organizing">📋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/bhargavkakadiya"><img src="https://avatars.githubusercontent.com/u/26486494?v=4?s=100" width="100px;" alt="Bhargav kakadiya"/><br /><sub><b>Bhargav kakadiya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Abhargavkakadiya" title="Bug reports">🐛</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ArtificialPB"><img src="https://avatars.githubusercontent.com/u/4672155?v=4?s=100" width="100px;" alt="ArtificialPB"/><br /><sub><b>ArtificialPB</b></sub></a><br /><a href="#tool-ArtificialPB" title="Tools">🔧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Pedrojok01"><img src="https://avatars.githubusercontent.com/u/77141890?v=4?s=100" width="100px;" alt="Pedrojok01"/><br /><sub><b>Pedrojok01</b></sub></a><br /><a href="#maintenance-Pedrojok01" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Vid201"><img src="https://avatars.githubusercontent.com/u/38610409?v=4?s=100" width="100px;" alt="Vid Kersic"/><br /><sub><b>Vid Kersic</b></sub></a><br /><a href="#tool-Vid201" title="Tools">🔧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.futantan.com"><img src="https://avatars.githubusercontent.com/u/6268441?v=4?s=100" width="100px;" alt="Tantan Fu"/><br /><sub><b>Tantan Fu</b></sub></a><br /><a href="#maintenance-futantan" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://dharmik79.github.io/portfolio.github.io/"><img src="https://avatars.githubusercontent.com/u/61613931?v=4?s=100" width="100px;" alt="Dharmik Dholariya"/><br /><sub><b>Dharmik Dholariya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3ADharmik79" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://destiner.io"><img src="https://avatars.githubusercontent.com/u/4247901?v=4?s=100" width="100px;" alt="Timur Badretdinov"/><br /><sub><b>Timur Badretdinov</b></sub></a><br /><a href="#tool-Destiner" title="Tools">🔧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://blog.finxter.com/"><img src="https://avatars.githubusercontent.com/u/57671493?v=4?s=100" width="100px;" alt="Finxter"/><br /><sub><b>Finxter</b></sub></a><br /><a href="#ideas-finxter" title="Ideas, Planning, & Feedback">🤔</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="http://croath.com"><img src="https://avatars.githubusercontent.com/u/1398729?v=4?s=100" width="100px;" alt="Croath Liu"/><br /><sub><b>Croath Liu</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=croath" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=croath" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/HayattiQ"><img src="https://avatars.githubusercontent.com/u/5105841?v=4?s=100" width="100px;" alt="Hayatti"/><br /><sub><b>Hayatti</b></sub></a><br /><a href="#content-HayattiQ" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AHayattiQ" title="Bug reports">🐛</a></td>
     </tr>
   </tbody>
 </table>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "8.4.0",
+  "version": "8.5.0",
   "private": true,
   "scripts": {
     "dev": "next dev",

public/_redirects

@@ -174,4 +174,6 @@
 
 /*/deprecated-software /:splat/dapps/ 301!
 
-/*/languages /:splat/contributing/translation-program/ 301!
+/*/developers/docs/smart-contracts/languages/ /:splat/developers/docs/smart-contracts/languages/
+
+/*/languages /:splat/developers/docs/programming-languages/ 301!

public/content/contributing/adding-wallets/index.md

@@ -68,7 +68,8 @@ As is the fluid nature of Ethereum, teams and products come and go and innovatio
 - ensure that all wallets and dapps listed still fulfil our criteria
 - verify there aren't products that have been suggested that meet more of our criteria than the ones currently listed
 
-Ethereum.org is maintained by the open source community & we rely on the community to help keep this up to date. If you notice any information about listed wallets that needs to be updated, please [open an issue](https://github.com/ethereum/ethereum-org-website/issues/new?assignees=&labels=wallet+%3Apurse%3A&template=suggest_wallet.yaml) or [pull request](https://github.com/ethereum/ethereum-org-website/pulls)!
+ethereum.org is maintained by the open source community & we rely on the community to help keep this up to date. If you notice any information about listed wallets that needs to be updated, please [open an issue](https://github.com/ethereum/ethereum-org-website/issues/new?assignees=&labels=wallet+%3Apurse%3A&template=suggest_wallet.yaml) or [pull request](https://github.com/ethereum/ethereum-org-website/pulls)!
+
 
 ## Terms of use {#terms-of-use}