Skip to content

Commit ade8f03

Browse files
Merge pull request #709 from freeCodeCamp/main
Create a new pull request by comparing changes across two branches
2 parents cdaa498 + 55184e9 commit ade8f03

File tree

32 files changed

+1614
-51
lines changed

32 files changed

+1614
-51
lines changed

.github/workflows/update-license.yaml

Lines changed: 0 additions & 24 deletions
This file was deleted.

client/i18n/locales/english/intro.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1880,7 +1880,13 @@
18801880
"yskn": { "title": "134", "intro": [] },
18811881
"tpni": { "title": "135", "intro": [] },
18821882
"hoec": { "title": "136", "intro": [] },
1883-
"cygu": { "title": "137", "intro": [] },
1883+
"workshop-teacher-chatbot": {
1884+
"title": "Build a Teacher Chatbot",
1885+
"intro": [
1886+
"In this workshop, you will continue to learn more about JavaScript strings by building a chatbot.",
1887+
"You will learn how to work with template literals, and the <code>indexOf</code> method."
1888+
]
1889+
},
18841890
"axgb": { "title": "138", "intro": [] },
18851891
"rwac": { "title": "139", "intro": [] },
18861892
"uzjg": { "title": "140", "intro": [] },
@@ -1921,7 +1927,10 @@
19211927
"ccnu": { "title": "175", "intro": [] },
19221928
"skiq": { "title": "176", "intro": [] },
19231929
"epfc": { "title": "177", "intro": [] },
1924-
"gsfr": { "title": "178", "intro": [] },
1930+
"lab-gradebook-app": {
1931+
"title": "Build a Gradebook App",
1932+
"intro": ["For this lab, you will create a gradebook app."]
1933+
},
19251934
"fbbn": { "title": "179", "intro": [] },
19261935
"lnmg": { "title": "180", "intro": [] },
19271936
"wead": { "title": "181", "intro": [] },
@@ -1950,9 +1959,9 @@
19501959
"ksfc": { "title": "204", "intro": [] },
19511960
"xeqa": { "title": "205", "intro": [] },
19521961
"lab-random-background-color-changer": {
1953-
"title": "Build a Random Background Color Changer",
1962+
"title": "Debug a Random Background Color Changer",
19541963
"intro": [
1955-
"For this lab, you will create a random background color changer."
1964+
"For this lab, you will debug a random background color changer and fix the errors to make it work properly."
19561965
]
19571966
},
19581967
"dqth": { "title": "207", "intro": [] },

client/i18n/locales/portuguese/intro.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1779,10 +1779,10 @@
17791779
"intro": []
17801780
},
17811781
"workshop-hotel-feedback-form": {
1782-
"title": "Build a Hotel Feedback Form",
1782+
"title": "Crie um formulário de feedback de hotéis",
17831783
"intro": [
1784-
"In this workshop, you will learn how to work with forms by building a Hotel Feedback Form.",
1785-
"You will learn how to work with labels, inputs, fieldsets, legends, textareas and buttons."
1784+
"Neste workshop, você aprenderá a trabalhar com formulários criando um formulário de feedback de hotéis.",
1785+
"Você aprenderá a trabalhar com os elementos label, input, fieldset, legend, textarea e button."
17861786
]
17871787
},
17881788
"lab-survey-form": {

client/i18n/locales/portuguese/translations.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"buttons": {
33
"logged-in-cta-btn": "Comece (é grátis)",
4-
"get-started": "Get Started",
4+
"get-started": "Primeiros passos",
55
"logged-out-cta-btn": "Inicie a sessão para salvar seu progresso (é grátis)",
66
"view-curriculum": "Visualizar o currículo",
77
"first-lesson": "Ir para a primeira aula",
@@ -107,15 +107,15 @@
107107
},
108108
"landing": {
109109
"big-heading-1": "Aprenda a programar — de graça.",
110-
"big-heading-1-b": "Learn to code.",
110+
"big-heading-1-b": "Aprenda a programar.",
111111
"big-heading-2": "Crie projetos.",
112112
"big-heading-3": "Obtenha certificações.",
113-
"big-heading-4": "All for free.",
113+
"big-heading-4": "De graça.",
114114
"h2-heading": "Desde 2014, mais de 40.000 pessoas que concluíram o freeCodeCamp.org obtiveram empregos em empresas de tecnologia incluindo:",
115-
"h2-heading-b": "More than 100,000 freeCodeCamp.org graduates have gotten jobs at tech companies including:",
115+
"h2-heading-b": "Mais de 100 mil pessoas já concluíram o freeCodeCamp.org e obtiveram empregos em empresas de tecnologia, incluindo:",
116116
"hero-img-description": "Estudantes do freeCodeCamp em um grupo de estudos local na Coreia do Sul.",
117117
"hero-img-alt": "Um grupo de pessoas, incluindo um homem branco, uma mulher negra e uma mulher asiática, reunidos ao redor de um laptop.",
118-
"hero-img-uis": "A group of screenshots showing the freeCodeCamp editor interface on both a mobile and desktop device and a certification.",
118+
"hero-img-uis": "Um grupo de capturas de tela mostrando a interface de editor do freeCodeCamp em um dispositivo móvel e em um desktop, além de uma certificação.",
119119
"as-seen-in": "Conforme visto em:",
120120
"testimonials": {
121121
"heading": "Veja o que os nossos ex-alunos dizem sobre o freeCodeCamp:",
@@ -281,9 +281,9 @@
281281
"reset-p3": "Não conseguiremos recuperar nada disso depois, mesmo que você mude de ideia.",
282282
"nevermind-2": "Deixa para lá, não quero apagar todo o meu progresso",
283283
"reset-confirm": "Redefinir tudo. Eu quero começar do início",
284-
"verify-text": "To verify, type \"{{ verifyText }}\" below:",
285-
"verify-reset-text": "I agree that all progress will be lost",
286-
"verify-delete-text": "I agree to delete my account"
284+
"verify-text": "Para verificar, digite \"{{ verifyText }}\" abaixo:",
285+
"verify-reset-text": "Eu concordo que todo o progresso será perdido",
286+
"verify-delete-text": "Eu concordo em excluir minha conta"
287287
},
288288
"email": {
289289
"missing": "Você não tem um e-mail associado a esta conta.",
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
title: Introduction to the Build a Gradebook App
3+
block: lab-gradebook-app
4+
superBlock: front-end-development
5+
---
6+
7+
## Introduction to the Build a Gradebook App
8+
9+
For this lab, you will create a gradebook app.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
title: Introduction to the Build a Random Background Color Changer
2+
title: Introduction to the Debug a Random Background Color Changer
33
block: lab-random-background-color-changer
44
superBlock: front-end-development
55
---
66

7-
## Introduction to the Build a Random Background Color Changer
7+
## Introduction to the Debug a Random Background Color Changer
88

9-
For this lab, you will create a random background color changer.
9+
For this lab, you will debug a random background color changer and fix the errors to make it work properly.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
title: Introduction to the Build a Teacher Chatbot
3+
block: workshop-teacher-chatbot
4+
superBlock: front-end-development
5+
---
6+
7+
## Introduction to the Build a Teacher Chatbot
8+
9+
This is a test for the new project-based curriculum.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"name": "Build a Gradebook App",
3+
"blockType": "lab",
4+
"isUpcomingChange": true,
5+
"usesMultifileEditor": true,
6+
"dashedName": "lab-gradebook-app",
7+
"order": 178,
8+
"superBlock": "front-end-development",
9+
"challengeOrder": [{ "id": "66bb6a9c2dd58b73cd759034", "title": "Build a Gradebook App" }],
10+
"helpCategory": "JavaScript"
11+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"name": "Build a Random Background Color Changer",
2+
"name": "Debug a Random Background Color Changer",
33
"blockType": "lab",
44
"isUpcomingChange": true,
55
"usesMultifileEditor": true,
66
"dashedName": "lab-random-background-color-changer",
77
"order": 206,
88
"superBlock": "front-end-development",
9-
"challengeOrder": [{ "id": "66b62d0ad68488dd76228d6c", "title": "Build a Random Background Color Changer" }],
9+
"challengeOrder": [{ "id": "66b62d0ad68488dd76228d6c", "title": "Debug a Random Background Color Changer" }],
1010
"helpCategory": "JavaScript"
1111
}
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
{
2+
"name": "Build a Teacher Chatbot",
3+
"blockType": "workshop",
4+
"isUpcomingChange": true,
5+
"usesMultifileEditor": true,
6+
"hasEditableBoundaries": true,
7+
"dashedName": "workshop-teacher-chatbot",
8+
"order": 137,
9+
"superBlock": "front-end-development",
10+
"challengeOrder": [
11+
{
12+
"id": "66b102ee0bdbad34a9f85ba0",
13+
"title": "Step 1"
14+
},
15+
{
16+
"id": "66b5928b86e907fdfbf34e56",
17+
"title": "Step 2"
18+
},
19+
{
20+
"id": "66b59829dba144ff1351220f",
21+
"title": "Step 3"
22+
},
23+
{
24+
"id": "66b59b12a745e10011158f7b",
25+
"title": "Step 4"
26+
},
27+
{
28+
"id": "66b59be6ab830800c4df9146",
29+
"title": "Step 5"
30+
},
31+
{
32+
"id": "66b6d482bbb9e12f2e5ee1ae",
33+
"title": "Step 6"
34+
},
35+
{
36+
"id": "66b6e39031393e30f2c48d0f",
37+
"title": "Step 7"
38+
},
39+
{
40+
"id": "66b6e62423e8a031d6c1f03d",
41+
"title": "Step 8"
42+
},
43+
{
44+
"id": "66b6e80d6c3f0b329c360283",
45+
"title": "Step 9"
46+
},
47+
{
48+
"id": "66b6efddeca35833cd6f0b03",
49+
"title": "Step 10"
50+
},
51+
{
52+
"id": "66b6f586767a1534f3097353",
53+
"title": "Step 11"
54+
},
55+
{
56+
"id": "66b6f80fca500635d1e8af8d",
57+
"title": "Step 12"
58+
},
59+
{
60+
"id": "66b6fdb76441c738719039fa",
61+
"title": "Step 13"
62+
},
63+
{
64+
"id": "66b6ffb42b88e33943788abf",
65+
"title": "Step 14"
66+
},
67+
{
68+
"id": "66b7049b7709ea3a9547c79d",
69+
"title": "Step 15"
70+
},
71+
{
72+
"id": "66b70b8a611cbf3bcc5c6c5f",
73+
"title": "Step 16"
74+
},
75+
{
76+
"id": "66b7137348cfb53fd3ec6c73",
77+
"title": "Step 17"
78+
},
79+
{
80+
"id": "66b7142e588c4a407a51cdb6",
81+
"title": "Step 18"
82+
}
83+
],
84+
"helpCategory": "JavaScript"
85+
}

0 commit comments

Comments
 (0)