cvs: phpdoc-fr /reference/strings/functions get-html-translation-table.xml implode.xml md5.xml money-format.xml nl2br.xml
| From: | Damien Seguy | Date: | Tue, 06 Jan 2009 21:43:32 +0000 |
| Subject: | cvs: phpdoc-fr /reference/strings/functions get-html-translation-table.xml implode.xml md5.xml money-format.xml nl2br.xml | ||
| Groups: | php.doc.fr | ||
| Request: | Send a blank email to doc-fr+get-6289@lists.php.net to get a copy of this message | ||
dams Tue Jan 6 21:43:32 2009 UTC
Modified files:
/phpdoc-fr/reference/strings/functions
get-html-translation-table.xml
implode.xml md5.xml
money-format.xml nl2br.xml
Log:
synch with en
http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/strings/functions/get-html-translation-table.xml?r1=1.17&r2=1.18&diff_format=u Index: phpdoc-fr/reference/strings/functions/get-html-translation-table.xml diff -u phpdoc-fr/reference/strings/functions/get-html-translation-table.xml:1.17 phpdoc-fr/reference/strings/functions/get-html-translation-table.xml:1.18 --- phpdoc-fr/reference/strings/functions/get-html-translation-table.xml:1.17 Mon Jun 2 15:01:08 2008 +++ phpdoc-fr/reference/strings/functions/get-html-translation-table.xml Tue Jan 6 21:43:32 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.17 $ --> -<!-- EN-Revision: 1.12 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.18 $ --> +<!-- EN-Revision: 1.13 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.get-html-translation-table"> @@ -87,9 +87,12 @@ ]]> </programlisting> </example> - La variable <literal>$encoded</literal> contient maintenant - <literal>"Hallo &amp; &lt;Frau&gt; &amp; - Kr&auml;mer".</literal> + &example.outputs; + <screen> +<![CDATA[ +Hallo &amp; &lt;Frau&gt; &amp; Kr&auml;mer +]]> + </screen> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/strings/functions/implode.xml?r1=1.17&r2=1.18&diff_format=u Index: phpdoc-fr/reference/strings/functions/implode.xml diff -u phpdoc-fr/reference/strings/functions/implode.xml:1.17 phpdoc-fr/reference/strings/functions/implode.xml:1.18 --- phpdoc-fr/reference/strings/functions/implode.xml:1.17 Fri May 23 13:46:24 2008 +++ phpdoc-fr/reference/strings/functions/implode.xml Tue Jan 6 21:43:32 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.17 $ --> -<!-- EN-Revision: 1.15 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.18 $ --> +<!-- EN-Revision: 1.16 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.implode"> @@ -16,6 +16,10 @@ <methodparam><type>string</type><parameter>glue</parameter></methodparam> <methodparam><type>array</type><parameter>pieces</parameter></methodparam> </methodsynopsis> + <methodsynopsis> + <type>string</type><methodname>implode</methodname> + <methodparam><type>array</type><parameter>pieces</parameter></methodparam> + </methodsynopsis> <para> Rassemble les éléments d'un tableau en une chaîne. </para> http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/strings/functions/md5.xml?r1=1.15&r2=1.16&diff_format=u Index: phpdoc-fr/reference/strings/functions/md5.xml diff -u phpdoc-fr/reference/strings/functions/md5.xml:1.15 phpdoc-fr/reference/strings/functions/md5.xml:1.16 --- phpdoc-fr/reference/strings/functions/md5.xml:1.15 Thu Jun 5 10:48:49 2008 +++ phpdoc-fr/reference/strings/functions/md5.xml Tue Jan 6 21:43:32 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.15 $ --> -<!-- EN-Revision: 1.10 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.16 $ --> +<!-- EN-Revision: 1.12 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://docbook.org/ns/docbook" xml:id="function.md5"> @@ -107,9 +107,11 @@ &reftitle.seealso; <para> <simplelist> + <member><function>md5_file</function></member> <member><function>sha1_file</function></member> <member><function>crc32</function></member> <member><function>sha1</function></member> + <member><function>hash</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/strings/functions/money-format.xml?r1=1.17&r2=1.18&diff_format=u Index: phpdoc-fr/reference/strings/functions/money-format.xml diff -u phpdoc-fr/reference/strings/functions/money-format.xml:1.17 phpdoc-fr/reference/strings/functions/money-format.xml:1.18 --- phpdoc-fr/reference/strings/functions/money-format.xml:1.17 Mon Jun 2 20:25:26 2008 +++ phpdoc-fr/reference/strings/functions/money-format.xml Tue Jan 6 21:43:32 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.17 $ --> -<!-- EN-Revision: 1.12 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.18 $ --> +<!-- EN-Revision: 1.13 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.money-format"> @@ -228,6 +228,8 @@ <para> Retourne la chaîne formatée. Les caractères avant et après la chaîne formatée seront retournés, inchangés. + Un valeur non-numérique pour <parameter>number</parameter> retourne &null; + et émet une alerte <constant>E_WARNING</constant>. </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/strings/functions/nl2br.xml?r1=1.14&r2=1.15&diff_format=u Index: phpdoc-fr/reference/strings/functions/nl2br.xml diff -u phpdoc-fr/reference/strings/functions/nl2br.xml:1.14 phpdoc-fr/reference/strings/functions/nl2br.xml:1.15 --- phpdoc-fr/reference/strings/functions/nl2br.xml:1.14 Mon Jun 2 20:25:26 2008 +++ phpdoc-fr/reference/strings/functions/nl2br.xml Tue Jan 6 21:43:32 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.14 $ --> -<!-- EN-Revision: 1.7 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.15 $ --> +<!-- EN-Revision: 1.11 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.nl2br"> @@ -14,10 +14,12 @@ <methodsynopsis> <type>string</type><methodname>nl2br</methodname> <methodparam><type>string</type><parameter>string</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>is_xhtml</parameter></methodparam> </methodsynopsis> <para> Retourne <parameter>string</parameter> après avoir inséré - <literal>"<br />"</literal> devant toutes les nouvelles lignes. + <literal>"<br />"</literal> ou <literal>'<br>'</literal> + devant toutes les nouvelles lignes. </para> </refsect1> @@ -33,6 +35,14 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><parameter>is_xhtml</parameter></term> + <listitem> + <para> + Produit des césures compatibles XHTML ou non (par défaut, &true;). + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -44,6 +54,46 @@ </para> </refsect1> + <refsect1 role="examples"> + &reftitle.examples; + <para> + <example> + <title>Exemple avec <function>nl2br</function></title> + <programlisting role="php"> +<![CDATA[ +<?php +echo nl2br("foo isn't\n bar"); +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +foo isn't<br /> + bar +]]> + </screen> + </example> + <example> + <title>Génération de code HTML valide avec le paramètre <parameter>is_xhtml</parameter></title> + <programlisting role="php"> +<![CDATA[ +<?php +echo nl2br("Welcome\r\nThis is my HTML document", false); +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +Welcome<br> +This is my HTML document +]]> + </screen> + </example> + </para> + </refsect1> + <refsect1 role="changelog"> &reftitle.changelog; <para> @@ -56,6 +106,12 @@ </row> </thead> <tbody> + <row> + <entry>5.3.0</entry> + <entry> + Ajout du paramètre optionnel <parameter>is_xhtml</parameter>. + </entry> + </row> <row> <entry>4.0.5</entry> <entry> @@ -71,29 +127,6 @@ </para> </refsect1> - <refsect1 role="examples"> - &reftitle.examples; - <para> - <example> - <title>Exemple avec <function>nl2br</function></title> - <programlisting role="php"> -<![CDATA[ -<?php -echo nl2br("foo n'est pas\n bar"); -?> -]]> - </programlisting> - &example.outputs; - <screen> -<![CDATA[ -foo n'est pas<br /> - bar -]]> - </screen> - </example> - </para> - </refsect1> - <refsect1 role="seealso"> &reftitle.seealso; <para>
http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/strings/functions/get-html-translation-table.xml?r1=1.17&r2=1.18&diff_format=u Index: phpdoc-fr/reference/strings/functions/get-html-translation-table.xml diff -u phpdoc-fr/reference/strings/functions/get-html-translation-table.xml:1.17 phpdoc-fr/reference/strings/functions/get-html-translation-table.xml:1.18 --- phpdoc-fr/reference/strings/functions/get-html-translation-table.xml:1.17 Mon Jun 2 15:01:08 2008 +++ phpdoc-fr/reference/strings/functions/get-html-translation-table.xml Tue Jan 6 21:43:32 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.17 $ --> -<!-- EN-Revision: 1.12 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.18 $ --> +<!-- EN-Revision: 1.13 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.get-html-translation-table"> @@ -87,9 +87,12 @@ ]]> </programlisting> </example> - La variable <literal>$encoded</literal> contient maintenant - <literal>"Hallo &amp; &lt;Frau&gt; &amp; - Kr&auml;mer".</literal> + &example.outputs; + <screen> +<![CDATA[ +Hallo &amp; &lt;Frau&gt; &amp; Kr&auml;mer +]]> + </screen> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/strings/functions/implode.xml?r1=1.17&r2=1.18&diff_format=u Index: phpdoc-fr/reference/strings/functions/implode.xml diff -u phpdoc-fr/reference/strings/functions/implode.xml:1.17 phpdoc-fr/reference/strings/functions/implode.xml:1.18 --- phpdoc-fr/reference/strings/functions/implode.xml:1.17 Fri May 23 13:46:24 2008 +++ phpdoc-fr/reference/strings/functions/implode.xml Tue Jan 6 21:43:32 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.17 $ --> -<!-- EN-Revision: 1.15 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.18 $ --> +<!-- EN-Revision: 1.16 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.implode"> @@ -16,6 +16,10 @@ <methodparam><type>string</type><parameter>glue</parameter></methodparam> <methodparam><type>array</type><parameter>pieces</parameter></methodparam> </methodsynopsis> + <methodsynopsis> + <type>string</type><methodname>implode</methodname> + <methodparam><type>array</type><parameter>pieces</parameter></methodparam> + </methodsynopsis> <para> Rassemble les éléments d'un tableau en une chaîne. </para> http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/strings/functions/md5.xml?r1=1.15&r2=1.16&diff_format=u Index: phpdoc-fr/reference/strings/functions/md5.xml diff -u phpdoc-fr/reference/strings/functions/md5.xml:1.15 phpdoc-fr/reference/strings/functions/md5.xml:1.16 --- phpdoc-fr/reference/strings/functions/md5.xml:1.15 Thu Jun 5 10:48:49 2008 +++ phpdoc-fr/reference/strings/functions/md5.xml Tue Jan 6 21:43:32 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.15 $ --> -<!-- EN-Revision: 1.10 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.16 $ --> +<!-- EN-Revision: 1.12 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://docbook.org/ns/docbook" xml:id="function.md5"> @@ -107,9 +107,11 @@ &reftitle.seealso; <para> <simplelist> + <member><function>md5_file</function></member> <member><function>sha1_file</function></member> <member><function>crc32</function></member> <member><function>sha1</function></member> + <member><function>hash</function></member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/strings/functions/money-format.xml?r1=1.17&r2=1.18&diff_format=u Index: phpdoc-fr/reference/strings/functions/money-format.xml diff -u phpdoc-fr/reference/strings/functions/money-format.xml:1.17 phpdoc-fr/reference/strings/functions/money-format.xml:1.18 --- phpdoc-fr/reference/strings/functions/money-format.xml:1.17 Mon Jun 2 20:25:26 2008 +++ phpdoc-fr/reference/strings/functions/money-format.xml Tue Jan 6 21:43:32 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.17 $ --> -<!-- EN-Revision: 1.12 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.18 $ --> +<!-- EN-Revision: 1.13 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.money-format"> @@ -228,6 +228,8 @@ <para> Retourne la chaîne formatée. Les caractères avant et après la chaîne formatée seront retournés, inchangés. + Un valeur non-numérique pour <parameter>number</parameter> retourne &null; + et émet une alerte <constant>E_WARNING</constant>. </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc-fr/reference/strings/functions/nl2br.xml?r1=1.14&r2=1.15&diff_format=u Index: phpdoc-fr/reference/strings/functions/nl2br.xml diff -u phpdoc-fr/reference/strings/functions/nl2br.xml:1.14 phpdoc-fr/reference/strings/functions/nl2br.xml:1.15 --- phpdoc-fr/reference/strings/functions/nl2br.xml:1.14 Mon Jun 2 20:25:26 2008 +++ phpdoc-fr/reference/strings/functions/nl2br.xml Tue Jan 6 21:43:32 2009 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.14 $ --> -<!-- EN-Revision: 1.7 Maintainer: yannick Status: ready --> +<!-- $Revision: 1.15 $ --> +<!-- EN-Revision: 1.11 Maintainer: yannick Status: ready --> <!-- Reviewed: yes --> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.nl2br"> @@ -14,10 +14,12 @@ <methodsynopsis> <type>string</type><methodname>nl2br</methodname> <methodparam><type>string</type><parameter>string</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>is_xhtml</parameter></methodparam> </methodsynopsis> <para> Retourne <parameter>string</parameter> après avoir inséré - <literal>"<br />"</literal> devant toutes les nouvelles lignes. + <literal>"<br />"</literal> ou <literal>'<br>'</literal> + devant toutes les nouvelles lignes. </para> </refsect1> @@ -33,6 +35,14 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><parameter>is_xhtml</parameter></term> + <listitem> + <para> + Produit des césures compatibles XHTML ou non (par défaut, &true;). + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -44,6 +54,46 @@ </para> </refsect1> + <refsect1 role="examples"> + &reftitle.examples; + <para> + <example> + <title>Exemple avec <function>nl2br</function></title> + <programlisting role="php"> +<![CDATA[ +<?php +echo nl2br("foo isn't\n bar"); +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +foo isn't<br /> + bar +]]> + </screen> + </example> + <example> + <title>Génération de code HTML valide avec le paramètre <parameter>is_xhtml</parameter></title> + <programlisting role="php"> +<![CDATA[ +<?php +echo nl2br("Welcome\r\nThis is my HTML document", false); +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +Welcome<br> +This is my HTML document +]]> + </screen> + </example> + </para> + </refsect1> + <refsect1 role="changelog"> &reftitle.changelog; <para> @@ -56,6 +106,12 @@ </row> </thead> <tbody> + <row> + <entry>5.3.0</entry> + <entry> + Ajout du paramètre optionnel <parameter>is_xhtml</parameter>. + </entry> + </row> <row> <entry>4.0.5</entry> <entry> @@ -71,29 +127,6 @@ </para> </refsect1> - <refsect1 role="examples"> - &reftitle.examples; - <para> - <example> - <title>Exemple avec <function>nl2br</function></title> - <programlisting role="php"> -<![CDATA[ -<?php -echo nl2br("foo n'est pas\n bar"); -?> -]]> - </programlisting> - &example.outputs; - <screen> -<![CDATA[ -foo n'est pas<br /> - bar -]]> - </screen> - </example> - </para> - </refsect1> - <refsect1 role="seealso"> &reftitle.seealso; <para>