Skip to content

Commit 205d26e

Browse files
Merge branch 'ptbr-translation' of https://github.com/FrancisBernard34/fullstack-hy2020.github.io into ptbr-translation
2 parents 4c7dc4b + 9cbc31f commit 205d26e

Some content is hidden

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

56 files changed

+1071
-345
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@
1212
1. Prettify your code with `npm run format`
1313
2. Create a new branch for your changes
1414
3. Create the PR from that branch to the source branch
15+
16+
# Contributing with translations
17+
When translation of a whole new part is completed, remember to update the file src/utils/translationProgress.json

README.md

Lines changed: 110 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,113 @@
1-
# Full stack open
1+
# This is the Brazilian Portuguese Translation for FullStackOpen.
22

3-
Despite the repo name this IS the current course repository
3+
# Status: 28,78%
44

5-
<https://fullstackopen.com/>
5+
## part0 - Fundamentals of Web apps
6+
- [x] part0 (intro)
7+
- [x] part0a
8+
- [x] part0b
69

7-
<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">
8-
<img alt="Creative Commons -lisenssi" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png"
9-
/>
10-
</a>
11-
<br/> Materiaali on lisensoitu
12-
<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons BY-NC-SA 3.0 -lisenssillä</a>
10+
## part1 - Introduction to React
11+
- [x] part1 (intro)
12+
- [x] part1a
13+
- [x] part1b
14+
- [x] part1c
15+
- [x] part1d
16+
17+
## part2- Communicating with server
18+
- [x] part2 (intro)
19+
- [x] part2a
20+
- [x] part2b
21+
- [x] part2c
22+
- [x] part2d
23+
- [x] part2e
24+
25+
## part3 - Programming a server with NodeJS and Express
26+
- [x] part3 (intro)
27+
- [x] part3a
28+
- [x] part3b
29+
- [x] part3c
30+
- [x] part3d
31+
32+
## part4 - Testing Express servers, user administration
33+
- [x] part4 (intro)
34+
- [x] part4a
35+
- [ ] part4b
36+
- [x] part4c
37+
- [ ] part4d
38+
39+
## part5 - Testing React apps
40+
- [ ] part5 (intro)
41+
- [ ] part5a
42+
- [ ] part5b
43+
- [ ] part5c
44+
- [ ] part5d
45+
46+
## part6 - Advanced state management
47+
- [ ] part6 (intro)
48+
- [ ] part6a
49+
- [ ] part6b
50+
- [ ] part6c
51+
- [ ] part6d
52+
- [ ] part6e
53+
54+
## part7 - React router, custom hooks, styling app with CSS and webpack
55+
- [ ] part7 (intro)
56+
- [ ] part7a
57+
- [ ] part7b
58+
- [ ] part7c
59+
- [ ] part7d
60+
- [ ] part7e
61+
- [ ] part7f
62+
63+
## part8 - GraphQL
64+
- [ ] part8 (intro)
65+
- [ ] part8a
66+
- [ ] part8b
67+
- [ ] part8c
68+
- [ ] part8d
69+
70+
## part9 - TypeScript
71+
- [ ] part9 (intro)
72+
- [ ] part9a
73+
- [ ] part9b
74+
- [ ] part9c
75+
- [ ] part9d
76+
- [ ] part9e
77+
- [ ] part9f
78+
79+
## part10 - React Native
80+
- [ ] part10 (intro)
81+
- [ ] part10a
82+
- [ ] part10b
83+
- [ ] part10c
84+
- [ ] part10d
85+
86+
## part11 - CI/CD
87+
- [ ] part11 (intro)
88+
- [ ] part11a
89+
- [ ] part11b
90+
- [ ] part11c
91+
- [ ] part11d
92+
- [ ] part11e
93+
94+
## part12 - Containers
95+
- [ ] part12 (intro)
96+
- [ ] part12a
97+
- [ ] part12b
98+
- [ ] part12c
99+
100+
## part13 - Using relational databases
101+
- [ ] part13 (intro)
102+
- [ ] part13a
103+
- [ ] part13b
104+
- [ ] part13c
105+
106+
## Currently, these are the collaborators:
107+
108+
1. @CassivsGabriellis
109+
2. @mayconblopes
110+
3. @FrancisBernard34
111+
4. @jccallves
112+
113+
🇧🇷 **Keep in touch to join us!** 🇧🇷

src/components/PartBanner/PartBanner.js

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import translationProgress from '../../utils/translationProgress'
12
import { Banner } from '../Banner/Banner';
23
import { ContentLiftup } from '../ContentLiftup/ContentLiftup';
34
import React from 'react';
@@ -92,14 +93,8 @@ export const PartBanner = ({ lang }) => {
9293
const parts = Object.keys(navigation[lang]);
9394

9495
function partName(lang) {
95-
return lang === 'fi' ? 'Osa' : lang==='ptbr' ? 'Parte' : 'Part'
96-
// if (lang === 'fi') {
97-
// return 'Osa'
98-
// } else if (lang === 'ptbr') {
99-
// return 'Parte'
100-
// } else {
101-
// return 'Part'
102-
}
96+
return lang === 'fi' ? 'Osa' : lang === 'ptbr' ? 'Parte' : 'Part';
97+
}
10398

10499
return (
105100
<Banner
@@ -108,9 +103,10 @@ export const PartBanner = ({ lang }) => {
108103
>
109104
<div className="container spacing flex-fix-aligning col-7--mobile">
110105
{parts.map(part => {
111-
const partNames =
112-
partNameTranslations[lang] || partNameTranslations.en;
106+
const partNames =
107+
partNameTranslations[lang] || partNameTranslations.en
113108

109+
const summary = translationProgress[lang] < part ? partNames[part] + ' (english only)' : partNames[part]
114110
return (
115111
<ContentLiftup
116112
key={partNames[part]}
@@ -120,9 +116,8 @@ export const PartBanner = ({ lang }) => {
120116
alt: partNames[part],
121117
}}
122118
hoverImageSrc={require(`../../images/thumbnails/part-${part}_ovr.svg`)}
123-
// name={`${lang === 'fi' ? 'Osa' : 'Part'} ${part}`}
124119
name={`${partName(lang)} ${part}`}
125-
summary={partNames[part]}
120+
summary={summary}
126121
path={getPartTranslationPath(lang, part)}
127122
/>
128123
);

src/components/PrevNext/PrevNext.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import './PrevNext.scss';
22

3+
import translationProgress from '../../utils/translationProgress'
34
import Element from '../Element/Element';
45
import { Link } from 'gatsby';
56
import { PropTypes } from 'prop-types';
@@ -106,7 +107,9 @@ const PrevNext = ({ part, letter, lang }) => {
106107

107108
const getNext = () => {
108109
if (!letter && hasPart(part + 1, lang)) {
109-
console.log('a', hasPart(part + 1, lang))
110+
if (translationProgress[lang] <= part) {
111+
lang = 'en'
112+
}
110113
return (
111114
<Link
112115
to={`${langUrl(lang)}${part + 1}`}

0 commit comments

Comments
 (0)