Merge branch 'master' into test-utils

Author: takanorip

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,7 +6,7 @@ Thank you for the PR! Contributors like you keep React awesome!
 
 Please see the Contribution Guide for guidelines:
 
-https://github.com/reactjs/reactjs.org/blob/master/CONTRIBUTING.md
+https://github.com/reactjs/ja.reactjs.org/blob/master/CONTRIBUTING.md
 
 If your PR references an existing issue, please add the issue number below
 

.textlintrc

@@ -3,7 +3,9 @@
     "preset-jtf-style": {
       "1.2.1.句点(。)と読点(、)": false,
       "1.2.2.ピリオド(.)とカンマ(,)": false,
-      "3.1.1.全角文字と半角文字の間": false
+      "3.1.1.全角文字と半角文字の間": false,
+      "4.2.1.感嘆符(！)": false,
+      "4.2.2.疑問符(？)": false
     }
   }
 }

README.md

@@ -1,6 +1,6 @@
-# reactjs.org
+# ja.reactjs.org
 
-This repo contains the source code and documentation powering [reactjs.org](https://reactjs.org/).
+This repo contains the source code and documentation powering [ja.reactjs.org](https://ja.reactjs.org/).
 
 ## Getting started
 
@@ -10,11 +10,11 @@ This repo contains the source code and documentation powering [reactjs.org](http
 1. Node: any 8.x version starting with 8.4.0 or greater
 1. Yarn: See [Yarn website for installation instructions](https://yarnpkg.com/lang/en/docs/install/)
 1. A fork of the repo (for any contributions)
-1. A clone of the [reactjs.org repo](https://github.com/reactjs/reactjs.org) on your local machine
+1. A clone of the [ja.reactjs.org repo](https://github.com/reactjs/ja.reactjs.org) on your local machine
 
 ### Installation
 
-1. `cd reactjs.org` to go into the project root
+1. `cd ja.reactjs.org` to go into the project root
 1. `yarn` to install the website's npm dependencies
 
 ### Running locally
@@ -26,11 +26,11 @@ This repo contains the source code and documentation powering [reactjs.org](http
 
 ### Guidelines
 
-The documentation is divided into several sections with a different tone and purpose. If you plan to write more than a few sentences, you might find it helpful to get familiar with the [contributing guidelines](https://github.com/reactjs/reactjs.org/blob/master/CONTRIBUTING.md#guidelines-for-text) for the appropriate sections.
+The documentation is divided into several sections with a different tone and purpose. If you plan to write more than a few sentences, you might find it helpful to get familiar with the [contributing guidelines](https://github.com/reactjs/ja.reactjs.org/blob/master/CONTRIBUTING.md#guidelines-for-text) for the appropriate sections.
 
 ### Create a branch
 
-1. `git checkout master` from any folder in your local `reactjs.org` repository
+1. `git checkout master` from any folder in your local `ja.reactjs.org` repository
 1. `git pull origin master` to ensure you have the latest main code
 1. `git checkout -b the-name-of-my-branch` (replacing `the-name-of-my-branch` with a suitable name) to create a branch
 
@@ -51,15 +51,16 @@ The documentation is divided into several sections with a different tone and pur
 
 1. `git add -A && git commit -m "My message"` (replacing `My message` with a commit message, such as `Fixed header logo on Android`) to stage and commit your changes
 1. `git push my-fork-name the-name-of-my-branch`
-1. Go to the [reactjs.org repo](https://github.com/reactjs/reactjs.org) and you should see recently pushed branches.
+1. Go to the [ja.reactjs.org repo](https://github.com/reactjs/ja.reactjs.org) and you should see recently pushed branches.
 1. Follow GitHub's instructions.
 1. If possible, include screenshots of visual changes. A Netlify build will also be automatically created once you make your PR so other people can see your change.
 
 ## Translation
 
-If you are interesting in translating `reactjs.org`, please join the Crowdin.
+If you are interested in translating `reactjs.org`, please see the current translation efforts at [isreacttranslatedyet.com](https://www.isreacttranslatedyet.com/).
 
-* [Crowdin - React](https://crowdin.com/project/react)
+
+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).
 
 ## Troubleshooting
 

TRANSLATION.md

@@ -18,11 +18,11 @@ README.md にある通りですが、さらなる簡略版は以下の通りで
 
 ## スタイルの自動チェック
 
-`yarn lint:text` で、基本的な文法（全角英数を使わない、句読点の統一）チェックが走ります。
-コミット・PR作成の前にはエラーが出ないようにしてください。
+`yarn lint:text` で、基本的な文法（全角英数を使わない、句読点の統一）チェックが走ります。コミット・PR作成の前にはエラーが出ないようにしてください。
 
 ## 全般的なこと
 
+- 見出しの行末にある `{#try-react}` のようなものは見出しアンカーなので、翻訳しない。（[参考](https://github.com/reactjs/reactjs.org/issues/1608)）
 - 「です」「ます」調で書く（箇条書きの中など特殊な文脈を除く）。
 - カッコは内部に和文を含む場合は全角、英数字のみ含む場合（特に原文の単語を示す場合など）は半角とする。
 - 半角開きカッコの前と半角閉じカッコの後には半角スペースを入れる。ただし別の約物と直接隣接している場合は不要。
@@ -39,17 +39,15 @@ README.md にある通りですが、さらなる簡略版は以下の通りで
 - 和文内で文の一部として使う記号・約物類は原則全角とする。`「`, `」`, `、`, `。`, `：`, `！`, `？`, `／` などが該当する。
 - 用例の直前の行で行末に現れるコロンについても全角とする。ただしこれは毎回使うべきというわけではない。文が途切れる場合は `：` が必要だが、不自然にならないのであれば、句点 `。` で終えても構わない。
 - 英文から飛躍した意訳や表現の追加・改変を行わない。一方で分かりづらくなるような逐語訳もしない。
-- ひとまず、リンク先の URL は変えない。(MDN などについては後でまとめて日本語版へのリンクに置換するかもしれませんが、まとめてやる方が間違いも少ないと思われるので、気にしないでいいです)
-- `#` で始まる見出しを翻訳すると現時点では自動生成されるアンカー (`<a id="#...">`) が変わってしまい、ページ内の見出しへのリンクが壊れてしまうが、これもひとまず気にしないでおく。（これについては [こちら](https://github.com/reactjs/reactjs.org/issues/1608) で検討中です）
-- 和文に対する `*強調*`（`<em>強調</em>` に変換される）がうまく表示されない（日本語フォントに斜体が適用されないため）が、ひとまず原文通りに強調を残す形で翻訳する。（恐らく CSS を弄って解決できるはず）
+- リンク先の URL は変えない。(MDN などについては後でまとめて日本語版へのリンクに置換するかもしれませんが、まとめてやる方が間違いも少ないと思われるので、気にしないでいいです)
+- コードサンプルについては原則翻訳しなくてよい。特に例の中の `banana` とか `Canada` のようなものまで翻訳する必要はない。ただしコード中のコメントに、（本来は本文に書いたほうがいいレベルの）大量の説明があり、翻訳しないと理解を妨げる危険性が高い場合は翻訳してもよい。
+- `*強調*` や `**強調**` （それぞれ `em` と `strong` に変換される）は、極力原文での使用法を保つ。（環境によって日本語フォントは斜体で表示できないため、`em` に日本語が含まれる場合は自動的に太字に変換されるようになっています：[参考](https://github.com/reactjs/ja.reactjs.org/issues/22)）
 - ごく一般的な日本語表記に関して困ったら概ね公用文作成の要領などに準ずるが、カタカナ語の末尾の長音符については JIS Z 8301 の推奨に従う。そこまで目くじらを立てなくてよいが、基本は要するに以下の通り。
-  - 3音以上の場合のみ、片仮名語の末尾の長音符を原則省略。「エコー」「マナー」「ハンドラ」「プロパティ」
+  - 3 音以上の場合のみ、片仮名語の末尾の長音符を原則省略。「エコー」「マナー」「ハンドラ」「プロパティ」
   - ただし「レンダー」だけは例外で、常に「レンダー」と伸ばす。
   - 補助動詞（～てください・～てみる・～ておく・～てくる・～てしまう、など）はかな書き。
   - 語彙化した副詞はなるべくかな書き。「ついに」「まれに」「ときに」「ようやく」「おそらく」など。
 
 ## 用語の統一
 
-作成中です。
-
-ひとまず https://github.com/reactjs/ja.reactjs.org/issues/3 を参照してください。
+Wiki の[訳語の統一](https://github.com/reactjs/ja.reactjs.org/wiki/%E8%A8%B3%E8%AA%9E%E3%81%AE%E7%B5%B1%E4%B8%80)を参照。

content/blog/2013-06-05-why-react.md

@@ -6,13 +6,13 @@ author: [petehunt]
 There are a lot of JavaScript MVC frameworks out there. Why did we build React
 and why would you want to use it?
 
-## React isn't an MVC framework.
+## React isn't an MVC framework. {#react-isnt-an-mvc-framework}
 
 React is a library for building composable user interfaces. It encourages
 the creation of reusable UI components which present data that changes over
 time.
 
-## React doesn't use templates.
+## React doesn't use templates. {#react-doesnt-use-templates}
 
 Traditionally, web application UIs are built using templates or HTML directives.
 These templates dictate the full set of abstractions that you are allowed to use
@@ -33,7 +33,7 @@ to render views, which we see as an advantage over templates for a few reasons:
 We've also created [JSX](/docs/jsx-in-depth.html), an optional syntax
 extension, in case you prefer the readability of HTML to raw JavaScript.
 
-## Reactive updates are dead simple.
+## Reactive updates are dead simple. {#reactive-updates-are-dead-simple}
 
 React really shines when your data changes over time.
 
@@ -63,7 +63,7 @@ Because this re-render is so fast (around 1ms for TodoMVC), the developer
 doesn't need to explicitly specify data bindings. We've found this approach
 makes it easier to build apps.
 
-## HTML is just the beginning.
+## HTML is just the beginning. {#html-is-just-the-beginning}
 
 Because React has its own lightweight representation of the document, we can do
 some pretty cool things with it:

content/blog/2013-06-12-community-roundup.md

@@ -5,7 +5,7 @@ author: [vjeux]
 
 React was open sourced two weeks ago and it's time for a little round-up of what has been going on.
 
-## Khan Academy Question Editor
+## Khan Academy Question Editor {#khan-academy-question-editor}
 
 It looks like [Sophie Alpert](http://sophiebits.com/) is the first person outside of Facebook and Instagram to push React code to production. We are very grateful for her contributions in form of pull requests, bug reports and presence on IRC ([#reactjs on Freenode](irc://chat.freenode.net/reactjs)). Sophie wrote about her experience using React:
 
@@ -16,7 +16,7 @@ It looks like [Sophie Alpert](http://sophiebits.com/) is the first person outsid
 >
 > [Read the full post...](http://sophiebits.com/2013/06/09/using-react-to-speed-up-khan-academy.html)
 
-## Pimp my Backbone.View (by replacing it with React)
+## Pimp my Backbone.View (by replacing it with React) {#pimp-my-backboneview-by-replacing-it-with-react}
 
 [Paul Seiffert](https://blog.mayflower.de/) wrote a blog post that explains how to integrate React into Backbone applications.
 
@@ -28,15 +28,15 @@ It looks like [Sophie Alpert](http://sophiebits.com/) is the first person outsid
 >
 > [Read the full post...](https://blog.mayflower.de/3937-Backbone-React.html)
 
-## Using facebook's React with require.js
+## Using facebook's React with require.js {#using-facebooks-react-with-requirejs}
 
 [Mario Mueller](http://blog.xenji.com/) wrote a menu component in React and was able to easily integrate it with require.js, EventEmitter2 and bower.
 
 > I recently stumbled upon facebook's React library, which is a JavaScript library for building reusable frontend components. Even if this lib is only at version 0.3.x it behaves very stable, it is fast and is fun to code. I'm a big fan of require.js, so I tried to use React within the require.js eco system. It was not as hard as expected and here are some examples and some thoughts about it.
 >
 > [Read the full post...](http://blog.xenji.com/2013/06/facebooks-react-require-js.html)
 
-## Origins of React
+## Origins of React {#origins-of-react}
 
 [Pete Hunt](http://www.petehunt.net/blog/) explained what differentiates React from other JavaScript libraries in [a previous blog post](/blog/2013/06/05/why-react.html). [Lee Byron](http://leebyron.com/) gives another perspective on Quora:
 

content/blog/2013-06-19-community-roundup-2.md

@@ -5,7 +5,7 @@ author: [vjeux]
 
 Since the launch we have received a lot of feedback and are actively working on React 0.4. In the meantime, here are the highlights of this week.
 
-## Some quick thoughts on React
+## Some quick thoughts on React {#some-quick-thoughts-on-react}
 
 [Andrew Greig](http://www.andrewgreig.com/) made a blog post that gives a high level description of what React is.
 
@@ -19,7 +19,7 @@ Since the launch we have received a lot of feedback and are actively working on
 >
 > [Read the full post...](http://www.andrewgreig.com/637/)
 
-## React and Socket.IO Chat Application
+## React and Socket.IO Chat Application {#react-and-socketio-chat-application}
 
 [Danial Khosravi](https://danialk.github.io/) made a real-time chat application that interacts with the back-end using Socket.IO.
 
@@ -28,7 +28,7 @@ Since the launch we have received a lot of feedback and are actively working on
 >
 > [Read the full post...](https://danialk.github.io/blog/2013/06/16/reactjs-and-socket-dot-io-chat-application/)
 
-## React and Other Frameworks
+## React and Other Frameworks {#react-and-other-frameworks}
 
 [Pete Hunt](http://www.petehunt.net/blog/) wrote an answer on Quora comparing React and Angular directives. At the end, he explains how you can make an Angular directive that is in fact being rendered with React.
 
@@ -40,7 +40,7 @@ Since the launch we have received a lot of feedback and are actively working on
 
 In the same vein, [Markov Twain](https://twitter.com/markov_twain/status/345702941845499906) re-implemented the examples on the front-page [with Ember](http://jsbin.com/azihiw/2/edit) and [Vlad Yazhbin](https://twitter.com/vla) re-implemented the tutorial [with Angular](http://jsfiddle.net/vla/Cdrse/).
 
-## Web Components: React & x-tags
+## Web Components: React & x-tags {#web-components-react--x-tags}
 
 Mozilla and Google are actively working on Web Components. [Vjeux](http://blog.vjeux.com/) wrote a proof of concept that shows how to implement them using React.
 
@@ -49,7 +49,7 @@ Mozilla and Google are actively working on Web Components. [Vjeux](http://blog.v
 >
 > [Read the full post...](http://blog.vjeux.com/2013/javascript/custom-components-react-x-tags.html)
 
-## React TodoMVC Example
+## React TodoMVC Example {#react-todomvc-example}
 
 [TodoMVC.com](http://todomvc.com/) is a website that collects various implementations of the same basic Todo app. [Pete Hunt](http://www.petehunt.net/blog/) wrote an idiomatic React version.
 
@@ -60,7 +60,7 @@ Mozilla and Google are actively working on Web Components. [Vjeux](http://blog.v
 >
 > [Read the source code...](https://github.com/tastejs/todomvc/tree/gh-pages/labs/architecture-examples/react)
 
-## JSX is not HTML
+## JSX is not HTML {#jsx-is-not-html}
 
 Many of you pointed out differences between JSX and HTML. In order to clear up some confusion, we have added some documentation that covers the four main differences:
 

content/blog/2013-06-21-react-v0-3-3.md

@@ -6,18 +6,18 @@ author: [zpao]
 We have a ton of great stuff coming in v0.4, but in the meantime we're releasing v0.3.3. This release addresses some small issues people were having and simplifies our tools to make them easier to use.
 
 
-## react-tools
+## react-tools {#react-tools}
 
 * Upgrade Commoner so `require` statements are no longer relativized when passing through the transformer. This was a feature needed when building React, but doesn't translate well for other consumers of `bin/jsx`.
 * Upgraded our dependencies on Commoner and Recast so they use a different directory for their cache.
 * Freeze our esprima dependency.
 
 
-## React
+## React {#react}
 
 * Allow reusing the same DOM node to render different components. e.g. `React.renderComponent(<div/>, domNode); React.renderComponent(<span/>, domNode);` will work now.
 
 
-## JSXTransformer
+## JSXTransformer {#jsxtransformer}
 
 * Improved the in-browser transformer so that transformed scripts will execute in the expected scope. The allows components to be defined and used from separate files.

content/blog/2013-06-27-community-roundup-3.md

@@ -5,7 +5,7 @@ author: [vjeux]
 
 The highlight of this week is that an interaction-heavy app has been ported to React. React components are solving issues they had with nested views.
 
-## Moving From Backbone To React
+## Moving From Backbone To React {#moving-from-backbone-to-react}
 
 [Clay Allsopp](https://twitter.com/clayallsopp) successfully ported [Propeller](http://usepropeller.com/blog/posts/from-backbone-to-react/), a fairly big, interaction-heavy JavaScript app, to React.
 
@@ -17,7 +17,7 @@ The highlight of this week is that an interaction-heavy app has been ported to R
 >
 > [Read the full post...](http://usepropeller.com/blog/posts/from-backbone-to-react/)
 
-## Grunt Task for JSX
+## Grunt Task for JSX {#grunt-task-for-jsx}
 
 [Eric Clemmons](https://ericclemmons.github.io/) wrote a task for [Grunt](http://gruntjs.com/) that applies the JSX transformation to your JavaScript files. It also works with [Browserify](http://browserify.org/) if you want all your files to be concatenated and minified together.
 
@@ -45,7 +45,7 @@ The highlight of this week is that an interaction-heavy app has been ported to R
 >
 > [Check out the project ...](https://github.com/ericclemmons/grunt-react)
 
-## Backbone/Handlebars Nested Views
+## Backbone/Handlebars Nested Views {#backbonehandlebars-nested-views}
 
 [Joel Burget](http://joelburget.com/) wrote a blog post talking about the way we would write React-like components in Backbone and Handlebars.
 
@@ -57,13 +57,13 @@ The highlight of this week is that an interaction-heavy app has been ported to R
 >
 > [Read the full post...](http://joelburget.com/react/)
 
-## JSRomandie Meetup
+## JSRomandie Meetup {#jsromandie-meetup}
 
 [Renault John Lecoultre](https://twitter.com/renajohn/) from [BugBuster](http://www.bugbuster.com) did a React introduction talk at a JS meetup called [JS Romandie](https://twitter.com/jsromandie) last week.
 
 <script async class="speakerdeck-embed" data-id="888a9d50c01b01300df36658d0894ac1" data-ratio="1.33333333333333" src="//speakerdeck.com/assets/embed.js"></script>
 
-## CoffeeScript integration
+## CoffeeScript integration {#coffeescript-integration}
 
 [Vjeux](http://blog.vjeux.com/) used the fact that JSX is just a syntactic sugar on-top of regular JS to rewrite the React front-page examples in CoffeeScript.
 
@@ -81,7 +81,7 @@ The highlight of this week is that an interaction-heavy app has been ported to R
 >
 > [Read the full post...](http://blog.vjeux.com/2013/javascript/react-coffeescript.html)
 
-## Tutorial in Plain JavaScript
+## Tutorial in Plain JavaScript {#tutorial-in-plain-javascript}
 
 We've seen a lot of people comparing React with various frameworks. [Ricardo Tomasi](http://ricardo.cc/) decided to re-implement the tutorial without any framework, just plain JavaScript.