Skip to content

Commit

Permalink
Merge branch 'dev' into pr/Molotov-Eugene/12103
Browse files Browse the repository at this point in the history
  • Loading branch information
corwintines committed Feb 14, 2024
2 parents 137f85d + b76d5d0 commit e974ee2
Show file tree
Hide file tree
Showing 453 changed files with 25,543 additions and 6,258 deletions.
120 changes: 119 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -5873,7 +5873,8 @@
"profile": "https://github.com/MiConnell",
"contributions": [
"content",
"code"
"code",
"bug"
]
},
{
Expand Down Expand Up @@ -10965,6 +10966,123 @@
"contributions": [
"content"
]
},
{
"login": "sminempepe",
"name": "sminempepe",
"avatar_url": "https://avatars.githubusercontent.com/u/76882704?v=4",
"profile": "https://github.com/sminempepe",
"contributions": [
"doc"
]
},
{
"login": "aslikaya",
"name": "aslikaya",
"avatar_url": "https://avatars.githubusercontent.com/u/9151261?v=4",
"profile": "https://github.com/aslikaya",
"contributions": [
"doc"
]
},
{
"login": "lucas-amberg",
"name": "Lucas Amberg",
"avatar_url": "https://avatars.githubusercontent.com/u/102396588?v=4",
"profile": "http://lucasamberg.dev",
"contributions": [
"doc"
]
},
{
"login": "a-hagi613",
"name": "Abdullahi",
"avatar_url": "https://avatars.githubusercontent.com/u/92589940?v=4",
"profile": "https://a-hagi.dev/",
"contributions": [
"bug"
]
},
{
"login": "pranavkonde",
"name": "Pranav Konde",
"avatar_url": "https://avatars.githubusercontent.com/u/76070589?v=4",
"profile": "https://www.linkedin.com/in/pranav-konde-56aa141b5/",
"contributions": [
"content"
]
},
{
"login": "MohitKambli",
"name": "Mohit Kambli",
"avatar_url": "https://avatars.githubusercontent.com/u/31406633?v=4",
"profile": "https://github.com/MohitKambli",
"contributions": [
"code"
]
},
{
"login": "oleksandr-hyriavets",
"name": "Oleksandr Hyriavets",
"avatar_url": "https://avatars.githubusercontent.com/u/19614509?v=4",
"profile": "https://github.com/oleksandr-hyriavets",
"contributions": [
"code"
]
},
{
"login": "titanism",
"name": "titanism",
"avatar_url": "https://avatars.githubusercontent.com/u/101466223?v=4",
"profile": "https://github.com/titanism",
"contributions": [
"doc"
]
},
{
"login": "Maxservais",
"name": "Maxime Servais",
"avatar_url": "https://avatars.githubusercontent.com/u/43566493?v=4",
"profile": "https://www.ethereum-ecosystem.com/",
"contributions": [
"code"
]
},
{
"login": "nebolax",
"name": "Alexey Nebolsin",
"avatar_url": "https://avatars.githubusercontent.com/u/63492346?v=4",
"profile": "https://t.me/nebolax",
"contributions": [
"doc"
]
},
{
"login": "jimgreen2013",
"name": "jimgreen2013",
"avatar_url": "https://avatars.githubusercontent.com/u/15890793?v=4",
"profile": "https://github.com/jimgreen2013",
"contributions": [
"doc"
]
},
{
"login": "gabrieltemtsen",
"name": "Gabriel Temsten",
"avatar_url": "https://avatars.githubusercontent.com/u/57184013?v=4",
"profile": "https://github.com/gabrieltemtsen",
"contributions": [
"code"
]
},
{
"login": "jennyg0",
"name": "Jen ",
"avatar_url": "https://avatars.githubusercontent.com/u/60794961?v=4",
"profile": "https://github.com/jennyg0",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
64 changes: 64 additions & 0 deletions .github/workflows/get-translation-progress.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Update Crowdin translation progression

on:
schedule:
- cron: "20 16 * * FRI"
workflow_dispatch:

jobs:
create_pr:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: 18

- name: Install dependencies
run: yarn install

- name: Install ts-node
run: yarn global add ts-node

- name: Set up git
run: |
git config --global user.email "[email protected]"
git config --global user.name "GitHub Action"
- name: Generate timestamp and readable date
id: date
run: |
echo "TIMESTAMP=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_ENV
echo "READABLE_DATE=$(date +'%B %-d')" >> $GITHUB_ENV
- name: Fetch latest dev and create new branch
run: |
git fetch origin dev
git checkout -b "automated-update-${{ env.TIMESTAMP }}" origin/dev
- name: Run script
run: npx ts-node -O '{"module":"commonjs"}' ./src/scripts/crowdin/getTranslationProgress.ts
env:
CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}

- name: Commit and push
run: |
git add -A
git commit -m "Update Crowdin translation progress"
git push origin "automated-update-${{ env.TIMESTAMP }}"
- name: Create PR body
run: |
echo "This PR was automatically created to update Crowdin translation progress." > pr_body.txt
echo "This workflows runs every Friday at 16:20 (UTC)." >> pr_body.txt
echo "" >> pr_body.txt
echo "Thank you to everyone contributing to translate ethereum.org ❤️" >> pr_body.txt
- name: Create Pull Request
run: |
gh auth login --with-token <<< ${{ secrets.GITHUB_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
21 changes: 19 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[![gitpoap badge](https://public-api.gitpoap.io/v1/repo/ethereum/ethereum-org-website/badge)](https://www.gitpoap.io/gh/ethereum/ethereum-org-website)

<div align="center" style="margin-top: 1em; margin-bottom: 3em;">
<a href="https://ethereum.org"><img alt="ethereum logo" src="./eth-transparent.png" alt="ethereum.org" width="125"></a>
<a href="https://ethereum.org"><img alt="ethereum logo" src="./public/assets/eth-transparent.png" alt="ethereum.org" width="125"></a>
<h1>👋 Welcome to ethereum.org!</h1>
</div>

Expand Down Expand Up @@ -1001,7 +1001,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://twitter.com/patcito"><img src="https://avatars.githubusercontent.com/u/26435?v=4?s=100" width="100px;" alt="Patrick Aljord"/><br /><sub><b>Patrick Aljord</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=patcito" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/decipherer2"><img src="https://avatars.githubusercontent.com/u/16278986?v=4?s=100" width="100px;" alt="decifer"/><br /><sub><b>decifer</b></sub></a><br /><a href="#ideas-decipherer2" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/aghArdeshir"><img src="https://avatars.githubusercontent.com/u/5755214?v=4?s=100" width="100px;" alt="aghArdeshir"/><br /><sub><b>aghArdeshir</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=aghArdeshir" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/MiConnell"><img src="https://avatars.githubusercontent.com/u/14168559?v=4?s=100" width="100px;" alt="Michael Connell"/><br /><sub><b>Michael Connell</b></sub></a><br /><a href="#content-MiConnell" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=MiConnell" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/MiConnell"><img src="https://avatars.githubusercontent.com/u/14168559?v=4?s=100" width="100px;" alt="Michael Connell"/><br /><sub><b>Michael Connell</b></sub></a><br /><a href="#content-MiConnell" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=MiConnell" title="Code">💻</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AMiConnell" title="Bug reports">🐛</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/amm98d"><img src="https://avatars.githubusercontent.com/u/39633205?v=4?s=100" width="100px;" alt="Ahmed Mustafa Malik"/><br /><sub><b>Ahmed Mustafa Malik</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=amm98d" title="Code">💻</a></td>
Expand Down Expand Up @@ -1711,6 +1711,23 @@ 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/tdahar"><img src="https://avatars.githubusercontent.com/u/18716811?v=4?s=100" width="100px;" alt="Tarun Mohandas Daryanani"/><br /><sub><b>Tarun Mohandas Daryanani</b></sub></a><br /><a href="#content-tdahar" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Crosstons"><img src="https://avatars.githubusercontent.com/u/110349596?v=4?s=100" width="100px;" alt="Shubh"/><br /><sub><b>Shubh</b></sub></a><br /><a href="#content-Crosstons" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/duckdegen"><img src="https://avatars.githubusercontent.com/u/98649644?v=4?s=100" width="100px;" alt="duckdegen"/><br /><sub><b>duckdegen</b></sub></a><br /><a href="#content-duckdegen" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sminempepe"><img src="https://avatars.githubusercontent.com/u/76882704?v=4?s=100" width="100px;" alt="sminempepe"/><br /><sub><b>sminempepe</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=sminempepe" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/aslikaya"><img src="https://avatars.githubusercontent.com/u/9151261?v=4?s=100" width="100px;" alt="aslikaya"/><br /><sub><b>aslikaya</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=aslikaya" title="Documentation">📖</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="http://lucasamberg.dev"><img src="https://avatars.githubusercontent.com/u/102396588?v=4?s=100" width="100px;" alt="Lucas Amberg"/><br /><sub><b>Lucas Amberg</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=lucas-amberg" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://a-hagi.dev/"><img src="https://avatars.githubusercontent.com/u/92589940?v=4?s=100" width="100px;" alt="Abdullahi"/><br /><sub><b>Abdullahi</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aa-hagi613" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/pranav-konde-56aa141b5/"><img src="https://avatars.githubusercontent.com/u/76070589?v=4?s=100" width="100px;" alt="Pranav Konde"/><br /><sub><b>Pranav Konde</b></sub></a><br /><a href="#content-pranavkonde" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/MohitKambli"><img src="https://avatars.githubusercontent.com/u/31406633?v=4?s=100" width="100px;" alt="Mohit Kambli"/><br /><sub><b>Mohit Kambli</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=MohitKambli" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/oleksandr-hyriavets"><img src="https://avatars.githubusercontent.com/u/19614509?v=4?s=100" width="100px;" alt="Oleksandr Hyriavets"/><br /><sub><b>Oleksandr Hyriavets</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=oleksandr-hyriavets" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/titanism"><img src="https://avatars.githubusercontent.com/u/101466223?v=4?s=100" width="100px;" alt="titanism"/><br /><sub><b>titanism</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=titanism" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.ethereum-ecosystem.com/"><img src="https://avatars.githubusercontent.com/u/43566493?v=4?s=100" width="100px;" alt="Maxime Servais"/><br /><sub><b>Maxime Servais</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Maxservais" title="Code">💻</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://t.me/nebolax"><img src="https://avatars.githubusercontent.com/u/63492346?v=4?s=100" width="100px;" alt="Alexey Nebolsin"/><br /><sub><b>Alexey Nebolsin</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=nebolax" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jimgreen2013"><img src="https://avatars.githubusercontent.com/u/15890793?v=4?s=100" width="100px;" alt="jimgreen2013"/><br /><sub><b>jimgreen2013</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=jimgreen2013" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/gabrieltemtsen"><img src="https://avatars.githubusercontent.com/u/57184013?v=4?s=100" width="100px;" alt="Gabriel Temsten"/><br /><sub><b>Gabriel Temsten</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=gabrieltemtsen" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jennyg0"><img src="https://avatars.githubusercontent.com/u/60794961?v=4?s=100" width="100px;" alt="Jen "/><br /><sub><b>Jen </b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=jennyg0" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
4 changes: 2 additions & 2 deletions i18n.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@
},
{
"code": "ne-np",
"crowdinCode": "ne-np",
"crowdinCode": "ne-NP",
"name": "Nepali",
"localName": "नेपाली",
"langDir": "ltr",
Expand Down Expand Up @@ -457,7 +457,7 @@
},
{
"code": "ur",
"crowdinCode": "ur",
"crowdinCode": "ur-IN",
"name": "Urdu",
"localName": "اردو",
"langDir": "rtl",
Expand Down
2 changes: 0 additions & 2 deletions public/content/community/get-involved/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,9 @@ The Ethereum ecosystem is on a mission to fund public goods and impactful projec
- [Ethereum Foundation job board (BambooHR)](https://ethereum.bamboohr.com/jobs/)
- [JobStash](https://jobstash.xyz)
- [Cryptocurrency Jobs](https://cryptocurrencyjobs.co/ethereum/)
- [Crypto.jobs](https://crypto.jobs/)
- [Careers at ConsenSys](https://consensys.net/careers/)
- [Crypto Jobs List](https://cryptojobslist.com/ethereum-jobs)
- [Bankless jobs board](https://pallet.xyz/list/bankless/jobs)
- [useWeb3 Jobs](https://www.useweb3.xyz/jobs)
- [Web3 Jobs](https://web3.career)
- [Web3 Army](https://web3army.xyz/)
- [Crypto Valley Jobs](https://cryptovalley.jobs/)
Expand Down
6 changes: 3 additions & 3 deletions public/content/community/grants/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ These programs support the broad Ethereum ecosystem by offering grants to a wide
These projects have created their own grants for projects aimed at developing and experimenting with their own technology.

- [Aave Grants Program](https://aavegrants.org/)_[Aave](https://aave.com/) grants DAO_
- [Balancer](https://quark-ceres-740.notion.site/Balancer-Grants-938f1b979810427f8d903a904315da41)_[Balancer](https://balancer.fi/) ecosystem fund_
- [Balancer](https://grants.balancer.community/)_[Balancer](https://balancer.fi/) ecosystem fund_
- [Chainlink Grants Program](https://chain.link/community/grants) - _[Chainlink](https://chain.link/) community grants_
- [Decentraland Grants Program](https://governance.decentraland.org/grants/)_[Decentraland](https://decentraland.org/) DAO Metaverse_
- [Lido Ecosystem Grants Organisation (LEGO)](https://lido.fi/lego)_[Lido](https://lido.fi/) finance ecosystem_
- [MetaMask Program](https://metamaskgrants.org/) - _[MetaMask](https://metamask.io/) employee-led grants DAO_
- [SKALE Network Grants Program](https://skale.space/developers#grants) - _[SKALE Network](https://skale.space/) ecosystem_
- [The Graph](https://airtable.com/shrdfvnFvVch3IOVm)_[The Graph](https://thegraph.com/) ecosystem_
- [Uniswap Grants Program](https://www.uniswapfoundation.org/apply-for-a-grant) - _[Uniswap](https://uniswap.org/) community_
- [The Graph](https://thegraph.com/ecosystem/grants/)_[The Graph](https://thegraph.com/) ecosystem_
- [Uniswap Grants Program](https://www.uniswapfoundation.org/grants) _[Uniswap](https://uniswap.org/) community_
- [Web3 Grants](https://web3grants.net) - _An extensive list of web3/crypto related grant programs_

## Quadratic funding {#quadratic-funding}
Expand Down
Loading

0 comments on commit e974ee2

Please sign in to comment.