🔀 merge pull request 'v1.0.29' (#29) from dev into main
Reviewed-on: #29
This commit is contained in:
commit
8808fa9a32
|
|
@ -0,0 +1,2 @@
|
|||
meta.local.php
|
||||
init.local.php
|
||||
2
meta.php
2
meta.php
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
// VERSION //
|
||||
static::$version = "1.0.28";
|
||||
static::$version = "1.0.29";
|
||||
|
||||
|
||||
// DEPENDENCIES //
|
||||
|
|
|
|||
|
|
@ -231,6 +231,36 @@
|
|||
</div>
|
||||
|
||||
<div class="item next">
|
||||
<div class="connector">
|
||||
<span class="waypoint ti ti-podium"></span>
|
||||
</div>
|
||||
<div class="box">
|
||||
<?php
|
||||
$timeline_date = $dict->get("timeline_lesung_1_date");
|
||||
if($timeline_date !== null){
|
||||
?>
|
||||
<span class="extra"><i class="ti ti-calendar"></i><?= $timeline_date ?></span>
|
||||
<?php } ?>
|
||||
|
||||
<span class="title"><?= $dict->get("timeline_lesung_1_title") ?></span>
|
||||
|
||||
<?php
|
||||
$timeline_lesung_1_text = $dict->get("timeline_lesung_1_text");
|
||||
foreach($timeline_lesung_1_text as $one_timeline_lesung_1_text_line){
|
||||
echo("<span>" . $one_timeline_lesung_1_text_line . "</span>");
|
||||
}
|
||||
?>
|
||||
|
||||
<div class="button-list">
|
||||
<a href="https://web.archive.org/web/20231110163959/https://www.bundestag.de/resource/blob/189966/25d1af1d598a5d25d415accc029ff89b/Ablaufplan-data.pdf" target="_blank" class="button">
|
||||
<span class="text"><?= $dict->get("timeline_lesung_1_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-messages"></span>
|
||||
</div>
|
||||
|
|
@ -260,29 +290,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="item">
|
||||
<div class="connector">
|
||||
<span class="waypoint ti ti-podium"></span>
|
||||
</div>
|
||||
<div class="box">
|
||||
<?php
|
||||
$timeline_date = $dict->get("timeline_lesung_1_date");
|
||||
if($timeline_date !== null){
|
||||
?>
|
||||
<span class="extra"><i class="ti ti-calendar"></i><?= $timeline_date ?></span>
|
||||
<?php } ?>
|
||||
|
||||
<span class="title"><?= $dict->get("timeline_lesung_1_title") ?></span>
|
||||
|
||||
<?php
|
||||
$timeline_lesung_1_text = $dict->get("timeline_lesung_1_text");
|
||||
foreach($timeline_lesung_1_text as $one_timeline_lesung_1_text_line){
|
||||
echo("<span>" . $one_timeline_lesung_1_text_line . "</span>");
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="item">
|
||||
<div class="connector">
|
||||
<span class="waypoint ti ti-podium"></span>
|
||||
|
|
|
|||
|
|
@ -214,34 +214,9 @@
|
|||
|
||||
|
||||
|
||||
"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" => "15 Nov 2023",
|
||||
"en" => "15 Nov 2023"
|
||||
"de" => "15 Nov 2023, 18:00 - 18:45 MEZ",
|
||||
"en" => "15 Nov 2023, 18:00 - 18:45 CET"
|
||||
],
|
||||
"timeline_lesung_1_title" => [
|
||||
"de" => "1. Lesung",
|
||||
|
|
@ -250,18 +225,43 @@
|
|||
"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: Das Datum <i>15 Nov 2023</i> stammt aus einem Beitrag von Sven Lehmann auf <i>twitter.com</i>. Die Tagesordnung des Deutschen Bundestags für diese Sitzungswoche ist noch nicht öffentlich. (Stand: 09 Nov 2023)</span>",
|
||||
"<span class=\"inline gray\">Hinweis: Der Gesetzentwurf liegt dem Bundestag bereits als Drucksache <i>20/9049</i> vor. (Stand: 09 Nov 2023)</span>"
|
||||
"<span class=\"inline gray\">Hinweis: Das SBGG steht als <i>TOP 5</i> auf der Tagesordnung, der Gesetzentwurf liegt als Drucksache <i>20/9049</i> vor. (Stand: 10 Nov 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 date <i>15 Nov 2023</i> is derived from a post by Sven Lehmann on <i>twitter.com</i>. The agenda of the Bundestag for the mentioned week is not public yet. (As of 09 Nov 2023)</span>",
|
||||
"<span class=\"inline gray\">Note: The government draft has already been submitted to the Bundestag as <i>Drucksache 20/9049</i>. (As of 09 Nov 2023)</span>"
|
||||
"<span class=\"inline gray\">Note: The SBGG is listed as <i>TOP 5</i> on the agenda, the government draft is available as <i>Drucksache 20/9049</i>. (As of 10 Nov 2023)</span>"
|
||||
]
|
||||
],
|
||||
"timeline_lesung_1_button" => [
|
||||
"de" => "",
|
||||
"en" => ""
|
||||
"de" => "Tagesordnung KW46",
|
||||
"en" => "Agenda for W46"
|
||||
],
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
"timeline_ausschuss_anhoerung_date" => [
|
||||
"de" => null,
|
||||
"en" => null
|
||||
],
|
||||
"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.",
|
||||
"<span class=\"inline gray\">Hinweis: Die für 13 Nov 2023 angesetzte Anhörung wurde abgesagt. Ein Ersatztermin wurde noch nicht bekannt gegeben. (Stand: 10 Nov 2023)</span>"
|
||||
],
|
||||
"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.",
|
||||
"<span class=\"inline gray\">Note: The hearing planned for 13 Nov 2023 has been canceled. An alternative date has not been published yet. (As of 10 Nov 2023)</span>"
|
||||
]
|
||||
],
|
||||
"timeline_ausschuss_anhoerung_button" => [
|
||||
"de" => "Sachverständigenliste",
|
||||
"en" => "List of experts (German)"
|
||||
],
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue