Skip to content

Commit 322476d

Browse files
authored
Merge branch 'master' into master
2 parents 1bf1256 + 649707b commit 322476d

File tree

91 files changed

+2600
-876
lines changed

Some content is hidden

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

91 files changed

+2600
-876
lines changed

.circleci/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ jobs:
1818
- run:
1919
name: Check Prettier, ESLint, Flow
2020
command: yarn ci-check
21+
- run:
22+
name: Test Textlint
23+
command: yarn test:textlint

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,11 @@ https://github.com/reactjs/reactjs.org/blob/master/CONTRIBUTING.md
1111
If your PR references an existing issue, please add the issue number below
1212
1313
-->
14+
15+
## Progress
16+
17+
- [ ] 번역 초안 작성(Draft translation)
18+
- [ ] [공통 스타일 가이드 확인 (Check the common style guide)](https://github.com/reactjs/ko.reactjs.org/blob/master/UNIVERSAL-STYLE-GUIDE.md)
19+
- [ ] [용어 확인 (Check the term)](https://github.com/reactjs/ko.reactjs.org/wiki/Translate-Glossary)
20+
- [ ] [맞춤법 검사 (Spelling check)](http://speller.cs.pusan.ac.kr/)
21+
- [ ] 리뷰 반영 (Resolve reviews)

.textlintrc.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
filters: {
3+
comments: true,
4+
},
5+
formatterName: 'stylish',
6+
};

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ The documentation is divided into several sections with a different tone and pur
5757

5858
## Translation
5959

60-
If you are interesting in translating `reactjs.org`, please see the current translation efforts at [isreactreadyyet.com](https://www.isreactreadyyet.com).
60+
If you are interested in translating `reactjs.org`, please see the current translation efforts at [isreacttranslatedyet.com](https://www.isreacttranslatedyet.com/).
6161

6262

6363
If your language does not have a translation and you would like to create one, please follow the instructions at [reactjs.org Translations](https://github.com/reactjs/reactjs.org-translation#translating-reactjsorg).

UNIVERSAL-STYLE-GUIDE.md

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
# 공통 스타일 가이드
2+
3+
이 문서는 **모든** 언어에 적용돼야 할 규칙을 설명합니다.
4+
5+
## 제목 아이디
6+
7+
모든 제목에는 다음과 같이 아이디가 명시적으로 설정되어 있습니다.
8+
9+
```md
10+
## Try React {#try-react}
11+
```
12+
13+
**아이디는 번역하면 안 됩니다!** 이 아이디는 탐색을 위해 사용되므로 번역하면 아래처럼 외부에서 문서가 참조될 때 링크가 깨질 수 있습니다.
14+
15+
```md
16+
자세한 내용은 [시작 부분](/getting-started#try-react)을 참조해주세요.
17+
```
18+
19+
✅ 권장
20+
21+
```md
22+
## React 시도해보기 {#try-react}
23+
```
24+
25+
❌ 금지:
26+
27+
```md
28+
## React 시도해보기 {#react-시도해보기}
29+
```
30+
31+
이는 위에 있는 링크를 깨지게 만듭니다.
32+
33+
## 코드에 있는 문자
34+
35+
주석을 제외한 모든 코드는 번역하지 않고 그대로 놔둬 주세요. 선택적으로 문자열에 있는 텍스트를 수정할 수 있지만, 코드를 참조하는 문자열은 번역하지 않도록 주의해주세요.
36+
37+
예시는 다음과 같습니다.
38+
```js
39+
// Example
40+
const element = <h1>Hello, world</h1>;
41+
ReactDOM.render(element, document.getElementById('root'));
42+
```
43+
44+
✅ 권장
45+
46+
```js
47+
// 예시
48+
const element = <h1>Hello, world</h1>;
49+
ReactDOM.render(element, document.getElementById('root'));
50+
```
51+
52+
✅ 허용:
53+
54+
```js
55+
// 예시
56+
const element = <h1>안녕 세상</h1>;
57+
ReactDOM.render(element, document.getElementById('root'));
58+
```
59+
60+
❌ 금지:
61+
62+
```js
63+
// 예시
64+
const element = <h1>안녕 세상</h1>;
65+
// "root"는 HTML 엘리먼트의 아이디를 의미합니다.
66+
// 번역하지 마세요.
67+
ReactDOM.render(element, document.getElementById('뿌리'));
68+
```
69+
70+
❌ 절대 금지:
71+
72+
```js
73+
// 예시
74+
const 요소 = <h1>안녕 세상</h1>;
75+
ReactDOM.그리다(요소, 문서.아이디로부터_엘리먼트_가져오기('뿌리'));
76+
```
77+
78+
## 외부 링크
79+
80+
외부 링크가 [MDN]이나 [Wikipedia]같은 참고 문헌의 문서에 연결되어 있고 해당 문서가 자국어로 잘 번역되어 있다면 번역 문서를 링크하는 것도 고려해보세요.
81+
82+
[MDN]: https://developer.mozilla.org/en-US/
83+
[Wikipedia]: https://en.wikipedia.org/wiki/Main_Page
84+
85+
예시는 다음과 같습니다.
86+
87+
```md
88+
React elements are [immutable](https://en.wikipedia.org/wiki/Immutable_object).
89+
```
90+
91+
✅ 허용:
92+
93+
```md
94+
React 엘리먼트는 [불변객체](https://ko.wikipedia.org/wiki/불변객체)입니다.
95+
```
96+
97+
외부 링크를 대체할 만한 자국어 자료가 없다면 (Stack Overflow, YouTube 비디오 등) 영어 링크를 사용해주세요.

content/authors.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ sophiebits:
7373
steveluscher:
7474
name: Steven Luscher
7575
url: https://twitter.com/steveluscher
76+
tesseralis:
77+
name: Nat Alison
78+
url: https://twitter.com/tesseralis
7679
timer:
7780
name: Joe Haddad
7881
url: https://twitter.com/timer150

content/blog/2015-03-30-community-roundup-26.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Colin also [blogged about his experience using React Native](http://blog.scottlo
2929

3030
Spencer Ahrens and I had the great pleasure to talk about React Native on [The Changelog](https://thechangelog.com/149/) podcast. It was really fun to chat for an hour, I hope that you'll enjoy listening to it. :)
3131

32-
<audio src="http://fdlyr.co/d/changelog/cdn.5by5.tv/audio/broadcasts/changelog/2015/changelog-149.mp3" controls="controls" style="width: 100%"></audio>
32+
<audio src="https://cdn.changelog.com/uploads/podcast/149/the-changelog-149.mp3" controls="controls" style="width: 100%"></audio>
3333

3434

3535
## Hacker News {#hacker-news}

content/blog/2015-08-11-relay-technical-preview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ While React simplified the process of developing complex user-interfaces, it lef
1313

1414
Declarative data-fetching means that Relay applications specify *what* data they need, not *how* to fetch that data. Just as React uses a description of the desired UI to manage view updates, Relay uses a data description in the form of GraphQL queries. Given these descriptions, Relay coalesces queries into batches for efficiency, manages error-prone asynchronous logic, caches data for performance, and automatically updates views as data changes.
1515

16-
Relay is also component-oriented, extending the notion of a React component to include a description of what data is necessary to render it. This colocation allows developers to reason locally about their application and eliminates bugs such as under- or over-fetching data.
16+
Relay is also component-oriented, extending the notion of a React component to include a description of what data is necessary to render it. This collocation allows developers to reason locally about their application and eliminates bugs such as under- or over-fetching data.
1717

1818
Relay is in use at Facebook in production apps, and we're using it more and more because *Relay lets developers focus on their products and move fast*. It's working for us and we'd like to share it with the community.
1919

content/blog/2018-09-10-introducing-the-react-profiler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ It also shows that each time it rendered, it was the most "expensive" component
140140

141141
To view this chart, either double-click on a component _or_ select a component and click on the blue bar chart icon in the right detail pane.
142142
You can return to the previous chart by clicking the "x" button in the right detail pane.
143-
You can aso double click on a particular bar to view more information about that commit.
143+
You can also double click on a particular bar to view more information about that commit.
144144

145145
![How to view all renders for a specific component](../images/blog/introducing-the-react-profiler/see-all-commits-for-a-fiber.gif)
146146

content/blog/2018-11-27-react-16-roadmap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function Example() {
8787
}
8888
```
8989

90-
Hooks [introduction](/docs/hooks-intro.html) and [overview](/docs/hooks-overview.html) are good places to start. Watch [these talks](https://www.youtube.com/watch?v=V-QO-KO90iQ) for a video introduction and a deep dive. The [FAQ](/docs/hooks-faq.html) should answer most of your further questions. To learn more about the motivation behind Hooks, you can read [this article](https://medium.com/@dan_abramov/making-sense-of-react-hooks-fdbde8803889). Some of the rationale for the API design of Hooks is explained in [this RFC thread reply](https://github.com/reactjs/rfcs/pull/68#issuecomment-439314884).
90+
Hooks [introduction](/docs/hooks-intro.html) and [Hook 개요](/docs/hooks-overview.html) are good places to start. Watch [these talks](https://www.youtube.com/watch?v=V-QO-KO90iQ) for a video introduction and a deep dive. The [FAQ](/docs/hooks-faq.html) should answer most of your further questions. To learn more about the motivation behind Hooks, you can read [this article](https://medium.com/@dan_abramov/making-sense-of-react-hooks-fdbde8803889). Some of the rationale for the API design of Hooks is explained in [this RFC thread reply](https://github.com/reactjs/rfcs/pull/68#issuecomment-439314884).
9191

9292
We have been dogfooding Hooks at Facebook since September. We don't expect major bugs in the implementation. Hooks are only available in the 16.7 alpha versions of React. Some of their API is expected to change in the final version (see the end of [this comment](https://github.com/reactjs/rfcs/pull/68#issuecomment-439314884) for details). It is possible that the minor release with Hooks might not be React 16.7.
9393

0 commit comments

Comments
 (0)