Skip to content

Commit

Permalink
Merge branch '1.3/develop_japanese' into 1.3-merge
Browse files Browse the repository at this point in the history 
Conflicts:
	assets/js/combined.js
	classes/autoloader.html
	classes/cookie.html
	classes/database/introduction.html
	classes/database/qb_select.html
	classes/debug.html
	classes/file/handlers.html
	classes/format.html
	classes/fuel.html
	classes/input.html
	classes/pagination.html
	classes/request/request.html
	classes/response.html
	classes/upload/usage.html
	general/configuration.html
	general/environments.html
	general/migrations.html
	general/views.html
	index.html
	installation/download.html
	packages/auth/simpleauth/login.html
	packages/email/usage.html
	packages/oil/generate.html
	packages/oil/intro.html
	packages/orm/creating_models.html
	packages/orm/crud.html
	packages/orm/intro.html
	packages/orm/relations/intro.html
  • Loading branch information
@kenjis
kenjis committed Jan 1, 2013
2 parents c4285a1 + ed85271 commit 36eaada
Show file tree
Hide file tree
Showing 145 changed files with 7,444 additions and 7,333 deletions.
35 changes: 35 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# FuelPHP 公式ドキュメントの日本語化

ここでは、FuelPHP の公式ドキュメント (FuelPHP Documentaion) を日本語化しています。

翻訳作業の参加者を広く募集しています。お気軽に Pull Request してください。

翻訳は、[FuelPHP Documentation 日本語版執筆基準](https://github.com/NEKOGET/FuelPHP_docs_jp/wiki/FuelPHP-Documentation-%E6%97%A5%E6%9C%AC%E8%AA%9E%E7%89%88%E5%9F%B7%E7%AD%86%E5%9F%BA%E6%BA%96) に準拠するようにお願いします。

現在、以下のブランチがありますが、1.3 から翻訳を進めています。

- 1.5/develop_japanese ブランチ (本家 1.5/develop ブランチに対応)
- 1.4/develop_japanese ブランチ (本家 1.4/develop ブランチに対応)
- 1.3/develop_japanese ブランチ (本家 1.3/develop ブランチに対応)

翻訳状況は、以下の Google Docs で管理されています。

- [1.3 翻訳状況](https://docs.google.com/spreadsheet/ccc?key=0Aj_-DesHiguSdG1BTTNYTEdfR2IyU3NNdlFSZFJMYmc#gid=0)

日本語化途中のドキュメントは、以下から閲覧できます。

- http://press.nekoget.com/fuelphp_doc/ ....... バージョン 1.3
- http://press.nekoget.com/fuelphp_doc_1.2/ ... バージョン 1.2

## コミュニケーション

翻訳に関するコミュニケーションは、以下の Google グループにて行います。

- https://groups.google.com/group/fuelphp_jp?hl=ja

翻訳作業に参加される方は、ご参加ください。

## 参考

- FuelPHP のドキュメント和訳に参加しよう! http://www.slideshare.net/akagisho/lets-translate-fuelphp-docs
- github でドキュメント日本語化 http://ounziw.com/2011/12/01/github-localize/
96 changes: 45 additions & 51 deletions assets/js/combined.js
View file

Large diffs are not rendered by default.

29 changes: 15 additions & 14 deletions classes/agent/config.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ <h1>

<div id="main">

<h2>Agent Class</h2>
<h2>Agent クラス</h2>

<p>The agent class allows you to retrieve information about browser type, version, platform or operating system, etc, based on the clients User Agent string.</p>

<section>
<h3 id="config">Configuration</h3>
<h3 id="config">設定</h3>

<p>
The agent class uses the PHP function <a href="http://php.net/manual/en/function.get-browser.php">get_browser()</a>,
Expand All @@ -61,10 +61,10 @@ <h3 id="config">Configuration</h3>
<table class="config">
<tbody>
<tr class="header">
<th>Param</th>
<th>Type</th>
<th>Default</th>
<th>Description</th>
<th>パラメータ</th>
<th>型</th>
<th>規定値</th>
<th>説明</th>
</tr>
<tr>
<th>browscap</th>
Expand Down Expand Up @@ -108,10 +108,10 @@ <h5 id="browsercap_config">Browscap.ini configuration</h5>
<table class="config">
<tbody>
<tr class="header">
<th>Param</th>
<th>Type</th>
<th>Default</th>
<th>Description</th>
<th>パラメータ</th>
<th>型</th>
<th>規定値</th>
<th>説明</th>
</tr>
<tr>
<th>enabled</th>
Expand Down Expand Up @@ -159,10 +159,10 @@ <h5 id="cache_config">Cache configuration</h5>
<table class="config">
<tbody>
<tr class="header">
<th>Param</th>
<th>Type</th>
<th>Default</th>
<th>Description</th>
<th>パラメータ</th>
<th>型</th>
<th>規定値</th>
<th>説明</th>
</tr>
<tr>
<th>driver</th>
Expand Down Expand Up @@ -194,6 +194,7 @@ <h5 id="cache_config">Cache configuration</h5>
<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.3/develop/classes/agent/config.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.3/develop_japanese/classes/agent/config.html">翻訳コミット履歴</a> ]
</p>
</footer>
</div>
Expand Down
89 changes: 45 additions & 44 deletions classes/agent/usage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ <h1>

<div id="main">

<h2>Agent Class</h2>
<h2>Agent クラス</h2>

<p>The agent class allows you to retrieve information about browser type, version, platform or operating system, etc, based on the clients User Agent string.</p>

<section>
<h2>Usage</h2>
<h2>使用方法</h2>

<article>
<h4 id="method_accepts_charset" class="method">accepts_charset($charset = 'utf-8')</h4>
Expand All @@ -62,13 +62,13 @@ <h4 id="method_accepts_charset" class="method">accepts_charset($charset = 'utf-8
<td>Yes</td>
</tr>
<tr>
<th>Parameters</th>
<th>パラメータ</th>
<td>
<table class="parameters">
<tr>
<th>Param</th>
<th>Default</th>
<th class="description">Description</th>
<th>パラメータ</th>
<th>規定値</th>
<th class="description">説明</th>
</tr>
<tr>
<th><kbd>$charset</kbd></th>
Expand All @@ -79,11 +79,11 @@ <h4 id="method_accepts_charset" class="method">accepts_charset($charset = 'utf-8
</td>
</tr>
<tr>
<th>Returns</th>
<th>返り値</th>
<td>boolean</td>
</tr>
<tr>
<th>Example</th>
<th>例</th>
<td>
<pre class="php"><code>// Check if the users browser accepts iso-8859-1
if (Agent::accepts_charset('iso-8859-1'))
Expand All @@ -107,13 +107,13 @@ <h4 id="method_accepts_language" class="method">accepts_language($language = 'en
<td>Yes</td>
</tr>
<tr>
<th>Parameters</th>
<th>パラメータ</th>
<td>
<table class="parameters">
<tr>
<th>Param</th>
<th>Default</th>
<th class="description">Description</th>
<th>パラメータ</th>
<th>規定値</th>
<th class="description">説明</th>
</tr>
<tr>
<th><kbd>$language</kbd></th>
Expand All @@ -124,11 +124,11 @@ <h4 id="method_accepts_language" class="method">accepts_language($language = 'en
</td>
</tr>
<tr>
<th>Returns</th>
<th>返り値</th>
<td>boolean</td>
</tr>
<tr>
<th>Example</th>
<th>例</th>
<td>
<pre class="php"><code>// Check if the users browser accepts Flemish (Belgian Dutch)
if (Agent::accepts_language('nl_BE'))
Expand All @@ -152,15 +152,15 @@ <h4 id="method_browser" class="method">browser()</h4>
<td>Yes</td>
</tr>
<tr>
<th>Parameters</th>
<th>パラメータ</th>
<td>None</td>
</tr>
<tr>
<th>Returns</th>
<th>返り値</th>
<td>string</td>
</tr>
<tr>
<th>Example</th>
<th>例</th>
<td>
<pre class="php"><code>// Process based on the browser name
switch (Agent::browser())
Expand Down Expand Up @@ -197,15 +197,15 @@ <h4 id="method_platform" class="method">platform()</h4>
<td>Yes</td>
</tr>
<tr>
<th>Parameters</th>
<th>パラメータ</th>
<td>None</td>
</tr>
<tr>
<th>Returns</th>
<th>返り値</th>
<td>string</td>
</tr>
<tr>
<th>Example</th>
<th>例</th>
<td>
<pre class="php"><code>// Process based on the browser platform
switch (Agent::platform())
Expand Down Expand Up @@ -259,15 +259,15 @@ <h4 id="method_version" class="method">version()</h4>
<td>Yes</td>
</tr>
<tr>
<th>Parameters</th>
<th>パラメータ</th>
<td>None</td>
</tr>
<tr>
<th>Returns</th>
<th>返り値</th>
<td>float</td>
</tr>
<tr>
<th>Example</th>
<th>例</th>
<td>
<pre class="php"><code>// Check if an old Internet Explorer version is used
if (Agent::browser() == 'IE' and Agent::version() &lt; 7)
Expand All @@ -291,15 +291,15 @@ <h4 id="method_charsets" class="method">charsets()</h4>
<td>Yes</td>
</tr>
<tr>
<th>Parameters</th>
<th>パラメータ</th>
<td>None</td>
</tr>
<tr>
<th>Returns</th>
<th>返り値</th>
<td>array</td>
</tr>
<tr>
<th>Example</th>
<th>例</th>
<td>
<pre class="php"><code>// Check if the users browser accepts iso-8859-1
$sets = Agent::charsets();
Expand All @@ -324,15 +324,15 @@ <h4 id="method_languages" class="method">languages()</h4>
<td>Yes</td>
</tr>
<tr>
<th>Parameters</th>
<th>パラメータ</th>
<td>None</td>
</tr>
<tr>
<th>Returns</th>
<th>返り値</th>
<td>array</td>
</tr>
<tr>
<th>Example</th>
<th>例</th>
<td>
<pre class="php"><code>// Check if the users browser accepts Flemish (Belgian Dutch)
$lang = Agent::languages();
Expand All @@ -357,15 +357,15 @@ <h4 id="method_properties" class="method">properties()</h4>
<td>Yes</td>
</tr>
<tr>
<th>Parameters</th>
<th>パラメータ</th>
<td>None</td>
</tr>
<tr>
<th>Returns</th>
<th>返り値</th>
<td>array</td>
</tr>
<tr>
<th>Example</th>
<th>例</th>
<td>
<pre class="php"><code>// Get the browser properties
$properties = Agent::properties();
Expand Down Expand Up @@ -420,13 +420,13 @@ <h4 id="method_property" class="method">property($property = null)</h4>
<td>Yes</td>
</tr>
<tr>
<th>Parameters</th>
<th>パラメータ</th>
<td>
<table class="parameters">
<tr>
<th>Param</th>
<th>Default</th>
<th class="description">Description</th>
<th>パラメータ</th>
<th>規定値</th>
<th class="description">説明</th>
</tr>
<tr>
<th><kbd>$property</kbd></th>
Expand All @@ -437,11 +437,11 @@ <h4 id="method_property" class="method">property($property = null)</h4>
</td>
</tr>
<tr>
<th>Returns</th>
<th>返り値</th>
<td>mixed</td>
</tr>
<tr>
<th>Example</th>
<th>例</th>
<td>
<pre class="php"><code>// Check if the browser supports cookies
if (Agent::property('cookies') === true)
Expand All @@ -465,15 +465,15 @@ <h4 id="method_is_mobiledevice" class="method">is_mobiledevice()</h4>
<td>Yes</td>
</tr>
<tr>
<th>Parameters</th>
<th>パラメータ</th>
<td>None</td>
</tr>
<tr>
<th>Returns</th>
<th>返り値</th>
<td>boolean</td>
</tr>
<tr>
<th>Example</th>
<th>例</th>
<td>
<pre class="php"><code>// Load a platform specific view
if (Agent::is_mobiledevice())
Expand All @@ -500,15 +500,15 @@ <h4 id="method_is_robot" class="method">is_robot()</h4>
<td>Yes</td>
</tr>
<tr>
<th>Parameters</th>
<th>パラメータ</th>
<td>None</td>
</tr>
<tr>
<th>Returns</th>
<th>返り値</th>
<td>boolean</td>
</tr>
<tr>
<th>Example</th>
<th>例</th>
<td>
<pre class="php"><code>// Load a crawler specific view (note: this is frowned upon!)
if (Agent::is_robot())
Expand All @@ -532,6 +532,7 @@ <h4 id="method_is_robot" class="method">is_robot()</h4>
<footer>
<p>
&copy; FuelPHP Development Team 2010-2012 - <a href="http://fuelphp.com">FuelPHP</a> is released under the MIT license.
[ <a href="https://github.com/fuel/docs/commits/1.3/develop/classes/agent/usage.html">原文コミット履歴</a> | <a href="https://github.com/NEKOGET/FuelPHP_docs_jp/commits/1.3/develop_japanese/classes/agent/usage.html">翻訳コミット履歴</a> ]
</p>
</footer>
</div>
Expand Down
Loading

0 comments on commit 36eaada

Please sign in to comment.