cvs: smarty /docs/ja/designers language-variables.xml /docs/ja/designers/language-builtin-functions language-function-config-load.xml
language-function-foreach.xml language-function-if.xml /docs/ja/designers/language-modifiers language-modifier-cat.xml language-modifier-wordwrap.xml
/docs/ja/designers/language-variables language-variables-smarty.xml

takagi Thu May 3 22:32:22 2007 UTC Modified files: /smarty/docs/ja/designers/language-variables language-variables-smarty.xml /smarty/docs/ja/designers/language-modifiers language-modifier-wordwrap.xml language-modifier-cat.xml /smarty/docs/ja/designers/language-builtin-functions language-function-if.xml language-function-foreach.xml language-function-config-load.xml /smarty/docs/ja/designers language-variables.xml Log: sync with en.

http://cvs.php.net/viewvc.cgi/smarty/docs/ja/designers/language-variables/language-variables-smarty.xml?r1=1.1&r2=1.2&diff_format=u Index: smarty/docs/ja/designers/language-variables/language-variables-smarty.xml diff -u smarty/docs/ja/designers/language-variables/language-variables-smarty.xml:1.1 smarty/docs/ja/designers/language-variables/language-variables-smarty.xml:1.2 --- smarty/docs/ja/designers/language-variables/language-variables-smarty.xml:1.1 Sat Apr 21 12:13:33 2007 +++ smarty/docs/ja/designers/language-variables/language-variables-smarty.xml Thu May 3 22:32:21 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.18 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.19 Maintainer: takagi Status: ready --> <!-- CREDITS: mat-sh,daichi,joe --> <sect1 id="language.variables.smarty"> <title>予約変数 {$smarty}</title> http://cvs.php.net/viewvc.cgi/smarty/docs/ja/designers/language-modifiers/language-modifier-wordwrap.xml?r1=1.1&r2=1.2&diff_format=u Index: smarty/docs/ja/designers/language-modifiers/language-modifier-wordwrap.xml diff -u smarty/docs/ja/designers/language-modifiers/language-modifier-wordwrap.xml:1.1 smarty/docs/ja/designers/language-modifiers/language-modifier-wordwrap.xml:1.2 --- smarty/docs/ja/designers/language-modifiers/language-modifier-wordwrap.xml:1.1 Sat Apr 21 12:13:33 2007 +++ smarty/docs/ja/designers/language-modifiers/language-modifier-wordwrap.xml Thu May 3 22:32:22 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.6 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.7 Maintainer: takagi Status: ready --> <!-- CREDITS: mat-sh,daichi,joe --> <sect1 id="language.modifier.wordwrap"> <title>wordwrap</title> @@ -84,7 +84,7 @@ {$articleTitle|wordwrap:30:"<br />\n"} -{$articleTitle|wordwrap:30:"\n":true} +{$articleTitle|wordwrap:26:"\n":true} ]]> </programlisting> <para> @@ -107,9 +107,9 @@ from dad she hasn't seen in<br /> years. -Blind woman gets new kidney -from dad she hasn't seen in -years. +Blind woman gets new kidn +ey from dad she hasn't se +en in years. ]]> </screen> </example> http://cvs.php.net/viewvc.cgi/smarty/docs/ja/designers/language-modifiers/language-modifier-cat.xml?r1=1.1&r2=1.2&diff_format=u Index: smarty/docs/ja/designers/language-modifiers/language-modifier-cat.xml diff -u smarty/docs/ja/designers/language-modifiers/language-modifier-cat.xml:1.1 smarty/docs/ja/designers/language-modifiers/language-modifier-cat.xml:1.2 --- smarty/docs/ja/designers/language-modifiers/language-modifier-cat.xml:1.1 Sat Apr 21 12:13:33 2007 +++ smarty/docs/ja/designers/language-modifiers/language-modifier-cat.xml Thu May 3 22:32:22 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.4 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.5 Maintainer: takagi Status: ready --> <!-- CREDITS: mat-sh,daichi,joe --> <sect1 id="language.modifier.cat"> <title>cat</title> http://cvs.php.net/viewvc.cgi/smarty/docs/ja/designers/language-builtin-functions/language-function-if.xml?r1=1.1&r2=1.2&diff_format=u Index: smarty/docs/ja/designers/language-builtin-functions/language-function-if.xml diff -u smarty/docs/ja/designers/language-builtin-functions/language-function-if.xml:1.1 smarty/docs/ja/designers/language-builtin-functions/language-function-if.xml:1.2 --- smarty/docs/ja/designers/language-builtin-functions/language-function-if.xml:1.1 Sat Apr 21 12:13:33 2007 +++ smarty/docs/ja/designers/language-builtin-functions/language-function-if.xml Thu May 3 22:32:22 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.10 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.11 Maintainer: takagi Status: ready --> <!-- CREDITS: mat-sh,daichi,joe --> <sect1 id="language.function.if"> <title>{if},{elseif},{else}</title> @@ -17,9 +17,9 @@ </para> <para> <link linkend="variable.security"><parameter>$security</parameter></link> - が有効な場合、配列 <link + が有効な場合は、 <link linkend="variable.security.settings"><parameter>$security_settings</parameter></link> - には <emphasis>IF_FUNCS</emphasis> 配列が入ります。 + の配列 <emphasis>IF_FUNCS</emphasis> に含まれる PHP の関数のみが利用可能となります。 </para> <para> 以下は認識される条件演算子の一覧です。 @@ -230,7 +230,7 @@ <title>{if} のその他の例</title> <programlisting> <![CDATA[ -{if isset($name) && $name = 'Blog'} +{if isset($name) && $name == 'Blog'} {* 何かを行います *} {elseif $name == $foo} {* 何かを行います *} http://cvs.php.net/viewvc.cgi/smarty/docs/ja/designers/language-builtin-functions/language-function-foreach.xml?r1=1.1&r2=1.2&diff_format=u Index: smarty/docs/ja/designers/language-builtin-functions/language-function-foreach.xml diff -u smarty/docs/ja/designers/language-builtin-functions/language-function-foreach.xml:1.1 smarty/docs/ja/designers/language-builtin-functions/language-function-foreach.xml:1.2 --- smarty/docs/ja/designers/language-builtin-functions/language-function-foreach.xml:1.1 Sat Apr 21 12:13:33 2007 +++ smarty/docs/ja/designers/language-builtin-functions/language-function-foreach.xml Thu May 3 22:32:22 2007 @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.11 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.12 Maintainer: takagi Status: ready --> <!-- CREDITS: mat-sh,daichi,joe --> <sect1 id="language.function.foreach"> <title>{foreach},{foreachelse}</title> <para> - <varname>{foreach}</varname> を使用して、 - <emphasis role="bold">１つの連想配列</emphasis> をループします。 + <varname>{foreach}</varname> を使用して、通常の数値添字配列と同じように + <emphasis role="bold">連想配列</emphasis> をループします。 <link linkend="language.function.section"><varname>{section}</varname></link> - のように、<emphasis role="bold">データの配列</emphasis> をループすることはありません。 + のように、<emphasis role="bold">数値添字の配列のみ</emphasis> をループさせるということはありません。 <varname>{foreach}</varname> の構文は <link linkend="language.function.section"><varname>{section}</varname></link> よりずっと簡単ですが、その代わりに <emphasis role="bold">１つの配列</emphasis> http://cvs.php.net/viewvc.cgi/smarty/docs/ja/designers/language-builtin-functions/language-function-config-load.xml?r1=1.1&r2=1.2&diff_format=u Index: smarty/docs/ja/designers/language-builtin-functions/language-function-config-load.xml diff -u smarty/docs/ja/designers/language-builtin-functions/language-function-config-load.xml:1.1 smarty/docs/ja/designers/language-builtin-functions/language-function-config-load.xml:1.2 --- smarty/docs/ja/designers/language-builtin-functions/language-function-config-load.xml:1.1 Sat Apr 21 12:13:33 2007 +++ smarty/docs/ja/designers/language-builtin-functions/language-function-config-load.xml Thu May 3 22:32:22 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.12 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.13 Maintainer: takagi Status: ready --> <!-- CREDITS: mat-sh,daichi,joe --> <sect1 id="language.function.config.load"> <title>{config_load}</title> @@ -114,6 +114,10 @@ <link linkend="config.files">設定ファイル</link> には、セクションも含まれます。<parameter>section</parameter> 属性を指定する事で、そのセクション内の変数を読み込む事ができます。 + セクションを指定したとしても、 + グローバルな設定変数は常に読み込まれることに注意しましょう。 + グローバル変数と同じ名前のセクション変数があった場合は、 + セクション変数の内容が優先されます(グローバル変数の値を上書きします)。 </para> <note> <para> http://cvs.php.net/viewvc.cgi/smarty/docs/ja/designers/language-variables.xml?r1=1.1&r2=1.2&diff_format=u Index: smarty/docs/ja/designers/language-variables.xml diff -u smarty/docs/ja/designers/language-variables.xml:1.1 smarty/docs/ja/designers/language-variables.xml:1.2 --- smarty/docs/ja/designers/language-variables.xml:1.1 Sat Apr 21 12:13:33 2007 +++ smarty/docs/ja/designers/language-variables.xml Thu May 3 22:32:22 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.8 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.9 Maintainer: takagi Status: ready --> <!-- CREDITS: mat-sh,daichi,joe --> <chapter id="language.variables"> <title>変数</title>