Merge pull request #11030 from ethereum/dev

Release candidate v7.20.0

Author: pettinarip

.all-contributorsrc

@@ -10422,6 +10422,16 @@
       "contributions": [
         "ideas"
       ]
+    },
+    {
+      "login": "z0rats",
+      "name": "Alex",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32142853?v=4",
+      "profile": "http://t.me/mevsinternet",
+      "contributions": [
+        "doc",
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.storybook/i18next.ts

@@ -1,5 +1,6 @@
 import i18n, { Resource } from "i18next"
 import { initReactI18next } from "gatsby-plugin-react-i18next"
+import fs from "fs"
 
 export const baseLocales = {
   en: { title: "English", left: "En" },
@@ -9,7 +10,13 @@ export const baseLocales = {
 }
 
 // Only i18n files named in this array are being exposed to Storybook. Add filenames as necessary.
-const ns = ["common", "page-about", "page-upgrades", "page-developers-index"]
+const ns = [
+  "common",
+  "glossary",
+  "page-about",
+  "page-upgrades",
+  "page-developers-index",
+]
 const supportedLngs = Object.keys(baseLocales)
 
 /**
@@ -19,11 +26,22 @@ const supportedLngs = Object.keys(baseLocales)
 const resources: Resource = ns.reduce((acc, n) => {
   supportedLngs.forEach((lng) => {
     if (!acc[lng]) acc[lng] = {}
-    acc[lng] = {
-      translation: {
-        ...acc[lng].translation,
-        ...require(`../src/intl/${lng}/${n}.json`),
-      },
+    try {
+      acc[lng] = {
+        translation: {
+          ...acc[lng].translation,
+
+          ...require(`../src/intl/${lng}/${n}.json`),
+        },
+      }
+    } catch {
+      acc[lng] = {
+        translation: {
+          ...acc[lng].translation,
+
+          ...require(`../src/intl/en/${n}.json`),
+        },
+      }
     }
   })
   return acc

README.md

@@ -1630,6 +1630,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://github.com/LadyDhaga"><img src="https://avatars.githubusercontent.com/u/106376368?v=4?s=100" width="100px;" alt="chinaman123"/><br /><sub><b>chinaman123</b></sub></a><br /><a href="#ideas-LadyDhaga" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://t.me/mevsinternet"><img src="https://avatars.githubusercontent.com/u/32142853?v=4?s=100" width="100px;" alt="Alex"/><br /><sub><b>Alex</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=z0rats" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Az0rats" title="Bug reports">🐛</a></td>
     </tr>
   </tbody>
 </table>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "7.19.2",
+  "version": "7.20.0",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "[email protected]:ethereum/ethereum-org-website.git",