diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-03-23 01:51:46 +0100 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-03-23 01:51:46 +0100 |
| commit | 1d3340b4b483bd5a338f49af78533ed2241c587b (patch) | |
| tree | 762df6d84ca87784ab38df48e19870cc5d169b6c /module | |
| parent | Update TODO. (diff) | |
| download | calp-1d3340b4b483bd5a338f49af78533ed2241c587b.tar.gz calp-1d3340b4b483bd5a338f49af78533ed2241c587b.tar.xz | |
Fix time span formatting for HTML descriptions.
Diffstat (limited to 'module')
| -rw-r--r-- | module/output/html.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/module/output/html.scm b/module/output/html.scm index 4d623438..cb0ba9b5 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -52,9 +52,10 @@ (cond [(attr ev 'DTEND) => (lambda (e) (if (date= e (date+ s (date day: 1))) - (values (date->string s) "") + (date->string s) ; start = end, only return one value (values (date->string s) (date->string e))))] + ;; no end value, just return start [else (date->string s)]))] [else ; guaranteed datetime (let ((s (attr ev 'DTSTART)) @@ -311,8 +312,9 @@ (class "hidelink")) ,(attr ev 'SUMMARY))) (div - ,(let* ((start end (fmt-time-span ev))) - `(div ,start " — " ,end)) + ,(call-with-values (lambda () (fmt-time-span ev)) + (match-lambda* [(start end) `(div ,start " — " ,end)] + [(start) `(div ,start)])) ,(when (and=> (attr ev 'LOCATION) (negate string-null?)) `(div (b "Plats: ") ,(attr ev 'LOCATION))) ,(and=> (attr ev 'DESCRIPTION) (lambda (str) ((description-filter) ev str)))))) |