Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync csv functions #914

Merged
merged 1 commit into from
Sep 30, 2024
Merged

Sync csv functions #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions language-snippets.ent
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 1cdefe36cdfc0e3acaff6a0db918d4b037081aa8 Maintainer: Gregory Status: ready -->
<!-- EN-Revision: 4cb53ecbd763db2db808e90d7eda63afb380e6df Maintainer: Gregory Status: ready -->
<!-- CREDITS: dallas, mowangjuanzi, Luffy -->
<!-- 请保持此文件与英文文件中相应的每个 ENTITY 行号一一对应以便于对照，修改与更新！ -->

Expand Down Expand Up @@ -1059,6 +1059,14 @@ purposes.</simpara></warning>'>
</entry>
</row>'>

<!-- CSV -->
<!ENTITY warning.csv.escape-parameter '<warning xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"><simpara>
当 <parameter>escape</parameter> 被设置为非空字符串（<literal>""</literal>）时，
可能导致生成的 CSV 不符合 <link xlink:href="&url.rfc;4180">RFC 4180</link> 的要求，
或者无法通过 PHP CSV 函数的往返处理。
<parameter>escape</parameter> 的默认值是 <literal>"\\"</literal>，因此建议显式地将其设置为空字符串。
默认值将在未来的 PHP 版本中更改，不早于 PHP 9.0。
</simpara></warning>'>

<!-- DBM notes -->

Expand Down Expand Up @@ -2410,7 +2418,13 @@ PHP 5.0.0 开始加入了对 IPv6 的支持。</simpara></note>'>
的产品中使用线程化 MPM。应使用预分支 MPM，Apache 2.0 和 2.2
默认的 MPM。其原因见 FAQ 中的相关条目<link linkend="faq.installation.apache2">使用线程化 MPM 的
Apache2</link>。</para></warning>'>

<!ENTITY warn.install.third-party-support '<warning xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<para>
第三方提供的版本被视为非官方版本，不直接受 PHP 项目支持。
除非可以通过 <link xlink:href="&url.php.downloads;">官方下载区</link>的构建版重现，
否则遇到的任何错误都应报告给这些非官方构建版的提供者。
</para>
</warning>'>

<!ENTITY note.apache.slashes '<note xmlns="http://docbook.org/ns/docbook"><simpara>记住当在
Windows 环境下的 Apache 配置文件中添加路径值时，所有的反斜线，如
Expand Down
22 changes: 12 additions & 10 deletions preface.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: d23581d55f20027b5a15673224a908cb425513b9 Maintainer: Avenger Status: ready -->
<!-- CREDITS: Gregory, mowangjuanzi -->
<!-- CREDITS: Gregory, mowangjuanzi, Luffy -->
<preface xml:id="preface" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://docbook.org/ns/docbook">
<info><title>序言</title>
<abstract>
<simpara>
<acronym>PHP</acronym>，即“<literal>PHP: Hypertext
Preprocessor</literal>”，是一种被广泛应用的开源通用脚本语言，尤其适用于 Web 开发并可嵌入 HTML
中去。它的语法利用了 C、Java 和 Perl，易于学习。该语言的主要目标是允许 web 开发人员快速编写动态生成的 web
页面，但 PHP 的用途远不只于此。
</simpara>
</abstract>
<info>
<titleabbrev>序言</titleabbrev>
<title>关于本手册</title>
<abstract>
<simpara>
<acronym>PHP</acronym>，即“<literal>PHP: Hypertext
Preprocessor</literal>”，是一种被广泛应用的开源通用脚本语言，尤其适用于 Web 开发并可嵌入 HTML
中去。它的语法利用了 C、Java 和 Perl，易于学习。该语言的主要目标是允许 web 开发人员快速编写动态生成的 web
页面，但 PHP 的用途远不只于此。
</simpara>
</abstract>
</info>

<para>
Expand Down
5 changes: 3 additions & 2 deletions reference/filesystem/functions/fgetcsv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 61374bbe228e8e9c55a24aba59a1e2bb2a871148 Maintainer: HonestQiao Status: ready -->
<!-- CREDITS: mowangjuanzi -->
<!-- EN-Revision: cef78b0fbe0fbe02003699b027ab50200097e949 Maintainer: HonestQiao Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<refentry xml:id="function.fgetcsv" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>fgetcsv</refname>
Expand Down Expand Up @@ -94,6 +94,7 @@
</varlistentry>
</variablelist>
</para>
&warning.csv.escape-parameter;
</refsect1>

<refsect1 role="returnvalues">
Expand Down
5 changes: 3 additions & 2 deletions reference/filesystem/functions/fputcsv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 291d60430d25f2b508bebb5720b41cc68f9a6ec1 Maintainer: HonestQiao Status: ready -->
<!-- CREDITS: mowangjuanzi -->
<!-- EN-Revision: cef78b0fbe0fbe02003699b027ab50200097e949 Maintainer: HonestQiao Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<refentry xml:id="function.fputcsv" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>fputcsv</refname>
Expand Down Expand Up @@ -82,6 +82,7 @@
</varlistentry>
</variablelist>
</para>
&warning.csv.escape-parameter;
<note>
<para>
If an <parameter>enclosure</parameter> character is contained in a field,
Expand Down
3 changes: 2 additions & 1 deletion reference/strings/functions/str-getcsv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 61374bbe228e8e9c55a24aba59a1e2bb2a871148 Maintainer: daijie Status: ready -->
<!-- EN-Revision: cef78b0fbe0fbe02003699b027ab50200097e949 Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.str-getcsv">
<refnamediv>
Expand Down Expand Up @@ -80,6 +80,7 @@
</varlistentry>
</variablelist>
</para>
&warning.csv.escape-parameter;
</refsect1>

<refsect1 role="returnvalues">
Expand Down