From e350a42fce541bbd15da59f76fab2bc535947368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Sat, 18 Jul 2020 23:57:36 +0200
Subject: Fix RRULE/UNTIL in xCal.

---
 module/vcomponent/recurrence/internal.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'module')

diff --git a/module/vcomponent/recurrence/internal.scm b/module/vcomponent/recurrence/internal.scm
index ec8c10d4..aab65959 100644
--- a/module/vcomponent/recurrence/internal.scm
+++ b/module/vcomponent/recurrence/internal.scm
@@ -125,8 +125,14 @@
 (define-public (recur-rule->rrule-sxml rrule)
   (map-fields
    (lambda (field value)
-    `(,(downcase-symbol field)
-      ,(field->string field value)))
+     (if (string-ci=? "UNTIL" (symbol->string field))
+         `(until
+           ,(if (date? value)
+                (date->string value "~Y-~m-~d")
+                (datetime->string
+                 value "~Y-~m-~dT~H:~M:~S~Z")))
+         `(,(downcase-symbol field)
+           ,(field->string field value))))
    rrule))
 
 
-- 
cgit v1.2.3