Skip to content

Commit

Permalink
Merge pull request #4334 from tako-black/add_meta_tag_in_the_header_o…
Browse files Browse the repository at this point in the history
…f_html

Add meta tag in the header of HTML in translated documentation.
  • Loading branch information
jimfb committed Jul 10, 2015
2 parents 4d4e0bd + a9e0b4a commit 6c0ab0b
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 9 deletions.
1 change: 1 addition & 0 deletions docs/docs/02-displaying-data.ja-JP.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ UIについて、最も基本的なことは、いくつかのデータを表示
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Hello React</title>
<script src="https://fb.me/react-{{site.react_version}}.js"></script>
<script src="https://fb.me/JSXTransformer-{{site.react_version}}.js"></script>
Expand Down
1 change: 1 addition & 0 deletions docs/docs/02-displaying-data.ko-KR.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ UI를 가지고 할 수 있는 가장 기초적인 것은 데이터를 표시하
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Hello React</title>
<script src="https://fb.me/react-{{site.react_version}}.js"></script>
<script src="https://fb.me/JSXTransformer-{{site.react_version}}.js"></script>
Expand Down
1 change: 1 addition & 0 deletions docs/docs/02-displaying-data.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Let's look at a really simple example. Create a `hello-react.html` file with the
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Hello React</title>
<script src="https://fb.me/react-{{site.react_version}}.js"></script>
<script src="https://fb.me/JSXTransformer-{{site.react_version}}.js"></script>
Expand Down
3 changes: 2 additions & 1 deletion docs/docs/02-displaying-data.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ next: jsx-in-depth-zh-CN.html
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Hello React</title>
<script src="https://fb.me/react-{{site.react_version}}.js"></script>
<script src="https://fb.me/JSXTransformer-{{site.react_version}}.js"></script>
Expand Down Expand Up @@ -80,7 +81,7 @@ React 组件非常简单。你可以认为它们就是简单的函数,接受 `

我们得出解决这个问题最好的方案是通过 JavaScript 直接生成模板,这样你就可以用一个真正语言的所有表达能力去构建用户界面。为了使这变得更简单,我们做了一个非常简单、**可选**类似 HTML 语法 ,通过函数调用即可生成模板的编译器,称为 JSX。

**JSX 让你可以用 HTML 语法去写 JavaScript 函数调用** 为了在 React 生成一个链接,通过纯 JavaScript 你可以这么写:
**JSX 让你可以用 HTML 语法去写 JavaScript 函数调用** 为了在 React 生成一个链接,通过纯 JavaScript 你可以这么写:

`React.createElement('a', {href: 'https://facebook.github.io/react/'}, 'Hello React!')`

Expand Down
4 changes: 3 additions & 1 deletion docs/docs/getting-started.ja-JP.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ React でのハッキングを始めるにあたり、一番簡単なものと
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Hello React!</title>
<script src="build/react.js"></script>
<script src="build/JSXTransformer.js"></script>
Expand Down Expand Up @@ -91,10 +92,11 @@ React.render(

最後に HTML ファイルを以下のように書き換えましょう。

```html{6,10}
```html{7,11}
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Hello React!</title>
<script src="build/react.js"></script>
<!-- JSXTransformer は必要ありません! -->
Expand Down
4 changes: 3 additions & 1 deletion docs/docs/getting-started.ko-KR.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ React를 시작하는 가장 빠른 방법은 다음의 Hello World JSFiddle 예
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Hello React!</title>
<script src="build/react.js"></script>
<script src="build/JSXTransformer.js"></script>
Expand Down Expand Up @@ -89,10 +90,11 @@ React.render(

아래의 내용대로 HTML 파일을 업데이트합니다:

```html{6,10}
```html{7,11}
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Hello React!</title>
<script src="build/react.js"></script>
<!-- JSXTransformer는 이제 불필요합니다! -->
Expand Down
6 changes: 4 additions & 2 deletions docs/docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ In the root directory of the starter kit, create a `helloworld.html` with the fo
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Hello React!</title>
<script src="build/react.js"></script>
<script src="build/JSXTransformer.js"></script>
Expand Down Expand Up @@ -90,10 +91,11 @@ React.render(

Update your HTML file as below:

```html{6,10}
```html{7,11}
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Hello React!</title>
<script src="build/react.js"></script>
<!-- No need for JSXTransformer! -->
Expand All @@ -111,7 +113,7 @@ If you want to use React with [browserify](http://browserify.org/), [webpack](ht

## Next Steps

Check out [the tutorial](/react/docs/tutorial.html) and the other examples in the starter kit's `examples` directory to learn more.
Check out [the tutorial](/react/docs/tutorial.html) and the other examples in the starter kit's `examples` directory to learn more.

We also have a wiki where the community contributes with [workflows, UI-components, routing, data management etc.](https://github.com/facebook/react/wiki/Complementary-Tools)

Expand Down
4 changes: 3 additions & 1 deletion docs/docs/getting-started.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ redirect_from: "docs/index-zh-CN.html"
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Hello React!</title>
<script src="build/react.js"></script>
<script src="build/JSXTransformer.js"></script>
Expand Down Expand Up @@ -90,10 +91,11 @@ React.render(

对照下面更新你的 HTML 代码

```html{6,10}
```html{7,11}
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Hello React!</title>
<script src="build/react.js"></script>
<!-- 不需要 JSXTransformer! -->
Expand Down
4 changes: 3 additions & 1 deletion docs/docs/tutorial.ja-JP.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ next: thinking-in-react-ja-JP.html
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Hello React</title>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/{{site.react_version}}/react.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/{{site.react_version}}/JSXTransformer.js"></script>
Expand Down Expand Up @@ -216,9 +217,10 @@ Markdown はインラインでテキストをフォーマットする簡単な

まず最初に、サードパーティ製の **Showdown** ライブラリをアプリケーションに追加します。 Showdown は Markdown テキストを生の HTML に変換する JavaScript ライブラリです。 既にある head タグの内側に script タグを書き込み、以下のように Showdown を読み込ませます。

```html{7}
```html{8}
<!-- index.html -->
<head>
<meta charset="UTF-8" />
<title>Hello React</title>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/{{site.react_version}}/react.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/{{site.react_version}}/JSXTransformer.js"></script>
Expand Down
4 changes: 3 additions & 1 deletion docs/docs/tutorial.ko-KR.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ next: thinking-in-react-ko-KR.html
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Hello React</title>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/{{site.react_version}}/react.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/{{site.react_version}}/JSXTransformer.js"></script>
Expand Down Expand Up @@ -219,9 +220,10 @@ Markdown은 텍스트를 포맷팅하는 간단한 방식입니다. 예를 들

먼저 서드파티 라이브러리인 **marked**를 애플리케이션에 추가합니다. 이 JavaScript 라이브러리는 Markdown 텍스트를 HTML 문법으로 변환해줍니다. head 태그안에 스크립트 태그를 추가해 주세요. (React playground에는 이미 포함되어 있습니다):

```html{7}
```html{8}
<!-- index.html -->
<head>
<meta charset="UTF-8" />
<title>Hello React</title>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/{{site.react_version}}/react.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/{{site.react_version}}/JSXTransformer.js"></script>
Expand Down
4 changes: 3 additions & 1 deletion docs/docs/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ For this tutorial, we'll use prebuilt JavaScript files on a CDN. Open up your fa
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>Hello React</title>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/{{site.react_version}}/react.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/{{site.react_version}}/JSXTransformer.js"></script>
Expand Down Expand Up @@ -217,9 +218,10 @@ Markdown is a simple way to format your text inline. For example, surrounding te

First, add the third-party library **marked** to your application. This is a JavaScript library which takes Markdown text and converts it to raw HTML. This requires a script tag in your head (which we have already included in the React playground):

```html{7}
```html{8}
<!-- index.html -->
<head>
<meta charset="UTF-8" />
<title>Hello React</title>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/{{site.react_version}}/react.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/{{site.react_version}}/JSXTransformer.js"></script>
Expand Down

0 comments on commit 6c0ab0b

Please sign in to comment.