Skip to content

Commit b28dac2

Browse files
authored
Merge pull request #10388 from ethereum/dev
Release candidate v7.14.0
2 parents 6762f6b + b09bf84 commit b28dac2

File tree

161 files changed

+11702
-590
lines changed

Some content is hidden

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

161 files changed

+11702
-590
lines changed
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Suggest quiz
2+
description: Add, update, delete questions for a quiz on ethereum.osg
3+
title: Add/Update/Delete quiz question
4+
labels: ["feature :sparkles", "quiz :books:"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
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/).
10+
- type: input
11+
id: page
12+
attributes:
13+
label: Page URL
14+
description: URL for the page the quiz can be found on, or should be added to
15+
validations:
16+
required: true
17+
- type: textarea
18+
id: question_content
19+
attributes:
20+
label: Question content
21+
description: Suggest questions to add, update, or delete based on contribution guideline
22+
validations:
23+
required: true
24+
- type: checkboxes
25+
id: work_on
26+
attributes:
27+
label: Would you like to work on this issue?
28+
options:
29+
- label: "Yes"
30+
required: false
31+
- label: "No"
32+
required: false
33+
validations:
34+
required: true

gatsby-config.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -318,17 +318,11 @@ if (!IS_PREVIEW) {
318318
resolve: "gatsby-plugin-matomo",
319319
options: {
320320
siteId: "4",
321-
matomoUrl: "https://matomo.ethereum.org",
321+
matomoUrl: "https://ethereumfoundation.matomo.cloud",
322322
siteUrl,
323323
matomoPhpScript: "matomo.php",
324324
matomoJsScript: "matomo.js",
325325
trackLoad: false,
326-
additionalTrackers: [
327-
{
328-
siteId: "1",
329-
trackerUrl: "https://ethereumfoundation.matomo.cloud/matomo.php",
330-
},
331-
],
332326
},
333327
},
334328
]

gatsby-node.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,15 @@ const checkIsPageOutdated = async (
9898

9999
const joinedFilepath = filePath.join("-")
100100
const srcPath = path.resolve(`src/intl/${lang}/page-${joinedFilepath}.json`)
101-
const englishPath = path.resolve(`src/intl/en/page-${joinedFilepath}.json`)
101+
const englishPath = path.resolve(
102+
`src/intl/${defaultLanguage}/page-${joinedFilepath}.json`
103+
)
102104

103105
// If no file exists, default to english
104106
if (!fs.existsSync(srcPath)) {
105107
return {
106-
isOutdated: true,
108+
// Consider always defaultLanguage paths as updated
109+
isOutdated: lang !== defaultLanguage,
107110
isContentEnglish: true,
108111
}
109112
} else {

0 commit comments

Comments
 (0)