Skip to content

Commit 5cf6de8

Browse files
msameschmsamesch
committed
Sync with EN
1 parent 2b3d8f1 commit 5cf6de8

32 files changed

+150
-162
lines changed

‎reference/datetime/book.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 71692b6f4cace8dca72a18ccd80d4cd7305e5d4e Maintainer: gerdtsteltner Status: ready -->
2+
<!-- EN-Revision: 3a8c3e77df070a046c9d5b56b68926ca2d7e5ee3 Maintainer: gerdtsteltner Status: ready -->
43
<!-- Reviewed: yes -->
54
<!-- Rev-Revision: a59ed9b526c8bae64a3e762063f2bd4de39a00da Reviewer: samesch -->
65

7-
<book xml:id="book.datetime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
6+
<book xml:id="book.datetime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="interactive">
87
<?phpdoc extension-membership="core"?>
98
<title>Datum und Uhrzeit</title>
109
<titleabbrev>Datum/Uhrzeit</titleabbrev>

‎reference/datetime/dateinterval/construct.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 71692b6f4cace8dca72a18ccd80d4cd7305e5d4e Maintainer: cmb Status: ready -->
2+
<!-- EN-Revision: 3a8c3e77df070a046c9d5b56b68926ca2d7e5ee3 Maintainer: cmb Status: ready -->
43
<!-- Reviewed: yes -->
54
<!-- Rev-Revision: 4586854a24b1ca532b5c9ba2410db1f1eee338ed Reviewer: samesch -->
65
<!-- CREDITS: Yannic Schnetz -->
@@ -190,7 +189,9 @@ echo $interval->format("%d");
190189
</programlisting>
191190
&example.outputs;
192191
<screen role="php">
192+
<![CDATA[
193193
7
194+
]]>
194195
</screen>
195196
</example>
196197
</para>
@@ -201,11 +202,8 @@ echo $interval->format("%d");
201202
<programlisting role="php">
202203
<![CDATA[
203204
<?php
204-
205205
$interval = new DateInterval('P1W2D');
206206
var_dump($interval);
207-
208-
?>
209207
]]>
210208
</programlisting>
211209
&example.outputs.82;

‎reference/datetime/dateinterval/createfromdatestring.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 34f483426930c25870b4c5455157e7a759e0053c Maintainer: cmb Status: ready -->
2+
<!-- EN-Revision: 3a8c3e77df070a046c9d5b56b68926ca2d7e5ee3 Maintainer: cmb Status: ready -->
43
<!-- Reviewed: yes -->
54
<!-- Rev-Revision: 4586854a24b1ca532b5c9ba2410db1f1eee338ed Reviewer: samesch -->
65
<!-- CREDITS: Yannic Schnetz -->
@@ -114,7 +113,7 @@
114113
<para>
115114
<example>
116115
<title>Parsen gültiger Datums-Intervalle</title>
117-
<programlisting role="php">
116+
<programlisting role="php" annotations="non-interactive">
118117
<![CDATA[
119118
<?php
120119
// Jede Gruppe von Intervallen ist gleich.
@@ -138,7 +137,6 @@ $i = DateInterval::createFromDateString('1 day + 12 hours');
138137
139138
$i = new DateInterval('PT3600S');
140139
$i = DateInterval::createFromDateString('3600 seconds');
141-
?>
142140
]]>
143141
</programlisting>
144142
</example>
@@ -154,13 +152,14 @@ echo $i->format('%d %h %i'), "\n";
154152
155153
$i = DateInterval::createFromDateString('1 year - 10 days');
156154
echo $i->format('%y %d'), "\n";
157-
?>
158155
]]>
159156
</programlisting>
160157
&example.outputs;
161-
<screen role="shell">
158+
<screen>
159+
<![CDATA[
162160
449 2 70
163161
1 -10
162+
]]>
164163
</screen>
165164
</example>
166165
</para>

‎reference/datetime/dateinterval/format.xml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 02ff7fef5b34cf8f5395180d9d39fb64d9398d00 Maintainer: samesch Status: ready -->
2+
<!-- EN-Revision: 3a8c3e77df070a046c9d5b56b68926ca2d7e5ee3 Maintainer: samesch Status: ready -->
43
<!-- Reviewed: no -->
54
<refentry xml:id="dateinterval.format" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
65
<refnamediv>
@@ -198,11 +197,8 @@
198197
<programlisting role="php">
199198
<![CDATA[
200199
<?php
201-
202200
$interval = new DateInterval('P2Y4DT6H8M');
203201
echo $interval->format('%d Tage');
204-
205-
?>
206202
]]>
207203
</programlisting>
208204
&example.outputs;
@@ -219,11 +215,8 @@ echo $interval->format('%d Tage');
219215
<programlisting role="php">
220216
<![CDATA[
221217
<?php
222-
223218
$interval = new DateInterval('P32D');
224219
echo $interval->format('%d Tage');
225-
226-
?>
227220
]]>
228221
</programlisting>
229222
&example.outputs;
@@ -243,7 +236,6 @@ echo $interval->format('%d Tage');
243236
<programlisting role="php">
244237
<![CDATA[
245238
<?php
246-
247239
$january = new DateTime('2010-01-01');
248240
$february = new DateTime('2010-02-01');
249241
$interval = $february->diff($january);
@@ -254,8 +246,6 @@ echo $interval->format('%a Tage insgesamt')."\n";
254246
// Während %d nur die Anzahl der Tage ausgibt, die noch nicht durch den
255247
// Monat abgedeckt sind.
256248
echo $interval->format('%m Monat, %d Tage)');
257-
258-
?>
259249
]]>
260250
</programlisting>
261251
&example.outputs;

‎reference/datetime/dateperiod.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 576c7c43febb2eec5718d8320f92606423413983 Maintainer: cmb Status: ready -->
2+
<!-- EN-Revision: 3a8c3e77df070a046c9d5b56b68926ca2d7e5ee3 Maintainer: cmb Status: ready -->
43
<!-- Reviewed: yes -->
54
<!-- Rev-Revision: b3ed29c728e742a2f3d067558f1ece6a1c006f2e Reviewer: samesch -->
65
<!-- CREDITS: Stefan Schenke -->
@@ -168,7 +167,8 @@
168167
<para>
169168
<informalexample>
170169
<programlisting role="php">
171-
<![CDATA[<?php
170+
<![CDATA[
171+
<?php
172172
$start = new DateTime('2018-12-31 00:00:00');
173173
$end = new DateTime('2021-12-31 00:00:00');
174174
$interval = new DateInterval('P1M');
@@ -190,15 +190,17 @@ echo $period->recurrences, "\n";
190190
191191
$period = new DatePeriod($start, $interval, $end, DatePeriod::EXCLUDE_START_DATE);
192192
echo $period->recurrences, "\n";
193-
?>]]>
193+
]]>
194194
</programlisting>
195195
&example.outputs;
196196
<screen role="php">
197+
<![CDATA[
197198
5
198199
6
199200
7
200201
1
201202
0
203+
]]>
202204
</screen>
203205
</informalexample>
204206
</para>

‎reference/datetime/dateperiod/construct.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 7d81260767f008218ffd338b365cfa3d10eb3d15 Maintainer: cmb Status: ready -->
2+
<!-- EN-Revision: 0cf48a5a4869bd8b42f84e7032076756cde6a474 Maintainer: cmb Status: ready -->
43
<!-- Reviewed: yes -->
54
<!-- Rev-Revision: e2c7b3635d5353c05c248c29038bf9d5b7133d6e Reviewer: samesch -->
65

@@ -27,13 +26,16 @@
2726
<methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
2827
</constructorsynopsis>
2928
<warning>
29+
<simpara>
30+
Die folgende Konstruktorvariante ist veraltet:
31+
</simpara>
3032
<constructorsynopsis role="DatePeriod">
3133
<modifier>public</modifier> <methodname>DatePeriod::__construct</methodname>
3234
<methodparam><type>string</type><parameter>isostr</parameter></methodparam>
3335
<methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
3436
</constructorsynopsis>
3537
<simpara>
36-
Diese Variante des Konstruktors ist veraltet; stattdessen sollte
38+
Stattdessen sollte
3739
<methodname>DatePeriod::createFromISO8601String</methodname> verwendet
3840
werden.
3941
</simpara>
@@ -220,12 +222,12 @@ $period = new DatePeriod($iso);
220222
foreach ($period as $date) {
221223
echo $date->format('Y-m-d')."\n";
222224
}
223-
?>
224225
]]>
225226
</programlisting>
226227
&example.outputs;
227228
<screen>
228229
<![CDATA[
230+
Deprecated: Calling DatePeriod::__construct(string $isostr, int $options = 0) is deprecated, use DatePeriod::createFromISO8601String() instead in script on line 11
229231
2012-07-01
230232
2012-07-08
231233
2012-07-15
@@ -254,7 +256,6 @@ $period = new DatePeriod($start, $interval, $end,
254256
foreach ($period as $date) {
255257
echo $date->format('Y-m-d')."\n";
256258
}
257-
?>
258259
]]>
259260
</programlisting>
260261
&example.outputs;
@@ -283,7 +284,6 @@ $period = new DatePeriod($begin, $interval, $end, DatePeriod::EXCLUDE_START_DATE
283284
foreach ($period as $dt) {
284285
echo $dt->format('l Y-m-d'), "\n";
285286
}
286-
?>
287287
]]>
288288
</programlisting>
289289
&example.outputs;

‎reference/datetime/dateperiod/createfromiso8601string.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- EN-Revision: 0070ddc45d60b6eda095053847dba544aa4339bf Maintainer: samesch Status: ready -->
2+
<!-- EN-Revision: 3a8c3e77df070a046c9d5b56b68926ca2d7e5ee3 Maintainer: samesch Status: ready -->
33
<!-- Reviewed: no -->
44
<refentry xml:id="dateperiod.createfromiso8601string" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
55
<refnamediv>
@@ -124,15 +124,13 @@
124124
<![CDATA[
125125
<?php
126126
$iso = 'R4/2023-07-01T00:00:00Z/P7D';
127-
128127
$period = DatePeriod::createFromISO8601String($iso);
129128
130129
// Durch Iterieren über das DatePeriod-Objekt werden alle sich
131130
// wiederholenden Termine innerhalb des Zeitraums ausgegeben.
132131
foreach ($period as $date) {
133132
echo $date->format('Y-m-d'), "\n";
134133
}
135-
?>
136134
]]>
137135
</programlisting>
138136
&example.outputs;

‎reference/datetime/dateperiod/getdateinterval.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 02ff7fef5b34cf8f5395180d9d39fb64d9398d00 Maintainer: samesch Status: ready -->
2+
<!-- EN-Revision: 3a8c3e77df070a046c9d5b56b68926ca2d7e5ee3 Maintainer: samesch Status: ready -->
43
<!-- Reviewed: no -->
54
<refentry xml:id="dateperiod.getdateinterval" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
65
<refnamediv>
@@ -40,10 +39,9 @@
4039
<programlisting role="php">
4140
<![CDATA[
4241
<?php
43-
$period = new DatePeriod('R7/2016-05-16T00:00:00Z/P1D');
42+
$period = DatePeriod::createFromIso8601String('R7/2016-05-16T00:00:00Z/P1D');
4443
$interval = $period->getDateInterval();
4544
echo $interval->format('%d Tag');
46-
?>
4745
]]>
4846
</programlisting>
4947
&example.outputs;

‎reference/datetime/dateperiod/getenddate.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 02ff7fef5b34cf8f5395180d9d39fb64d9398d00 Maintainer: samesch Status: ready -->
2+
<!-- EN-Revision: 3a8c3e77df070a046c9d5b56b68926ca2d7e5ee3 Maintainer: samesch Status: ready -->
43
<!-- Reviewed: no -->
54
<refentry xml:id="dateperiod.getenddate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
65
<refnamediv>
@@ -61,7 +60,6 @@ $period = new DatePeriod(
6160
);
6261
$start = $period->getEndDate();
6362
echo $start->format(DateTime::ISO8601);
64-
?>
6563
]]>
6664
</programlisting>
6765
&examples.outputs;
@@ -82,7 +80,6 @@ $period = new DatePeriod(
8280
7
8381
);
8482
var_dump($period->getEndDate());
85-
?>
8683
]]>
8784
</programlisting>
8885
&example.outputs;

‎reference/datetime/dateperiod/getrecurrences.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
3-
<!-- EN-Revision: 02ff7fef5b34cf8f5395180d9d39fb64d9398d00 Maintainer: samesch Status: ready -->
2+
<!-- EN-Revision: 3a8c3e77df070a046c9d5b56b68926ca2d7e5ee3 Maintainer: samesch Status: ready -->
43
<!-- Reviewed: no -->
54
<refentry xml:id="dateperiod.getrecurrences" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
65
<refnamediv>
@@ -40,7 +39,8 @@
4039
<example>
4140
<title>Unterschiedliche Werte bei <methodname>DatePeriod::getRecurrences</methodname></title>
4241
<programlisting role="php">
43-
<![CDATA[<?php
42+
<![CDATA[
43+
<?php
4444
$start = new DateTime('2018-12-31 00:00:00');
4545
$end = new DateTime('2021-12-31 00:00:00');
4646
$interval = new DateInterval('P1M');
@@ -62,16 +62,18 @@ var_dump($period->getRecurrences());
6262
6363
$period = new DatePeriod($start, $interval, $end, DatePeriod::EXCLUDE_START_DATE);
6464
var_dump($period->getRecurrences());
65-
?>]]>
65+
]]>
6666
</programlisting>
6767
&example.outputs;
6868
<screen role="php">
69+
<![CDATA[
6970
5
7071
5
7172
5
7273
7374
NULL
7475
NULL
76+
]]>
7577
</screen>
7678
</example>
7779
</para>

0 commit comments

Comments
 (0)