Merge pull request #122 from denog/MeetupFixes

Meetup fixes
denog · Jan 16, 2024 · 37cc083 · 37cc083
2 parents 2bd27b8 + 1899976
commit 37cc083
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/de/events/meetup-2022-01.md b/de/events/meetup-2022-01.md
@@ -4,7 +4,7 @@ lang: de
 title: DENOG Meetup 2022-01
 year: 2022
 city: Virtual
-date: 2023-02-08
+date: 2022-02-08
 meeting: Meetup 2022-01
 meeting_type: meetup
 home: true

diff --git a/de/events/meetups2023.md b/de/events/meetups2023.md
@@ -7,16 +7,18 @@ breadcrumbs: [<a href="../archiv.html">Archiv</a>]
 ---
 {% include text-expand.html %}
 
-# DENOG Meetups 2023
+# DENOG Meetups {{page.year}}
 
-{% assign meetingArray = site.pages|where: "year", page.year|where: "meeting_type", "meetup"|where: "lang", page.lang | sort: 'date' %}
-{% assign currentYear = site.time|date: '%Y'|plus: 0 %}
-{% assign presentations = site.static_files | where: "media", true %}
+{% assign meetingArray = site.pages|where: "lang", page.lang|sort: 'date' %}
+{% assign selectedYear = page.year %}
 
 {% for entry in meetingArray reversed %}
     {% if entry.meeting %}
         {% if entry.home and entry.home == true %}
+            {% assign checkYear = entry.date|date: '%Y'|plus: 0 %}
+            {% if checkYear == selectedYear and entry.meeting_type == 'meetup' %}
 **{{ entry.date }}**: [{{ entry.meeting }}, {{ entry.city }}]({{ entry.url }})
+           {% endif %}
         {% endif %}
     {% endif %}
 {% endfor %}
diff --git a/de/events/meetups2024.md b/de/events/meetups2024.md
@@ -7,16 +7,18 @@ breadcrumbs: [<a href="../archiv.html">Archiv</a>]
 ---
 {% include text-expand.html %}
 
-# DENOG Meetups 2024
+# DENOG Meetups {{page.year}}
 
-{% assign meetingArray = site.pages|where: "year", page.year|where: "meeting_type", "meetup"|where: "lang", page.lang | sort: 'date' %}
-{% assign currentYear = site.time|date: '%Y'|plus: 0 %}
-{% assign presentations = site.static_files | where: "media", true %}
+{% assign meetingArray = site.pages|where: "lang", page.lang|sort: 'date' %}
+{% assign selectedYear = page.year %}
 
 {% for entry in meetingArray reversed %}
     {% if entry.meeting %}
         {% if entry.home and entry.home == true %}
+            {% assign checkYear = entry.date|date: '%Y'|plus: 0 %}
+            {% if checkYear == selectedYear and entry.meeting_type == 'meetup' %}
 **{{ entry.date }}**: [{{ entry.meeting }}, {{ entry.city }}]({{ entry.url }})
+           {% endif %}
         {% endif %}
     {% endif %}
 {% endfor %}
diff --git a/de/events/ripe84.md b/de/events/ripe84.md
@@ -6,7 +6,7 @@ year: 2022
 city: Berlin
 date: 2022-05-15
 meeting: RIPE 84 Pre-Social
-meeting_type: meetup
+meeting_type: other
 home: true
 breadcrumbs: [<a href="../archiv.html">Archiv</a>]
 ---