Merge pull request #10417 from ethereum/staging

.github/ISSUE_TEMPLATE/suggest_quiz.yaml

@@ -0,0 +1,34 @@
+name: Suggest quiz
+description: Add, update, delete questions for a quiz on ethereum.osg
+title: Add/Update/Delete quiz question
+labels: ["feature :sparkles", "quiz :books:"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before suggesting additions, updates, or deletions of quiz content, make sure you've read our [contributing guidelines for quizzes](https://ethereum.org/en/contributing/quizzes/).
+  - type: input
+    id: page
+    attributes:
+      label: Page URL
+      description: URL for the page the quiz can be found on, or should be added to
+    validations:
+      required: true
+  - type: textarea
+    id: question_content
+    attributes:
+      label: Question content
+      description: Suggest questions to add, update, or delete based on contribution guideline
+    validations:
+      required: true
+  - type: checkboxes
+    id: work_on
+    attributes:
+      label: Would you like to work on this issue?
+      options:
+        - label: "Yes"
+          required: false
+        - label: "No"
+          required: false
+    validations:
+      required: true

gatsby-config.ts

@@ -318,17 +318,11 @@ if (!IS_PREVIEW) {
       resolve: "gatsby-plugin-matomo",
       options: {
         siteId: "4",
-        matomoUrl: "https://matomo.ethereum.org",
+        matomoUrl: "https://ethereumfoundation.matomo.cloud",
         siteUrl,
         matomoPhpScript: "matomo.php",
         matomoJsScript: "matomo.js",
         trackLoad: false,
-        additionalTrackers: [
-          {
-            siteId: "1",
-            trackerUrl: "https://ethereumfoundation.matomo.cloud/matomo.php",
-          },
-        ],
       },
     },
   ]

gatsby-node.ts

@@ -98,12 +98,15 @@ const checkIsPageOutdated = async (
 
   const joinedFilepath = filePath.join("-")
   const srcPath = path.resolve(`src/intl/${lang}/page-${joinedFilepath}.json`)
-  const englishPath = path.resolve(`src/intl/en/page-${joinedFilepath}.json`)
+  const englishPath = path.resolve(
+    `src/intl/${defaultLanguage}/page-${joinedFilepath}.json`
+  )
 
   // If no file exists, default to english
   if (!fs.existsSync(srcPath)) {
     return {
-      isOutdated: true,
+      // Consider always defaultLanguage paths as updated
+      isOutdated: lang !== defaultLanguage,
       isContentEnglish: true,
     }
   } else {