From 7c28154d13bbbb57ad187ca2fe9b6110dcc3d3a9 Mon Sep 17 00:00:00 2001 From: Valentin Date: Mon, 26 Oct 2026 13:46:57 +0100 Subject: Termine maschinenlesbar gemacht --- www/framework/event.nix | 15 +++++++++------ www/termine.nix | 12 ++++++------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/www/framework/event.nix b/www/framework/event.nix index f0489db..1704263 100644 --- a/www/framework/event.nix +++ b/www/framework/event.nix @@ -179,13 +179,16 @@ default = let date = lib.concatStringsSep "." (lib.reverseList (lib.splitString "-" cfg.date.start)); - time = - if cfg.time.end == null then - "ab ${cfg.time.start}" - else - "von ${cfg.time.start} bis ${cfg.time.end}"; + start = text: ''''; + end = ''''; in - "${weekday cfg.date.start}, ${date} ${time}"; + "${weekday cfg.date.start}, " + + ( + if cfg.time.end == null then + start "${date} ab ${cfg.time.start}" + else + "${start "${date} von ${cfg.time.start}"} bis ${end}" + ); defaultText = lib.literalMD "Wochentag, Datum und Uhrzeit aus den Zeitangaben des Termins"; }; venue = mkOption { diff --git a/www/termine.nix b/www/termine.nix index 212bf1a..45727a5 100644 --- a/www/termine.nix +++ b/www/termine.nix @@ -27,19 +27,19 @@ type = functionTo str; readOnly = true; default = self: '' -
${self.title}
-
- +
${self.title}
+
+ ${self.datetime-range-text} -
- ${self.address.name}
+
+ ${self.address.name}
${with lib; concatStringsSep ", " (splitString "\n" (trim self.address.text))} + }">${with lib; concatStringsSep ", " (splitString "\n" (trim self.address.text))}
${ -- cgit v1.3.1