Skip to content

Commit f02b2a1

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

28 files changed

+203
-198
lines changed

‎reference/datetime/datetimezone/construct.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
32
<!-- EN-Revision: d9ac376dbee6e45ef775059456caf0ec348ada6a Maintainer: cmb Status: ready -->
43
<!-- Reviewed: yes -->
54
<!-- Rev-Revision: c7ee9cd4d1bb4538e283502b5f958b3042a61a63 Reviewer: samesch -->
@@ -118,17 +117,18 @@ foreach ($timezones as $tz) {
118117
$tzo = new DateTimeZone($tz);
119118
120119
$local = $d->setTimezone($tzo);
121-
echo $local->format(DateTimeInterface::RFC2822 . ' — e'), "\n";
120+
echo $local->format(DateTimeInterface::RFC2822 . ' — e') . "\n";
122121
}
123-
?>
124122
]]>
125123
</programlisting>
126124
&example.outputs;
127125
<screen>
126+
<![CDATA[
128127
Thu, 02 Jun 2022 16:44:48 +0100 — Europe/London
129128
Thu, 02 Jun 2022 20:29:48 +0445 — +04:45
130129
Thu, 02 Jun 2022 09:44:48 -0600 — -06:00
131130
Thu, 02 Jun 2022 17:44:48 +0200 — CEST
131+
]]>
132132
</screen>
133133
</example>
134134
</para>
@@ -145,16 +145,17 @@ $timezones = array('Europe/London', 'Mars/Phobos', 'Jupiter/Europa');
145145
foreach ($timezones as $tz) {
146146
try {
147147
$mars = new DateTimeZone($tz);
148+
echo $mars->getName() . "\n";
148149
} catch(Exception $e) {
149-
echo $e->getMessage() . '<br />';
150+
echo $e->getMessage() . "\n";
150151
}
151152
}
152-
?>
153153
]]>
154154
</programlisting>
155155
&example.outputs;
156156
<screen>
157157
<![CDATA[
158+
Europe/London
158159
DateTimeZone::__construct() [datetimezone.--construct]: Unknown or bad timezone (Mars/Phobos)
159160
DateTimeZone::__construct() [datetimezone.--construct]: Unknown or bad timezone (Jupiter/Europa)
160161
]]>

‎reference/datetime/datetimezone/getoffset.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
32
<!-- EN-Revision: e057f1f552548a68030830e96ae1bdf313b1794e Maintainer: samesch Status: ready -->
43
<!-- Reviewed: no -->
54
<refentry xml:id="datetimezone.getoffset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -80,9 +79,14 @@ $timeOffset = $dateTimeZoneJapan->getOffset($dateTimeTaipei);
8079
// Sollte int(32400) anzeigen (für Daten nach
8180
// Samstag, 8. September 01:00:00 1951 JST).
8281
var_dump($timeOffset);
83-
?>
8482
]]>
8583
</programlisting>
84+
&example.outputs;
85+
<screen>
86+
<![CDATA[
87+
int(32400)
88+
]]>
89+
</screen>
8690
</example>
8791
</para>
8892
</refsect1>

‎reference/datetime/datetimezone/gettransitions.xml‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
32
<!-- EN-Revision: 02ff7fef5b34cf8f5395180d9d39fb64d9398d00 Maintainer: samesch Status: ready -->
43
<!-- Reviewed: no -->
54
<refentry xml:id="datetimezone.gettransitions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -130,29 +129,29 @@ Array
130129
(
131130
[0] => Array
132131
(
133-
[ts] => -9223372036854775808
134-
[time] => -292277022657-01-27T08:29:52+0000
135-
[offset] => 3600
136-
[isdst] => 1
137-
[abbr] => BST
132+
[ts] => -2147483648
133+
[time] => 1901-12-13T20:45:52+00:00
134+
[offset] => -75
135+
[isdst] =>
136+
[abbr] => LMT
138137
)
139138
140139
[1] => Array
141140
(
142-
[ts] => -1691964000
143-
[time] => 1916-05-21T02:00:00+0000
144-
[offset] => 3600
145-
[isdst] => 1
146-
[abbr] => BST
141+
[ts] => 442304971
142+
[time] => 1847-12-01T00:01:15+00:00
143+
[offset] => 0
144+
[isdst] =>
145+
[abbr] => GMT
147146
)
148147
149148
[2] => Array
150149
(
151-
[ts] => -1680472800
152-
[time] => 1916-10-01T02:00:00+0000
153-
[offset] => 0
154-
[isdst] =>
155-
[abbr] => GMT
150+
[ts] => -1691964000
151+
[time] => 1916-05-21T02:00:00+00:00
152+
[offset] => 3600
153+
[isdst] => 1
154+
[abbr] => BST
156155
)
157156
158157
)
@@ -178,26 +177,26 @@ Array
178177
(
179178
[0] => Array
180179
(
181-
[ts] => 1654184161
182-
[time] => 2022-06-02T15:36:01+0000
180+
[ts] => 1759058251
181+
[time] => 2025-09-28T11:17:31+00:00
183182
[offset] => 3600
184183
[isdst] => 1
185184
[abbr] => BST
186185
)
187186
188187
[1] => Array
189188
(
190-
[ts] => 1667091600
191-
[time] => 2022-10-30T01:00:00+0000
189+
[ts] => 1761440400
190+
[time] => 2025-10-26T01:00:00+00:00
192191
[offset] => 0
193192
[isdst] =>
194193
[abbr] => GMT
195194
)
196195
197196
[2] => Array
198197
(
199-
[ts] => 1679792400
200-
[time] => 2023-03-26T01:00:00+0000
198+
[ts] => 1774746000
199+
[time] => 2026-03-29T01:00:00+00:00
201200
[offset] => 3600
202201
[isdst] => 1
203202
[abbr] => BST

‎reference/datetime/datetimezone/listabbreviations.xml‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
32
<!-- EN-Revision: 02ff7fef5b34cf8f5395180d9d39fb64d9398d00 Maintainer: samesch Status: ready -->
43
<!-- Reviewed: no -->
54
<refentry xml:id="datetimezone.listabbreviations" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -63,7 +62,6 @@
6362
<?php
6463
$timezone_abbreviations = DateTimeZone::listAbbreviations();
6564
print_r($timezone_abbreviations["acst"]);
66-
?>
6765
]]>
6866
</programlisting>
6967
&example.outputs.similar;
@@ -73,30 +71,44 @@ Array
7371
(
7472
[0] => Array
7573
(
76-
[dst] => 1
77-
[offset] => -14400
78-
[timezone_id] => America/Porto_Acre
74+
[dst] =>
75+
[offset] => 34200
76+
[timezone_id] => Australia/Adelaide
7977
)
8078
8179
[1] => Array
8280
(
83-
[dst] => 1
84-
[offset] => -14400
85-
[timezone_id] => America/Eirunepe
81+
[dst] =>
82+
[offset] => 34200
83+
[timezone_id] => Australia/Broken_Hill
8684
)
8785
8886
[2] => Array
8987
(
90-
[dst] => 1
91-
[offset] => -14400
92-
[timezone_id] => America/Rio_Branco
88+
[dst] =>
89+
[offset] => 34200
90+
[timezone_id] => Australia/Darwin
9391
)
9492
9593
[3] => Array
9694
(
97-
[dst] => 1
98-
[offset] => -14400
99-
[timezone_id] => Brazil/Acre
95+
[dst] =>
96+
[offset] => 34200
97+
[timezone_id] => Australia/North
98+
)
99+
100+
[4] => Array
101+
(
102+
[dst] =>
103+
[offset] => 34200
104+
[timezone_id] => Australia/South
105+
)
106+
107+
[5] => Array
108+
(
109+
[dst] =>
110+
[offset] => 34200
111+
[timezone_id] => Australia/Yancowinna
100112
)
101113
102114
)

‎reference/datetime/functions/checkdate.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
32
<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: sammywg Status: ready -->
43
<!-- Reviewed: yes -->
54
<!-- Rev-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Reviewer: samesch -->
@@ -75,7 +74,6 @@
7574
<?php
7675
var_dump(checkdate(12, 31, 2000));
7776
var_dump(checkdate(2, 29, 2001));
78-
?>
7977
]]>
8078
</programlisting>
8179
&example.outputs;

‎reference/datetime/functions/date-default-timezone-get.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
32
<!-- EN-Revision: 4bf21e8867650755d5dea13e01049d2825486ea2 Maintainer: samesch Status: ready -->
43
<!-- Reviewed: no -->
54
<refentry xml:id="function.date-default-timezone-get" xmlns="http://docbook.org/ns/docbook">
@@ -64,14 +63,12 @@
6463
date_default_timezone_set('Europe/London');
6564
6665
if (date_default_timezone_get()) {
67-
echo 'date_default_timezone_set: ' . date_default_timezone_get() . '<br />';
66+
echo 'date_default_timezone_set: ' . date_default_timezone_get() . "\n";
6867
}
6968
7069
if (ini_get('date.timezone')) {
7170
echo 'date.timezone: ' . ini_get('date.timezone');
7271
}
73-
74-
?>
7572
]]>
7673
</programlisting>
7774
&example.outputs.similar;
@@ -91,7 +88,6 @@ date.timezone: Europe/London
9188
<?php
9289
date_default_timezone_set('America/Los_Angeles');
9390
echo date_default_timezone_get() . ' => ' . date('e') . ' => ' . date('T');
94-
?>
9591
]]>
9692
</programlisting>
9793
&example.outputs;

‎reference/datetime/functions/date-default-timezone-set.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
32
<!-- EN-Revision: 0a10abc50524fcbb21807b5e6ebffb3b86d45907 Maintainer: cmb Status: ready -->
43
<!-- Reviewed: yes -->
54
<!-- Rev-Revision: 0a10abc50524fcbb21807b5e6ebffb3b86d45907 Reviewer: samesch -->
@@ -66,13 +65,13 @@
6665
date_default_timezone_set('America/Los_Angeles');
6766
6867
$script_tz = date_default_timezone_get();
68+
$ini_tz = ini_get('date.timezone');
6969
70-
if (strcmp($script_tz, ini_get('date.timezone'))){
70+
if (strcmp($script_tz, $ini_tz)){
7171
echo 'Die Script-Zeitzone unterscheidet sich von der ini-set-Zeitzone.';
7272
} else {
7373
echo 'Die Script-Zeitzone und die ini-set-Zeitzone stimmen überein.';
7474
}
75-
?>
7675
]]>
7776
</programlisting>
7877
</example>

‎reference/datetime/functions/date-parse-from-format.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
32
<!-- EN-Revision: 4d13f5e4b45f699eb855a5e84736aeda2ebd142a Maintainer: samesch Status: ready -->
43
<!-- Reviewed: no -->
54
<refentry xml:id="function.date-parse-from-format" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -147,7 +146,6 @@
147146
<?php
148147
$date = "6.1.2009 13:00+01:00";
149148
print_r(date_parse_from_format("j.n.Y H:iP", $date));
150-
?>
151149
]]>
152150
</programlisting>
153151
&example.outputs;
@@ -161,7 +159,7 @@ Array
161159
[hour] => 13
162160
[minute] => 0
163161
[second] => 0
164-
[fraction] =>
162+
[fraction] => 0
165163
[warning_count] => 0
166164
[warnings] => Array
167165
(
@@ -195,7 +193,6 @@ echo "Anzahl der Warnungen: ", $parsed['warning_count'], "\n";
195193
foreach ($parsed['warnings'] as $position => $message) {
196194
echo "\tAn Position {$position}: {$message}\n";
197195
}
198-
?>
199196
]]>
200197
</programlisting>
201198
&example.outputs;
@@ -221,15 +218,14 @@ echo "Anzahl der Fehler: ", $parsed['error_count'], "\n";
221218
foreach ($parsed['errors'] as $position => $message) {
222219
echo "\tAn Position {$position}: {$message}\n";
223220
}
224-
?>
225221
]]>
226222
</programlisting>
227223
&example.outputs;
228224
<screen>
229225
<![CDATA[
230226
Anzahl der Fehler: 3
231227
An Position 15: A two digit hour could not be found
232-
An Position 19: Data missing
228+
An Position 19: Not enough data available to satisfy format
233229
]]>
234230
</screen>
235231
</example>

‎reference/datetime/functions/date-parse.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- $Revision$ -->
32
<!-- EN-Revision: 50dcf55ce543220dd8375df2fdb4f7db702b9c9f Maintainer: samesch Status: ready -->
43
<!-- Reviewed: no -->
54
<refentry xml:id="function.date-parse" xmlns="http://docbook.org/ns/docbook">
@@ -153,7 +152,6 @@
153152
<![CDATA[
154153
<?php
155154
var_dump(date_parse("2006-12-12 10:00:00.5"));
156-
?>
157155
]]>
158156
</programlisting>
159157
&example.outputs;
@@ -203,7 +201,6 @@ array(12) {
203201
<![CDATA[
204202
<?php
205203
var_dump(date_parse("June 2nd, 2022, 10:28:17 BST"));
206-
?>
207204
]]>
208205
</programlisting>
209206
&example.outputs;
@@ -254,7 +251,6 @@ array(16) {
254251
<![CDATA[
255252
<?php
256253
var_dump(date_parse("June 2nd, 2022, 10:28:17 Europe/London"));
257-
?>
258254
]]>
259255
</programlisting>
260256
&example.outputs;
@@ -307,7 +303,6 @@ array(14) {
307303
<![CDATA[
308304
<?php
309305
var_dump(date_parse("June 2nd, 2022"));
310-
?>
311306
]]>
312307
</programlisting>
313308
&example.outputs;
@@ -356,7 +351,6 @@ array(12) {
356351
<![CDATA[
357352
<?php
358353
var_dump(date_parse("2006-12-12 10:00:00.5 +1 week +1 hour"));
359-
?>
360354
]]>
361355
</programlisting>
362356
&example.outputs;
@@ -424,7 +418,6 @@ array(13) {
424418
<![CDATA[
425419
<?php
426420
var_dump(date_parse("Thursday, June 2nd"));
427-
?>
428421
]]>
429422
</programlisting>
430423
&example.outputs;

0 commit comments

Comments
 (0)