🔀 merge pull request 'v1.0.27' (#27) from dev into main

Reviewed-on: #27
This commit is contained in:
DrMaxNix 2023-10-28 17:17:29 +02:00
commit 9ac553e8bb
4 changed files with 58 additions and 3 deletions

View File

@ -1,6 +1,6 @@
<?php
// VERSION //
static::$version = "1.0.26";
static::$version = "1.0.27";
// DEPENDENCIES //

View File

@ -231,6 +231,36 @@
</div>
<div class="item next">
<div class="connector">
<span class="waypoint ti ti-messages"></span>
</div>
<div class="box">
<?php
$timeline_date = $dict->get("timeline_ausschuss_anhoerung_date");
if($timeline_date !== null){
?>
<span class="extra"><i class="ti ti-calendar"></i><?= $timeline_date ?></span>
<?php } ?>
<span class="title"><?= $dict->get("timeline_ausschuss_anhoerung_title") ?></span>
<?php
$timeline_ausschuss_anhoerung_text = $dict->get("timeline_ausschuss_anhoerung_text");
foreach($timeline_ausschuss_anhoerung_text as $one_timeline_ausschuss_anhoerung_text_line){
echo("<span>" . $one_timeline_ausschuss_anhoerung_text_line . "</span>");
}
?>
<div class="button-list">
<a href="https://web.archive.org/web/20231028143821/https://www.bundestag.de/resource/blob/973790/fc053d2718887a9cfb4aed56ef360b3e/Liste-der-Sachverstaendigen-data.pdf" target="_blank" class="button">
<span class="text"><?= $dict->get("timeline_ausschuss_anhoerung_button") ?></span>
<span class="icon ti ti-external-link"></span>
</a>
</div>
</div>
</div>
<div class="item">
<div class="connector">
<span class="waypoint ti ti-podium"></span>
</div>

View File

@ -214,6 +214,31 @@
"timeline_ausschuss_anhoerung_date" => [
"de" => "13 Nov 2023",
"en" => "13 Nov 2023"
],
"timeline_ausschuss_anhoerung_title" => [
"de" => "Öffentliche Anhörung im Familienausschuss",
"en" => "Public hearing in the family committee"
],
"timeline_ausschuss_anhoerung_text" => [
"de" => [
"Als Vorbereitung auf die Sitzungen im Bundestag hält der Ausschuss für Familie, Senioren, Frauen und Jugend eine öffentliche Anhörung, zu der die Parteien des Bundestages Sachverständige einladen, welche ihre Einschätzung zum SBGG geben und zum Thema informieren."
],
"en" => [
"In preparation for the meetings in the Bundestag, the Committee on Family, Seniors, Women and Youth holds a public hearing to which the parties of the Bundestag invite experts who give their assessment of the SBGG and inform about the topic."
]
],
"timeline_ausschuss_anhoerung_button" => [
"de" => "Sachverständigenliste",
"en" => "List of experts (German)"
],
"timeline_lesung_1_date" => [
"de" => null,
"en" => null
@ -225,11 +250,11 @@
"timeline_lesung_1_text" => [
"de" => [
"In der ersten Lesung im Bundestag wird der Regierungsentwurf zum ersten mal gemeinsam mit den anderen Parteien debattiert. Danach wird der Gesetzentwurf an die zuständigen Ausschüsse übergeben, wo er weiter beraten wird.",
"<span class=\"inline gray\">Hinweis: In der Tagesordnung des Deutschen Bundestags ist derzeit noch kein Termin für die erste Lesung angesetzt. (Stand: 20 Okt 2023)</span>"
"<span class=\"inline gray\">Hinweis: In der Tagesordnung des Deutschen Bundestags ist derzeit noch kein Termin für die erste Lesung angesetzt. (Stand: 28 Okt 2023)</span>"
],
"en" => [
"In the first reading in the <i>Bundestag</i> (Parliament), the government draft is debated for the first time together with the other parties. After that, the bill will be passed to the relevant committees, where it will be discussed further.",
"<span class=\"inline gray\">Note: The agenda of the <i>Bundestag</i> (Parliament) does currently not contain an appointment for the first reading. (As of 20 Oct 2023)</span>"
"<span class=\"inline gray\">Note: The agenda of the <i>Bundestag</i> (Parliament) does currently not contain an appointment for the first reading. (As of 28 Oct 2023)</span>"
]
],
"timeline_lesung_1_button" => [

Binary file not shown.

After

Width:  |  Height:  |  Size: 359 KiB