more subtitle, more other stuff for media files and xmls

_conferences/nook2022.md

@@ -2,6 +2,7 @@
 layout: conference
 title: Night of open Knowledge 2022
 acronym: nook2022
+name_after_title: true
 base_url: https://2022.nook-luebeck.de/
 logo: /assets/nook22.png
 ---

_conferences/nook2023.md

@@ -2,6 +2,7 @@
 layout: conference
 title: Night of open Knowledge 2023
 acronym: nook2023
+name_after_title: true
 base_url: https://2023.nook-luebeck.de/
 logo: /assets/nook23.png
 ---

_media/2019-11-09-openstreetmap-gute-karten-mit-qgis.md

@@ -16,6 +16,8 @@ mccc: "https://media.ccc.de/v/openstreetmap---gute-karten-mit-qgis"
 file: "https://video.chaotikum.net/nook19/2019-11-09-nook-openstreetmap-gute-karten-mit-qgis.mov"
 archive: "https://archive.org/details/2019-11-09-nook-openstreetmap-gute-karten-mit-qgis"
 slides: "https://2019.nook-luebeck.de/slides/openstreetmap---gute-karten-mit-qgis.pdf"
+closedcaption: "https://git.chaotikum.org/chaotikum/video/subtitles/-/raw/main/nook19/2019-11-09-nook-openstreetmap-gute-karten-mit-qgis.vtt"
+cccomputergen: true
 event: f88922eb-871a-4ada-b952-588332887768
 conferences:
 - nook2019

_media/2019-11-09-sportpsychologie-im-e-sport-same-same.md

@@ -15,6 +15,8 @@ yt: "https://www.youtube.com/watch?v=G3T4ILFErtk"
 mccc: "https://media.ccc.de/v/sportpsychologie-im-e-sport-same-same"
 file: "https://video.chaotikum.net/nook19/2019-11-09-nook-sportpsychologie-im-e-sport-same-same.mov"
 archive: "https://archive.org/details/2019-11-09-nook-sportpsychologie-im-e-sport-same-same"
+closedcaption: "https://git.chaotikum.org/chaotikum/video/subtitles/-/raw/main/nook19/2019-11-09-nook-sportpsychologie-im-e-sport-same-same.vtt"
+cccomputergen: true
 event: f88922eb-871a-4ada-b952-588332887768
 conferences:
 - nook2019

_media/2019-11-09-svg-verstehen-und-animieren.md

@@ -15,6 +15,8 @@ yt: "https://www.youtube.com/watch?v=J4WtjR_IUgA"
 mccc: "https://media.ccc.de/v/svg-verstehen-und-animieren"
 file: "https://video.chaotikum.net/nook19/2019-11-09-nook-svg-verstehen-und-animieren.mp4"
 archive: "https://archive.org/details/2019-11-09-nook-svg-verstehen-und-animieren"
+closedcaption: "https://git.chaotikum.org/chaotikum/video/subtitles/-/raw/main/nook19/2019-11-09-nook-svg-verstehen-und-animieren.vtt"
+cccomputergen: true
 event: f88922eb-871a-4ada-b952-588332887768
 conferences:
 - nook2019

_media/2019-11-09-wie-fair-ist-mein-geraet.md

@@ -16,6 +16,8 @@ mccc: "https://media.ccc.de/v/wie-fair-ist-mein-geraet"
 file: "https://video.chaotikum.net/nook19/2019-11-09-nook-wie-fair-ist-mein-geraet.mov"
 slides: "https://2019.nook-luebeck.de/slides/wie-fair-ist-mein-geraet.pdf"
 archive: "https://archive.org/details/2019-11-09-nook-wie-fair-ist-mein-geraet"
+closedcaption: "https://git.chaotikum.org/chaotikum/video/subtitles/-/raw/main/nook19/2019-11-09-nook-wie-fair-ist-mein-geraet.vtt"
+cccomputergen: true
 event: f88922eb-871a-4ada-b952-588332887768
 conferences:
 - nook2019

_media/2023-11-04-nook-by-numbers.md

@@ -15,7 +15,7 @@ file: https://video.chaotikum.net/nook23/2023-11-04-nook-by-numbers.mov
 yt: https://www.youtube.com/watch?v=vvruxiDJ_-c
 ticket_id: 1508
 event: a047c701-1ec4-48a3-9d8e-5aaa94fd7158
-closedcaption: "https://git.chaotikum.org/chaotikum/video/subtitles/-/raw/main/nook23/2023-11-04-nook-by-numbers.srt"
+closedcaption: "https://git.chaotikum.org/chaotikum/video/subtitles/-/raw/main/nook23/2023-11-04-nook-by-numbers.vtt"
 cccomputergen: true
 frontpage: true
 conferences:

media_ext.xml

@@ -20,6 +20,11 @@ layout: null
         {% endfor -%}
       {% endcapture -%}
 
+      {% capture persons2 -%}
+        {% for person in video.persons %}{{person}}{% unless forloop.last %}und {% endunless %}
+        {% endfor -%}
+      {% endcapture -%}
+
       {% if video.event and video.event != '' -%}
         {% for e in site.events -%}
           {% if e.uid == video.event -%}
@@ -34,7 +39,7 @@ layout: null
         {% assign recording_date =  event.eventdate -%}
       {% endif -%}
 
-    	{% if releasedate < nowunix and optout == false and video.file and video.file  != '' %}
+    	{% if optout == false and video.file and video.file  != '' %}
           <item>
               {% assign name_before_title = false -%} 
               {% for conf in video.conferences -%}
@@ -44,6 +49,14 @@ layout: null
                   {% endif -%}
                 {% endfor -%}
               {% endfor -%}
+              {% assign name_after_title = false -%} 
+              {% for conf in video.conferences -%}
+                {% for c in site.conferences -%}
+                  {% if conf == c.acronym and c.name_after_title -%}
+                    {% assign name_after_title = true -%}  
+                  {% endif -%}
+                {% endfor -%}
+              {% endfor -%}
             <title>{% if video.persons and name_before_title -%}{{persons}}: {% endif -%}{{video.title| xml_escape }}
             {% for conf in video.conferences -%}
               {% for c in site.conferences -%}
@@ -51,10 +64,27 @@ layout: null
                   {% if c.ecki -%}[{{c.title| xml_escape}}]{% endif -%}
                 {% endif -%}
               {% endfor -%}
-            {% endfor -%}</title>
-            <description>{{ video.content | strip_html | xml_escape }}</description>
+            {% endfor -%}
+            {% if video.persons and name_after_title -%} von {{persons2}} {% endif -%}</title>
+            {% capture ccontent %}{{video.content | strip_html | xml_escape }}{% endcapture -%}
+            {% if ccontent and ccontent != '' -%}
+            <description>{{ccontent}} &#xA;
+              {% for conf in video.conferences %}
+                {% for c in site.conferences -%}
+                  {% if conf == c.acronym and c.content != '' -%}
+                    {{c.content | strip_html | xml_escape }} &#xA;
+                  {% endif -%}
+                {% endfor -%}
+              {% endfor %}
+              {% if video.licence and video.licence  != '' -%}
+                {{video.licence | strip_html | xml_escape }} 
+              {% else -%}
+                This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License (CC BY NC ND 4.0). https://creativecommons.org/licenses/by-nc-nd/4.0/
+              {% endif -%}</description>
+            {% endif -%}
             <recDate>{{ recording_date | date_to_rfc822 }}</recDate>
             <pubDate>{{ video.date | date_to_rfc822 }}</pubDate>
+            <license>{{video.licence}}</license>
             <persons>{{persons}}</persons>
             <link>{{ video.url | prepend: site.baseurl | prepend: site.url }}</link>
             {% if video.file -%}