From 78fd74622dca5f2def261506c3f8d4c0a940a6c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Fri, 14 Oct 2022 21:08:16 +0200
Subject: Change gettext '_' to 'G_'.

Guile 3 reserves _ for other stuff.
---
 module/vcomponent/datetime/output.scm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'module/vcomponent/datetime/output.scm')

diff --git a/module/vcomponent/datetime/output.scm b/module/vcomponent/datetime/output.scm
index 614438da..736db0a4 100644
--- a/module/vcomponent/datetime/output.scm
+++ b/module/vcomponent/datetime/output.scm
@@ -17,27 +17,27 @@
   ;; [FRR]
   ;; Part of the sentance "Repeated [every two weeks], except on ~a, ~a & ~a"
   ;; See everything tagged [FRR]
-  `(,(_ "Repeated ")
+  `(,(G_ "Repeated ")
     ,((@ (vcomponent recurrence display) format-recurrence-rule) (prop ev 'RRULE))
     ,@(awhen (prop* ev 'EXDATE)
              (list
               ;; See [FRR]
-              (_ ", except on ")
+              (G_ ", except on ")
               (add-enumeration-punctuation
                (map (lambda (d)
                       ;; TODO show year if different from current year
                       (if (date? d)
                           ;; [FRR] Exception date without time
-                          (date->string d (_ "~e ~b"))
+                          (date->string d (G_ "~e ~b"))
                           ;; NOTE only show time when it's different than the start time?
                           ;; or possibly only when FREQ is hourly or lower.
                           (if (memv ((@ (vcomponent recurrence internal) freq)
                                   (prop ev 'RRULE))
                                  '(HOURLY MINUTELY SECONDLY))
                               ;; [FRR] Exception date with time
-                              (datetime->string d (_ "~e ~b ~k:~M"))
+                              (datetime->string d (G_ "~e ~b ~k:~M"))
                               ;; [FRR] Exception date without time
-                              (datetime->string d (_ "~e ~b")))))
+                              (datetime->string d (G_ "~e ~b")))))
                     (map value it)))))
     "."))
 
@@ -52,7 +52,7 @@
       ;; Warning message for failure to format description.
       ;; First argument is name of warning/error,
       ;; second is error arguments
-      (warning (_ "~a on formatting description, ~s") err args)
+      (warning (G_ "~a on formatting description, ~s") err args)
       str)))
 
 ;; Takes an event, and returns a pretty string for the time interval
@@ -64,9 +64,9 @@
                      => (lambda (e)
                           ;; start = end, only return one value
                           (if (date= e (date+ s (date day: 1)))
-                              (_ "~Y-~m-~d")
-                              (values (_ "~Y-~m-~d")
-                                      (_ "~Y-~m-~d"))))]
+                              (G_ "~Y-~m-~d")
+                              (values (G_ "~Y-~m-~d")
+                                      (G_ "~Y-~m-~d"))))]
                     ;; no end value, just return start
                     [else (date->string s)]))]
         [else ; guaranteed datetime
@@ -74,10 +74,10 @@
                (e (prop ev 'DTEND)))
            (if e
                (let ((fmt-str (if (date= (get-date s) (get-date e))
-                                  (_ "~H:~M")
+                                  (G_ "~H:~M")
                                   ;; Note the non-breaking space
-                                  (_ "~Y-~m-~d ~H:~M"))))
+                                  (G_ "~Y-~m-~d ~H:~M"))))
 
                  (values fmt-str fmt-str))
                ;; Note the non-breaking space
-               (_ "~Y-~m-~d ~H:~M")))]))
+               (G_ "~Y-~m-~d ~H:~M")))]))
-- 
cgit v1.2.3