💬 date for 2nd/3rd reading is now official

This commit is contained in:
DrMaxNix 2024-04-09 18:43:50 +02:00
parent 2d529f0620
commit 815cfb8b24
2 changed files with 16 additions and 64 deletions

View File

@ -322,45 +322,24 @@
</div>
</div>
<div id="lesung-2" class="item next">
<div class="connector">
<span class="waypoint ti ti-podium"></span>
</div>
<div class="box">
<?php
$timeline_date = $dict->get("timeline_lesung_2_date");
if($timeline_date !== null){
?>
<span class="extra"><i class="ti ti-calendar"></i><?= $timeline_date ?></span>
<?php } ?>
<span class="title"><button class="copylink ti ti-link"></button><?= $dict->get("timeline_lesung_2_title") ?></span>
<?php
$timeline_lesung_2_text = $dict->get("timeline_lesung_2_text");
foreach($timeline_lesung_2_text as $one_timeline_lesung_2_text_line){
echo("<span>" . $one_timeline_lesung_2_text_line . "</span>");
}
?>
</div>
</div>
<div id="lesung-3" class="item">
<div id="lesung-2" class="item"></div>
<div id="lesung-3" class="item"></div>
<div id="lesung-2-3" class="item next">
<div class="connector">
<span class="waypoint ti ti-hand-stop"></span>
</div>
<div class="box">
<?php
$timeline_date = $dict->get("timeline_lesung_3_date");
$timeline_date = $dict->get("timeline_lesung_2_3_date");
if($timeline_date !== null){
?>
<span class="extra"><i class="ti ti-calendar"></i><?= $timeline_date ?></span>
<?php } ?>
<span class="title"><button class="copylink ti ti-link"></button><?= $dict->get("timeline_lesung_3_title") ?></span>
<span class="title"><button class="copylink ti ti-link"></button><?= $dict->get("timeline_lesung_2_3_title") ?></span>
<?php
$timeline_lesung_3_text = $dict->get("timeline_lesung_3_text");
$timeline_lesung_3_text = $dict->get("timeline_lesung_2_3_text");
foreach($timeline_lesung_3_text as $one_timeline_lesung_3_text_line){
echo("<span>" . $one_timeline_lesung_3_text_line . "</span>");
}

View File

@ -278,50 +278,23 @@
"timeline_lesung_2_date" => [
"de" => null,
"en" => null
"timeline_lesung_2_3_date" => [
"de" => "12 Apr 2024, 13:10",
"en" => "12 Apr 2024, 13:10"
],
"timeline_lesung_2_title" => [
"de" => "2. Lesung",
"en" => "2nd Reading"
"timeline_lesung_2_3_title" => [
"de" => "2. und 3. Lesung mit Schlussabstimmung",
"en" => "2nd and 3rd Reading with Final Vote"
],
"timeline_lesung_2_text" => [
"timeline_lesung_2_3_text" => [
"de" => [
"Die zweite Lesung im Bundestag diskutiert die Ergebnisse der Ausschüsse. Einzelne Abgeordnete können Änderungen beantragen.",
"<span class=\"inline gray\">Hinweis: In der Tagesordnung des Deutschen Bundestags ist derzeit noch kein Termin für die zweite Lesung angesetzt. Nächste Sitzungswoche: ab 10 Apr 2024 (Stand: 02 Apr 2024)</span>"
"Wie auch hier, werden die Lesungen 2 und 3 oft zusammengelegt. Die zweite Lesung im Bundestag diskutiert die Ergebnisse der Ausschüsse. Einzelne Abgeordnete können Änderungen beantragen. Am Ende der dritten Lesung wird abschließend über das Gesetz abgestimmt."
],
"en" => [
"The second reading in the <i>Bundestag</i> (Parliament) discusses the results of the committees. Individual members of the Bundestag can request changes.",
"<span class=\"inline gray\">Note: The agenda of the <i>Bundestag</i> (Parliament) does currently not contain an appointment for the second reading. Next session week: from 10 Apr 2024 (As of 02 Apr 2024)</span>"
"As seen here, reading 2 and 3 are often combined. The second reading in the <i>Bundestag</i> (Parliament) discusses the results of the committees. Individual members of the Bundestag can request changes. At the end of the third reading, a final vote is taken on the law."
]
],
"timeline_lesung_2_button" => [
"de" => "",
"en" => ""
],
"timeline_lesung_3_date" => [
"de" => null,
"en" => null
],
"timeline_lesung_3_title" => [
"de" => "3. Lesung mit Schlussabstimmung",
"en" => "3rd Reading and Final Vote"
],
"timeline_lesung_3_text" => [
"de" => [
"Am Ende der dritten Lesung wird abschließend über das Gesetz abgestimmt."
],
"en" => [
"At the end of the third reading, a final vote is taken on the law."
]
],
"timeline_lesung_3_button" => [
"timeline_lesung_2_3_button" => [
"de" => "",
"en" => ""
],