Merge branch 'master' into develop

potato4d · web-flow · commit 8e1862e081c1 · 2019-02-27T16:13:00.000+09:00
diff --git a/content/blog/2019-02-23-is-react-translated-yet.md b/content/blog/2019-02-23-is-react-translated-yet.md
@@ -69,7 +69,7 @@ Finally, I would like to extend my gratitude to the following people and groups:
 
  * All the translation maintainers and contributors who are helping translate React to more than thirty languages.
  * The [Vue.js Japan User Group](https://github.com/vuejs-jp) for initiating the idea of having bot-managed translations, and especially [Hanatani Takuma](https://github.com/potato4d) for helping us understand their approach and helping maintain the Japanese translation.
- * [Soichiro Miki](https://github.com/smikitki) for many [contributions](https://github.com/reactjs/reactjs.org/pull/1636) and thoughtful comments on the overall translation process, as well as for maintaining the Japanese translation.
+ * [Soichiro Miki](https://github.com/smikitky) for many [contributions](https://github.com/reactjs/reactjs.org/pull/1636) and thoughtful comments on the overall translation process, as well as for maintaining the Japanese translation.
  * [Eric Nakagawa](https://github.com/ericnakagawa) for managing our previous translation process.
  * [Brian Vaughn](https://github.com/bvaughn) for setting up the [languages page](/languages) and managing all the subdomains.
 
diff --git a/content/docs/nav.yml b/content/docs/nav.yml
@@ -3,86 +3,86 @@
     - id: getting-started
       title: Getting Started
     - id: add-react-to-a-website
-      title: Add React to a Website
+      title: 既存のウェブサイトに React を追加する
     - id: create-a-new-react-app
-      title: Create a New React App
+      title: 新しい React アプリを作る
     - id: cdn-links
-      title: CDN Links
+      title: CDN リンク
 - title: Main Concepts
   isOrdered: true
   items:
     - id: hello-world
       title: Hello World
     - id: introducing-jsx
-      title: Introducing JSX
+      title: JSX の導入
     - id: rendering-elements
-      title: Rendering Elements
+      title: 要素のレンダー
     - id: components-and-props
-      title: Components and Props
+      title: コンポーネントと props
     - id: state-and-lifecycle
-      title: State and Lifecycle
+      title: state とライフサイクル
     - id: handling-events
-      title: Handling Events
+      title: イベント処理
     - id: conditional-rendering
-      title: Conditional Rendering
+      title: 条件付きレンダー
     - id: lists-and-keys
-      title: Lists and Keys
+      title: リストと key
     - id: forms
-      title: Forms
+      title: フォーム
     - id: lifting-state-up
-      title: Lifting State Up
+      title: state のリフトアップ
     - id: composition-vs-inheritance
-      title: Composition vs Inheritance
+      title: コンポジション vs 継承
     - id: thinking-in-react
-      title: Thinking In React
+      title: React の流儀
 - title: Advanced Guides
   items:
     - id: accessibility
-      title: Accessibility
+      title: アクセシビリティ
     - id: code-splitting
-      title: Code-Splitting
+      title: コード分割
     - id: context
-      title: Context
+      title: コンテクスト
     - id: error-boundaries
       title: Error Boundaries
     - id: forwarding-refs
-      title: Forwarding Refs
+      title: ref のフォワーディング
     - id: fragments
-      title: Fragments
+      title: フラグメント
     - id: higher-order-components
-      title: Higher-Order Components
+      title: 高階 (Higher-Order) コンポーネント
     - id: integrating-with-other-libraries
-      title: Integrating with Other Libraries
+      title: 他のライブラリとのインテグレーション
     - id: jsx-in-depth
-      title: JSX In Depth
+      title: JSX を深く理解する
     - id: optimizing-performance
       title: Optimizing Performance
     - id: portals
-      title: Portals
+      title: ポータル
     - id: react-without-es6
-      title: React Without ES6
+      title: ES6 なしで React を使う
     - id: react-without-jsx
-      title: React Without JSX
+      title: JSX なしで React を使う
     - id: reconciliation
-      title: Reconciliation
+      title: 差分検出処理
     - id: refs-and-the-dom
-      title: Refs and the DOM
+      title: Ref と DOM
     - id: render-props
-      title: Render Props
+      title: レンダープロップ
     - id: static-type-checking
       title: Static Type Checking
     - id: strict-mode
-      title: Strict Mode
+      title: strict モード
     - id: typechecking-with-proptypes
       title: Typechecking With PropTypes
     - id: uncontrolled-components
-      title: Uncontrolled Components
+      title: 非制御コンポーネント
     - id: web-components
       title: Web Components
 - title: API Reference
   items:
     - id: react-api
-      title: React
+      title: React の最上位 API
       subitems:
         - id: react-component
           title: React.Component
@@ -91,34 +91,34 @@
     - id: react-dom-server
       title: ReactDOMServer
     - id: dom-elements
-      title: DOM Elements
+      title: DOM 要素
     - id: events
-      title: SyntheticEvent
+      title: 合成イベント (SyntheticEvent)
     - id: test-utils
-      title: Test Utilities
+      title: テストユーティリティ
     - id: shallow-renderer
       title: Shallow Renderer
     - id: test-renderer
       title: Test Renderer
     - id: javascript-environment-requirements
-      title: JS Environment Requirements
+      title: JavaScript 環境の要件
     - id: glossary
-      title: Glossary
+      title: React 用語集
 - title: Hooks (New)
   isOrdered: true
   items:
       - id: hooks-intro
-        title: Introducing Hooks
+        title: フックの導入
       - id: hooks-overview
-        title: Hooks at a Glance
+        title: フック早わかり
       - id: hooks-state
-        title: Using the State Hook
+        title: ステートフックの利用法
       - id: hooks-effect
-        title: Using the Effect Hook
+        title: 副作用フックの利用法
       - id: hooks-rules
-        title: Rules of Hooks
+        title: フックのルール
       - id: hooks-custom
-        title: Building Your Own Hooks
+        title: カスタムフックの作成
       - id: hooks-reference
         title: Hooks API Reference
       - id: hooks-faq
@@ -136,18 +136,18 @@
 - title: FAQ
   items:
     - id: faq-ajax
-      title: AJAX and APIs
+      title: AJAX と API
     - id: faq-build
-      title: Babel, JSX, and Build Steps
+      title: Babel、JSX、ビルドステップ
     - id: faq-functions
-      title: Passing Functions to Components
+      title: コンポーネントに関数を渡す
     - id: faq-state
-      title: Component State
+      title: コンポーネントの state
     - id: faq-styling
-      title: Styling and CSS
+      title: CSS とスタイルの使用
     - id: faq-structure
-      title: File Structure
+      title: ファイル構成
     - id: faq-versioning
-      title: Versioning Policy
+      title: バージョニングポリシー
     - id: faq-internals
-      title: Virtual DOM and Internals
+      title: 仮想 DOM と内部処理
diff --git a/src/components/CodeEditor/CodeEditor.js b/src/components/CodeEditor/CodeEditor.js
@@ -43,7 +43,7 @@ class CodeEditor extends Component {
   }
 
   render() {
-    const {children, containerNodeID} = this.props;
+    const {containerNodeID} = this.props;
     const {
       compiledES6,
       code,
diff --git a/src/components/CodeExample/CodeExample.js b/src/components/CodeExample/CodeExample.js
@@ -41,7 +41,7 @@ class CodeExample extends Component {
 
               '& h3': {
                 color: colors.dark,
-                maxWidth: '11em',
+                marginRight: 40, // patched in ja.reactjs.org
                 paddingTop: 0,
               },
 
diff --git a/src/components/LayoutFooter/Footer.js b/src/components/LayoutFooter/Footer.js
@@ -60,7 +60,7 @@ const Footer = ({layoutHasSidebar = false}: {layoutHasSidebar: boolean}) => (
             },
           }}>
           <FooterNav layoutHasSidebar={layoutHasSidebar}>
-            <MetaTitle onDark={true}>Docs</MetaTitle>
+            <MetaTitle onDark={true}>ドキュメント</MetaTitle>
             {sectionListDocs.map(section => {
               const defaultItem = section.items[0];
               return (
@@ -73,7 +73,7 @@ const Footer = ({layoutHasSidebar = false}: {layoutHasSidebar: boolean}) => (
             })}
           </FooterNav>
           <FooterNav layoutHasSidebar={layoutHasSidebar}>
-            <MetaTitle onDark={true}>Channels</MetaTitle>
+            <MetaTitle onDark={true}>チャンネル</MetaTitle>
             <ExternalFooterLink
               href="https://github.com/facebook/react"
               target="_blank"
@@ -118,7 +118,7 @@ const Footer = ({layoutHasSidebar = false}: {layoutHasSidebar: boolean}) => (
             </ExternalFooterLink>
           </FooterNav>
           <FooterNav layoutHasSidebar={layoutHasSidebar}>
-            <MetaTitle onDark={true}>Community</MetaTitle>
+            <MetaTitle onDark={true}>コミュニティ</MetaTitle>
             {sectionListCommunity.map(section => (
               <FooterLink
                 to={`/community/${section.items[0].id}.html`}
@@ -128,12 +128,10 @@ const Footer = ({layoutHasSidebar = false}: {layoutHasSidebar: boolean}) => (
             ))}
           </FooterNav>
           <FooterNav layoutHasSidebar={layoutHasSidebar}>
-            <MetaTitle onDark={true}>More</MetaTitle>
-            <FooterLink to="/tutorial/tutorial.html">Tutorial</FooterLink>
+            <MetaTitle onDark={true}>その他</MetaTitle>
+            <FooterLink to="/tutorial/tutorial.html">チュートリアル</FooterLink>
             <FooterLink to="/blog/">Blog</FooterLink>
-            <FooterLink to="/acknowledgements.html">
-              Acknowledgements
-            </FooterLink>
+            <FooterLink to="/acknowledgements.html">謝辞</FooterLink>
             <ExternalFooterLink
               href="https://facebook.github.io/react-native/"
               target="_blank"
diff --git a/src/pages/index.js b/src/pages/index.js
@@ -133,7 +133,7 @@ class Home extends Component {
                         fontSize: 30,
                       },
                     }}>
-                    A JavaScript library for building user interfaces
+                    ユーザインターフェース構築のための JavaScript ライブラリ
                   </p>
                   <Flex
                     valign="center"
@@ -148,12 +148,12 @@ class Home extends Component {
                       <ButtonLink
                         to="/docs/getting-started.html"
                         type="primary">
-                        Get Started
+                        スタートガイド
                       </ButtonLink>
                     </CtaItem>
                     <CtaItem>
                       <ButtonLink to="/tutorial/tutorial.html" type="secondary">
-                        Take the Tutorial
+                        チュートリアルを見る
                       </ButtonLink>
                     </CtaItem>
                   </Flex>
@@ -285,12 +285,12 @@ class Home extends Component {
               <Flex valign="center">
                 <CtaItem>
                   <ButtonLink to="/docs/getting-started.html" type="primary">
-                    Get Started
+                    スタートガイド
                   </ButtonLink>
                 </CtaItem>
                 <CtaItem>
                   <ButtonLink to="/tutorial/tutorial.html" type="secondary">
-                    Take the Tutorial
+                    チュートリアルを見る
                   </ButtonLink>
                 </CtaItem>
               </Flex>
diff --git a/src/templates/components/Sidebar/Section.js b/src/templates/components/Sidebar/Section.js
@@ -81,10 +81,7 @@ class Section extends React.Component {
                   ? activeItemId === item.id
                   : isItemActive(location, item),
                 item: section.isOrdered
-                  ? {
-                      ...item,
-                      title: `${index + 1}. ${item.title}`,
-                    }
+                  ? {...item, title: `${index + 1}. ${item.title}`}
                   : item,
                 location,
                 onLinkClick,

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class CodeEditor extends Component {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`render() {`
`46`		`- const {children, containerNodeID} = this.props;`
	`46`	`+ const {containerNodeID} = this.props;`
`47`	`47`	`const {`
`48`	`48`	`compiledES6,`
`49`	`49`	`code,`