Skip to content

Commit de2f596

Browse files
authored
Merge branch 'ethereum:dev' into dev
2 parents fed54c2 + 4ed6e8f commit de2f596

File tree

1,275 files changed

+129481
-39017
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,275 files changed

+129481
-39017
lines changed

.all-contributorsrc

Lines changed: 214 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7762,7 +7762,8 @@
77627762
"avatar_url": "https://avatars.githubusercontent.com/u/9850322?v=4",
77637763
"profile": "http://setharielgreen.com",
77647764
"contributions": [
7765-
"doc"
7765+
"doc",
7766+
"content"
77667767
]
77677768
},
77687769
{
@@ -8756,7 +8757,8 @@
87568757
"profile": "https://github.com/MahendraBishnoi29",
87578758
"contributions": [
87588759
"ideas",
8759-
"code"
8760+
"code",
8761+
"bug"
87608762
]
87618763
},
87628764
{
@@ -10210,6 +10212,216 @@
1021010212
"content",
1021110213
"code"
1021210214
]
10215+
},
10216+
{
10217+
"login": "maxime216-pro",
10218+
"name": "Maxime Dessez",
10219+
"avatar_url": "https://avatars.githubusercontent.com/u/66296351?v=4",
10220+
"profile": "http://maximedessez.fr",
10221+
"contributions": [
10222+
"bug",
10223+
"translation"
10224+
]
10225+
},
10226+
{
10227+
"login": "Tyler-233",
10228+
"name": "Tyler-233",
10229+
"avatar_url": "https://avatars.githubusercontent.com/u/44740396?v=4",
10230+
"profile": "https://github.com/Tyler-233",
10231+
"contributions": [
10232+
"translation",
10233+
"content"
10234+
]
10235+
},
10236+
{
10237+
"login": "neodaoist",
10238+
"name": "neodaoist",
10239+
"avatar_url": "https://avatars.githubusercontent.com/u/3170590?v=4",
10240+
"profile": "http://neodaoist.xyz",
10241+
"contributions": [
10242+
"content"
10243+
]
10244+
},
10245+
{
10246+
"login": "atharvadeosthale",
10247+
"name": "Atharva Deosthale",
10248+
"avatar_url": "https://avatars.githubusercontent.com/u/11805367?v=4",
10249+
"profile": "https://links.atharva.codes",
10250+
"contributions": [
10251+
"content"
10252+
]
10253+
},
10254+
{
10255+
"login": "ckartik",
10256+
"name": "Kartik Chopra",
10257+
"avatar_url": "https://avatars.githubusercontent.com/u/13803371?v=4",
10258+
"profile": "https://github.com/ckartik",
10259+
"contributions": [
10260+
"content"
10261+
]
10262+
},
10263+
{
10264+
"login": "BBashh",
10265+
"name": "Bibash Tandon",
10266+
"avatar_url": "https://avatars.githubusercontent.com/u/125178349?v=4",
10267+
"profile": "https://github.com/BBashh",
10268+
"contributions": [
10269+
"content"
10270+
]
10271+
},
10272+
{
10273+
"login": "vaibhavtevatia",
10274+
"name": "Vaibhav Tevatia",
10275+
"avatar_url": "https://avatars.githubusercontent.com/u/86671961?v=4",
10276+
"profile": "https://github.com/vaibhavtevatia",
10277+
"contributions": [
10278+
"code"
10279+
]
10280+
},
10281+
{
10282+
"login": "cnn-rnn",
10283+
"name": "cnn-rnn",
10284+
"avatar_url": "https://avatars.githubusercontent.com/u/44789658?v=4",
10285+
"profile": "https://github.com/cnn-rnn",
10286+
"contributions": [
10287+
"ideas"
10288+
]
10289+
},
10290+
{
10291+
"login": "SahityaRoy",
10292+
"name": "Sahitya Roy",
10293+
"avatar_url": "https://avatars.githubusercontent.com/u/72821604?v=4",
10294+
"profile": "https://www.linkedin.com/in/sahitya-roy-244b941a2/",
10295+
"contributions": [
10296+
"ideas"
10297+
]
10298+
},
10299+
{
10300+
"login": "Keecointoken",
10301+
"name": "KeeCoin",
10302+
"avatar_url": "https://avatars.githubusercontent.com/u/99338330?v=4",
10303+
"profile": "https://www.keecoin.io",
10304+
"contributions": [
10305+
"ideas"
10306+
]
10307+
},
10308+
{
10309+
"login": "tomatowax",
10310+
"name": "Seungwook Chi",
10311+
"avatar_url": "https://avatars.githubusercontent.com/u/799503?v=4",
10312+
"profile": "http://www.tomatowax.com/",
10313+
"contributions": [
10314+
"content"
10315+
]
10316+
},
10317+
{
10318+
"login": "0xx92",
10319+
"name": "0xx92",
10320+
"avatar_url": "https://avatars.githubusercontent.com/u/133748557?v=4",
10321+
"profile": "https://github.com/0xx92",
10322+
"contributions": [
10323+
"content"
10324+
]
10325+
},
10326+
{
10327+
"login": "altinocoelho",
10328+
"name": "altinocoelho",
10329+
"avatar_url": "https://avatars.githubusercontent.com/u/92543849?v=4",
10330+
"profile": "https://github.com/altinocoelho",
10331+
"contributions": [
10332+
"content"
10333+
]
10334+
},
10335+
{
10336+
"login": "viac92",
10337+
"name": "viac92",
10338+
"avatar_url": "https://avatars.githubusercontent.com/u/64146594?v=4",
10339+
"profile": "https://github.com/viac92",
10340+
"contributions": [
10341+
"content"
10342+
]
10343+
},
10344+
{
10345+
"login": "GDdark",
10346+
"name": "DongXi Huang",
10347+
"avatar_url": "https://avatars.githubusercontent.com/u/15982894?v=4",
10348+
"profile": "https://github.com/GDdark",
10349+
"contributions": [
10350+
"content"
10351+
]
10352+
},
10353+
{
10354+
"login": "SurajAnand88",
10355+
"name": "Suraj Anand",
10356+
"avatar_url": "https://avatars.githubusercontent.com/u/120190623?v=4",
10357+
"profile": "https://surajanand88.github.io/portfolio/",
10358+
"contributions": [
10359+
"content"
10360+
]
10361+
},
10362+
{
10363+
"login": "MwitahJob",
10364+
"name": "Mwitah ",
10365+
"avatar_url": "https://avatars.githubusercontent.com/u/136892656?v=4",
10366+
"profile": "https://github.com/MwitahJob",
10367+
"contributions": [
10368+
"content"
10369+
]
10370+
},
10371+
{
10372+
"login": "TucksonDev",
10373+
"name": "Tuckson",
10374+
"avatar_url": "https://avatars.githubusercontent.com/u/105675159?v=4",
10375+
"profile": "https://github.com/TucksonDev",
10376+
"contributions": [
10377+
"content"
10378+
]
10379+
},
10380+
{
10381+
"login": "Akamig",
10382+
"name": "Akamig",
10383+
"avatar_url": "https://avatars.githubusercontent.com/u/6278999?v=4",
10384+
"profile": "https://twitter.com/_Akamig",
10385+
"contributions": [
10386+
"content"
10387+
]
10388+
},
10389+
{
10390+
"login": "perriefidelis",
10391+
"name": "Peace Ojemeh",
10392+
"avatar_url": "https://avatars.githubusercontent.com/u/30669761?v=4",
10393+
"profile": "https://github.com/perriefidelis",
10394+
"contributions": [
10395+
"content"
10396+
]
10397+
},
10398+
{
10399+
"login": "woseK",
10400+
"name": "woseK",
10401+
"avatar_url": "https://avatars.githubusercontent.com/u/110729731?v=4",
10402+
"profile": "https://github.com/woseK",
10403+
"contributions": [
10404+
"content",
10405+
"bug"
10406+
]
10407+
},
10408+
{
10409+
"login": "gunal-123",
10410+
"name": "Gunal",
10411+
"avatar_url": "https://avatars.githubusercontent.com/u/103403219?v=4",
10412+
"profile": "https://github.com/gunal-123",
10413+
"contributions": [
10414+
"content"
10415+
]
10416+
},
10417+
{
10418+
"login": "LadyDhaga",
10419+
"name": "chinaman123",
10420+
"avatar_url": "https://avatars.githubusercontent.com/u/106376368?v=4",
10421+
"profile": "https://github.com/LadyDhaga",
10422+
"contributions": [
10423+
"ideas"
10424+
]
1021310425
}
1021410426
],
1021510427
"contributorsPerLine": 7,
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: Update Crowdin Contributors
2+
3+
on:
4+
schedule:
5+
- cron: "0 0 * * SUN" # Runs every Sunday at midnight
6+
workflow_dispatch:
7+
8+
jobs:
9+
create_pr:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Check out code
13+
uses: actions/checkout@v3
14+
15+
- name: Set up Node.js
16+
uses: actions/setup-node@v3
17+
with:
18+
node-version: 18
19+
20+
- name: Install dependencies
21+
run: yarn install
22+
23+
- name: Install ts-node
24+
run: yarn global add ts-node
25+
26+
- name: Set up git
27+
run: |
28+
git config --global user.email "[email protected]"
29+
git config --global user.name "GitHub Action"
30+
31+
- name: Generate timestamp and readable date
32+
id: date
33+
run: |
34+
echo "TIMESTAMP=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_ENV
35+
echo "READABLE_DATE=$(date +'%B %-d')" >> $GITHUB_ENV
36+
37+
- name: Fetch latest dev and create new branch
38+
run: |
39+
git fetch origin dev
40+
git checkout -b "automated-update-${{ env.TIMESTAMP }}" origin/dev
41+
42+
- name: Run script
43+
run: npx ts-node -O '{"module":"commonjs"}' ./src/scripts/crowdin/getCrowdinContributors.ts
44+
env:
45+
CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
46+
47+
- name: Commit and push
48+
run: |
49+
git add -A
50+
git commit -m "Update Crowdin contributors"
51+
git push origin "automated-update-${{ env.TIMESTAMP }}"
52+
53+
- name: Create PR body
54+
run: |
55+
echo "This PR was automatically created to update Crowdin contributors." > pr_body.txt
56+
echo "This workflows runs every Sunday at 00:00 (UTC)." >> pr_body.txt
57+
echo "" >> pr_body.txt
58+
echo "Thank you to everyone contributing to translate ethereum.org ❤️" >> pr_body.txt
59+
60+
- name: Create Pull Request
61+
run: |
62+
gh auth login --with-token <<< ${{ secrets.GITHUB_TOKEN }}
63+
gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update translation contributors from Crowdin - ${{ env.READABLE_DATE }}" --body-file pr_body.txt

.storybook/babel-storybook-config.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
export const babelConfig = {
1+
import { TransformOptions } from "@babel/core"
2+
3+
export const babelConfig: TransformOptions = {
24
sourceType: "unambiguous",
35
presets: [
46
[

.storybook/i18next.ts

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import i18n, { Resource } from "i18next"
2+
import { initReactI18next } from "gatsby-plugin-react-i18next"
3+
4+
export const baseLocales = {
5+
en: { title: "English", left: "En" },
6+
zh: { title: "中国人", left: "Zh" },
7+
ru: { title: "Русский", left: "Ru" },
8+
uk: { title: "українська", left: "Uk" },
9+
}
10+
11+
// Only i18n files named in this array are being exposed to Storybook. Add filenames as necessary.
12+
const ns = ["common", "page-about", "page-upgrades", "page-developers-index"]
13+
const supportedLngs = Object.keys(baseLocales)
14+
15+
/**
16+
* Taking the ns array and combining all the ids
17+
* under a single ns per language, set to the default of "translation"
18+
*/
19+
const resources: Resource = ns.reduce((acc, n) => {
20+
supportedLngs.forEach((lng) => {
21+
if (!acc[lng]) acc[lng] = {}
22+
acc[lng] = {
23+
translation: {
24+
...acc[lng].translation,
25+
...require(`../src/intl/${lng}/${n}.json`),
26+
},
27+
}
28+
})
29+
return acc
30+
}, {})
31+
32+
i18n.use(initReactI18next).init({
33+
debug: true,
34+
fallbackLng: "en",
35+
interpolation: { escapeValue: false },
36+
react: { useSuspense: false },
37+
supportedLngs,
38+
resources,
39+
})
40+
41+
export default i18n

0 commit comments

Comments
 (0)