Skip to content

Commit 93db338

Browse files
minimalsmminimalsm
authored
Merge branch 'dev' into jc-pow-v-pos
2 parents dd4495e + 36f5460 commit 93db338

File tree

398 files changed

+18360
-17131
lines changed

Some content is hidden

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

398 files changed

+18360
-17131
lines changed

‎.all-contributorsrc

Lines changed: 176 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7313,7 +7313,8 @@
73137313
"avatar_url": "https://avatars.githubusercontent.com/u/70309026?v=4",
73147314
"profile": "https://github.com/LuozhuZhang",
73157315
"contributions": [
7316-
"doc"
7316+
"doc",
7317+
"ideas"
73177318
]
73187319
},
73197320
{
@@ -9599,6 +9600,180 @@
95999600
"contributions": [
96009601
"doc"
96019602
]
9603+
},
9604+
{
9605+
"login": "dgcoffman",
9606+
"name": "Daniel Coffman",
9607+
"avatar_url": "https://avatars.githubusercontent.com/u/1711204?v=4",
9608+
"profile": "http://dancoffman.com",
9609+
"contributions": [
9610+
"doc"
9611+
]
9612+
},
9613+
{
9614+
"login": "Amit0617",
9615+
"name": "AMIT KUMAR MISHRA",
9616+
"avatar_url": "https://avatars.githubusercontent.com/u/71893015?v=4",
9617+
"profile": "https://github.com/Amit0617",
9618+
"contributions": [
9619+
"doc"
9620+
]
9621+
},
9622+
{
9623+
"login": "Saksham010",
9624+
"name": "Saksham Thapa",
9625+
"avatar_url": "https://avatars.githubusercontent.com/u/56692835?v=4",
9626+
"profile": "https://github.com/Saksham010",
9627+
"contributions": [
9628+
"bug"
9629+
]
9630+
},
9631+
{
9632+
"login": "vjgaur",
9633+
"name": "Vijayendra Gaur",
9634+
"avatar_url": "https://avatars.githubusercontent.com/u/1871257?v=4",
9635+
"profile": "https://github.com/vjgaur",
9636+
"contributions": [
9637+
"doc"
9638+
]
9639+
},
9640+
{
9641+
"login": "nocibambi",
9642+
"name": "András Novoszáth",
9643+
"avatar_url": "https://avatars.githubusercontent.com/u/8539674?v=4",
9644+
"profile": "https://www.linkedin.com/in/andrasnovoszath/",
9645+
"contributions": [
9646+
"doc"
9647+
]
9648+
},
9649+
{
9650+
"login": "SahilAujla",
9651+
"name": "Sahil Aujla",
9652+
"avatar_url": "https://avatars.githubusercontent.com/u/83442423?v=4",
9653+
"profile": "http://sahilaujla.com",
9654+
"contributions": [
9655+
"doc"
9656+
]
9657+
},
9658+
{
9659+
"login": "ritave",
9660+
"name": "Olaf Tomalka",
9661+
"avatar_url": "https://avatars.githubusercontent.com/u/1614945?v=4",
9662+
"profile": "https://github.com/ritave",
9663+
"contributions": [
9664+
"doc"
9665+
]
9666+
},
9667+
{
9668+
"login": "armgp",
9669+
"name": "Abhiram G P",
9670+
"avatar_url": "https://avatars.githubusercontent.com/u/49094298?v=4",
9671+
"profile": "https://github.com/armgp",
9672+
"contributions": [
9673+
"code"
9674+
]
9675+
},
9676+
{
9677+
"login": "aelmanaa",
9678+
"name": "Amine E.",
9679+
"avatar_url": "https://avatars.githubusercontent.com/u/4503543?v=4",
9680+
"profile": "https://github.com/aelmanaa",
9681+
"contributions": [
9682+
"doc"
9683+
]
9684+
},
9685+
{
9686+
"login": "Roshan-R",
9687+
"name": "Roshan R Chandar",
9688+
"avatar_url": "https://avatars.githubusercontent.com/u/43182697?v=4",
9689+
"profile": "https://roshan.ml/",
9690+
"contributions": [
9691+
"doc"
9692+
]
9693+
},
9694+
{
9695+
"login": "mossow",
9696+
"name": "mossow",
9697+
"avatar_url": "https://avatars.githubusercontent.com/u/9072132?v=4",
9698+
"profile": "https://github.com/mossow",
9699+
"contributions": [
9700+
"doc"
9701+
]
9702+
},
9703+
{
9704+
"login": "OpenWJY",
9705+
"name": "yujingwei",
9706+
"avatar_url": "https://avatars.githubusercontent.com/u/29328336?v=4",
9707+
"profile": "https://github.com/OpenWJY",
9708+
"contributions": [
9709+
"doc"
9710+
]
9711+
},
9712+
{
9713+
"login": "Olshansk",
9714+
"name": "Daniel Olshansky",
9715+
"avatar_url": "https://avatars.githubusercontent.com/u/1892194?v=4",
9716+
"profile": "http://olshansky.info",
9717+
"contributions": [
9718+
"doc",
9719+
"ideas"
9720+
]
9721+
},
9722+
{
9723+
"login": "aguzmant103",
9724+
"name": "aguzmant103",
9725+
"avatar_url": "https://avatars.githubusercontent.com/u/67167307?v=4",
9726+
"profile": "https://github.com/aguzmant103",
9727+
"contributions": [
9728+
"doc"
9729+
]
9730+
},
9731+
{
9732+
"login": "soheil555",
9733+
"name": "Soheil",
9734+
"avatar_url": "https://avatars.githubusercontent.com/u/22212139?v=4",
9735+
"profile": "https://soheil.vercel.app/",
9736+
"contributions": [
9737+
"code"
9738+
]
9739+
},
9740+
{
9741+
"login": "metadiver",
9742+
"name": "metadiver.eth",
9743+
"avatar_url": "https://avatars.githubusercontent.com/u/75746881?v=4",
9744+
"profile": "http://linktr.ee/metadiver",
9745+
"contributions": [
9746+
"code"
9747+
]
9748+
},
9749+
{
9750+
"login": "nuclearfalcon",
9751+
"name": "Jacob",
9752+
"avatar_url": "https://avatars.githubusercontent.com/u/12568736?v=4",
9753+
"profile": "https://github.com/nuclearfalcon",
9754+
"contributions": [
9755+
"ideas",
9756+
"doc"
9757+
]
9758+
},
9759+
{
9760+
"login": "theSamPadilla",
9761+
"name": "Sam Padilla",
9762+
"avatar_url": "https://avatars.githubusercontent.com/u/35386211?v=4",
9763+
"profile": "https://github.com/theSamPadilla",
9764+
"contributions": [
9765+
"doc"
9766+
]
9767+
},
9768+
{
9769+
"login": "terasum",
9770+
"name": "Chen Quan",
9771+
"avatar_url": "https://avatars.githubusercontent.com/u/20042193?v=4",
9772+
"profile": "https://chenquan.me",
9773+
"contributions": [
9774+
"doc",
9775+
"translation"
9776+
]
96029777
}
96039778
],
96049779
"contributorsPerLine": 7,

‎README.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1190,7 +1190,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
11901190
<td align="center"><a href="https://github.com/1337-ishaan"><img src="https://avatars.githubusercontent.com/u/64636222?v=4?s=100" width="100px;" alt="Ishaan Parmar"/><br /><sub><b>Ishaan Parmar</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=1337-ishaan" title="Code">💻</a> <a href="#design-1337-ishaan" title="Design">🎨</a> <a href="#ideas-1337-ishaan" title="Ideas, Planning, & Feedback">🤔</a></td>
11911191
<td align="center"><a href="http://tarunbatra.com"><img src="https://avatars.githubusercontent.com/u/5329230?v=4?s=100" width="100px;" alt="Tarun Batra"/><br /><sub><b>Tarun Batra</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=tarunbatra" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Atarunbatra" title="Bug reports">🐛</a></td>
11921192
<td align="center"><a href="https://github.com/max-donger"><img src="https://avatars.githubusercontent.com/u/56192627?v=4?s=100" width="100px;" alt="Max"/><br /><sub><b>Max</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=max-donger" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amax-donger" title="Bug reports">🐛</a></td>
1193-
<td align="center"><a href="https://github.com/LuozhuZhang"><img src="https://avatars.githubusercontent.com/u/70309026?v=4?s=100" width="100px;" alt="Luozhu"/><br /><sub><b>Luozhu</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=LuozhuZhang" title="Documentation">📖</a></td>
1193+
<td align="center"><a href="https://github.com/LuozhuZhang"><img src="https://avatars.githubusercontent.com/u/70309026?v=4?s=100" width="100px;" alt="Luozhu"/><br /><sub><b>Luozhu</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=LuozhuZhang" title="Documentation">📖</a> <a href="#ideas-LuozhuZhang" title="Ideas, Planning, & Feedback">🤔</a></td>
11941194
</tr>
11951195
<tr>
11961196
<td align="center"><a href="http://www.linkedin.com/in/sharma-yash"><img src="https://avatars.githubusercontent.com/u/44340561?v=4?s=100" width="100px;" alt="Yash Sharma "/><br /><sub><b>Yash Sharma </b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=yash-sharma1" title="Documentation">📖</a></td>
@@ -1510,6 +1510,29 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
15101510
<tr>
15111511
<td align="center"><a href="https://github.com/owenHwang"><img src="https://avatars.githubusercontent.com/u/112543777?v=4?s=100" width="100px;" alt="Owen Hwang"/><br /><sub><b>Owen Hwang</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=owenHwang" title="Documentation">📖</a></td>
15121512
<td align="center"><a href="https://github.com/florath"><img src="https://avatars.githubusercontent.com/u/11856543?v=4?s=100" width="100px;" alt="Andreas Florath"/><br /><sub><b>Andreas Florath</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=florath" title="Documentation">📖</a></td>
1513+
<td align="center"><a href="http://dancoffman.com"><img src="https://avatars.githubusercontent.com/u/1711204?v=4?s=100" width="100px;" alt="Daniel Coffman"/><br /><sub><b>Daniel Coffman</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=dgcoffman" title="Documentation">📖</a></td>
1514+
<td align="center"><a href="https://github.com/Amit0617"><img src="https://avatars.githubusercontent.com/u/71893015?v=4?s=100" width="100px;" alt="AMIT KUMAR MISHRA"/><br /><sub><b>AMIT KUMAR MISHRA</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Amit0617" title="Documentation">📖</a></td>
1515+
<td align="center"><a href="https://github.com/Saksham010"><img src="https://avatars.githubusercontent.com/u/56692835?v=4?s=100" width="100px;" alt="Saksham Thapa"/><br /><sub><b>Saksham Thapa</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3ASaksham010" title="Bug reports">🐛</a></td>
1516+
<td align="center"><a href="https://github.com/vjgaur"><img src="https://avatars.githubusercontent.com/u/1871257?v=4?s=100" width="100px;" alt="Vijayendra Gaur"/><br /><sub><b>Vijayendra Gaur</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=vjgaur" title="Documentation">📖</a></td>
1517+
<td align="center"><a href="https://www.linkedin.com/in/andrasnovoszath/"><img src="https://avatars.githubusercontent.com/u/8539674?v=4?s=100" width="100px;" alt="András Novoszáth"/><br /><sub><b>András Novoszáth</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=nocibambi" title="Documentation">📖</a></td>
1518+
</tr>
1519+
<tr>
1520+
<td align="center"><a href="http://sahilaujla.com"><img src="https://avatars.githubusercontent.com/u/83442423?v=4?s=100" width="100px;" alt="Sahil Aujla"/><br /><sub><b>Sahil Aujla</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=SahilAujla" title="Documentation">📖</a></td>
1521+
<td align="center"><a href="https://github.com/ritave"><img src="https://avatars.githubusercontent.com/u/1614945?v=4?s=100" width="100px;" alt="Olaf Tomalka"/><br /><sub><b>Olaf Tomalka</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=ritave" title="Documentation">📖</a></td>
1522+
<td align="center"><a href="https://github.com/armgp"><img src="https://avatars.githubusercontent.com/u/49094298?v=4?s=100" width="100px;" alt="Abhiram G P"/><br /><sub><b>Abhiram G P</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=armgp" title="Code">💻</a></td>
1523+
<td align="center"><a href="https://github.com/aelmanaa"><img src="https://avatars.githubusercontent.com/u/4503543?v=4?s=100" width="100px;" alt="Amine E."/><br /><sub><b>Amine E.</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=aelmanaa" title="Documentation">📖</a></td>
1524+
<td align="center"><a href="https://roshan.ml/"><img src="https://avatars.githubusercontent.com/u/43182697?v=4?s=100" width="100px;" alt="Roshan R Chandar"/><br /><sub><b>Roshan R Chandar</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Roshan-R" title="Documentation">📖</a></td>
1525+
<td align="center"><a href="https://github.com/mossow"><img src="https://avatars.githubusercontent.com/u/9072132?v=4?s=100" width="100px;" alt="mossow"/><br /><sub><b>mossow</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=mossow" title="Documentation">📖</a></td>
1526+
<td align="center"><a href="https://github.com/OpenWJY"><img src="https://avatars.githubusercontent.com/u/29328336?v=4?s=100" width="100px;" alt="yujingwei"/><br /><sub><b>yujingwei</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=OpenWJY" title="Documentation">📖</a></td>
1527+
</tr>
1528+
<tr>
1529+
<td align="center"><a href="http://olshansky.info"><img src="https://avatars.githubusercontent.com/u/1892194?v=4?s=100" width="100px;" alt="Daniel Olshansky"/><br /><sub><b>Daniel Olshansky</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Olshansk" title="Documentation">📖</a> <a href="#ideas-Olshansk" title="Ideas, Planning, & Feedback">🤔</a></td>
1530+
<td align="center"><a href="https://github.com/aguzmant103"><img src="https://avatars.githubusercontent.com/u/67167307?v=4?s=100" width="100px;" alt="aguzmant103"/><br /><sub><b>aguzmant103</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=aguzmant103" title="Documentation">📖</a></td>
1531+
<td align="center"><a href="https://soheil.vercel.app/"><img src="https://avatars.githubusercontent.com/u/22212139?v=4?s=100" width="100px;" alt="Soheil"/><br /><sub><b>Soheil</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=soheil555" title="Code">💻</a></td>
1532+
<td align="center"><a href="http://linktr.ee/metadiver"><img src="https://avatars.githubusercontent.com/u/75746881?v=4?s=100" width="100px;" alt="metadiver.eth"/><br /><sub><b>metadiver.eth</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=metadiver" title="Code">💻</a></td>
1533+
<td align="center"><a href="https://github.com/nuclearfalcon"><img src="https://avatars.githubusercontent.com/u/12568736?v=4?s=100" width="100px;" alt="Jacob"/><br /><sub><b>Jacob</b></sub></a><br /><a href="#ideas-nuclearfalcon" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=nuclearfalcon" title="Documentation">📖</a></td>
1534+
<td align="center"><a href="https://github.com/theSamPadilla"><img src="https://avatars.githubusercontent.com/u/35386211?v=4?s=100" width="100px;" alt="Sam Padilla"/><br /><sub><b>Sam Padilla</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=theSamPadilla" title="Documentation">📖</a></td>
1535+
<td align="center"><a href="https://chenquan.me"><img src="https://avatars.githubusercontent.com/u/20042193?v=4?s=100" width="100px;" alt="Chen Quan"/><br /><sub><b>Chen Quan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=terasum" title="Documentation">📖</a> <a href="#translation-terasum" title="Translation">🌍</a></td>
15131536
</tr>
15141537
</tbody>
15151538
</table>

‎docs/best-practices.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Markdown will be translated as whole pages of content, so no specific action is
5252

5353
- _tl;dr Each individual JSON entry should be a complete phrase by itself_
5454

55-
- This is done using the `Translation` component. However there is an alternative method for regular JS: `gatsby-theme-i18n` with `/src/utils/translations.ts`
55+
- This is done using the `Translation` component. However there is an alternative method for regular JS: using the `t` function from `gatsby-plugin-react-i18next`
5656

5757
- **Method one: `<Translation />` component (preferred if only needed in JSX)**
5858

@@ -63,19 +63,18 @@ Markdown will be translated as whole pages of content, so no specific action is
6363
;<Translation id="language-json-key" />
6464
```
6565

66-
- **Method two: `translateMessageId()`**
66+
- **Method two: `t()`**
6767

6868
```tsx
69-
import { useIntl } from "react-intl"
70-
import { translateMessageId } from "src/utils/translations"
69+
import { useTranslation } from "gatsby-plugin-react-i18next"
7170
7271
// Utilize anywhere in JS using
73-
const intl = useIntl()
74-
translateMessageId("language-json-key", intl)
72+
const { t } = useTranslation()
73+
t("language-json-key")
7574
```
7675

7776
```tsx
78-
const siteTitle = translateMessageId("site-title", intl)
77+
const siteTitle = t("site-title")
7978
```
8079

8180
## React Hooks

0 commit comments

Comments
 (0)