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/formats/ical/output.scm |  2 +-
 module/vcomponent/formats/ical/parse.scm  | 15 +++++++++------
 module/vcomponent/formats/ical/types.scm  |  4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'module/vcomponent/formats/ical')

diff --git a/module/vcomponent/formats/ical/output.scm b/module/vcomponent/formats/ical/output.scm
index da891fa6..e4fad90a 100644
--- a/module/vcomponent/formats/ical/output.scm
+++ b/module/vcomponent/formats/ical/output.scm
@@ -96,7 +96,7 @@
       (get-writer 'TEXT)]
 
      [else
-      (warning (_ "Unknown key ~a") key)
+      (warning (G_ "Unknown key ~a") key)
       (get-writer 'TEXT)]))
 
   (catch #t #; 'wrong-type-arg
diff --git a/module/vcomponent/formats/ical/parse.scm b/module/vcomponent/formats/ical/parse.scm
index 49f8f101..252a155e 100644
--- a/module/vcomponent/formats/ical/parse.scm
+++ b/module/vcomponent/formats/ical/parse.scm
@@ -14,6 +14,9 @@
   :use-module (calp translation)
   :export (parse-calendar))
 
+;;; TODO a few translated strings here contain explicit newlines. Check if that
+;;;      is preserved through the translation.
+
 (define string->symbol
   (let ((ht (make-hash-table 1000)))
     (lambda (str)
@@ -124,7 +127,7 @@
       (let ((vv (parser params value)))
         (when (list? vv)
           (scm-error 'parse-error "enum-parser"
-                     (_ "List in enum field")
+                     (G_ "List in enum field")
                      #f #f))
         (let ((v (string->symbol vv)))
           (unless (memv v enum)
@@ -160,7 +163,7 @@
            (lambda (params value)
              (let ((v ((get-parser 'TEXT) params value)))
                (unless (= 1 (length v))
-                 (warning (_ "List in non-list field: ~s") v))
+                 (warning (G_ "List in non-list field: ~s") v))
                (string-join v ",")))]
 
           ;; TEXT, but allow a list
@@ -198,7 +201,7 @@
 
           [(memv key '(REQUEST-STATUS))
            (scm-error 'parse-error "build-vline"
-                      (_ "TODO Implement REQUEST-STATUS")
+                      (G_ "TODO Implement REQUEST-STATUS")
                       #f #f)]
 
           [(memv key '(ACTION))
@@ -233,7 +236,7 @@
            (compose car (get-parser 'TEXT))]
 
           [else
-           (warning (_ "Unknown key ~a") key)
+           (warning (G_ "Unknown key ~a") key)
            (compose car (get-parser 'TEXT))])))
 
     ;; If we produced a list create multiple VLINES from it.
@@ -286,7 +289,7 @@
                         ;; ~?
                         ;; source line
                         ;; source file
-                        (_ "WARNING parse error around ~a
+                        (G_ "WARNING parse error around ~a
   ~?
   line ~a ~a~%")
                         (get-string linedata)
@@ -341,7 +344,7 @@
                           ;; ~?
                           ;; source line
                           ;; source file
-                          (_ "ERROR parse error around ~a
+                          (G_ "ERROR parse error around ~a
   ~?
   line ~a ~a
   Defaulting to string~%")
diff --git a/module/vcomponent/formats/ical/types.scm b/module/vcomponent/formats/ical/types.scm
index 7b6aad2e..768f5098 100644
--- a/module/vcomponent/formats/ical/types.scm
+++ b/module/vcomponent/formats/ical/types.scm
@@ -37,7 +37,7 @@
 
 ;; TODO
 (define (write-period _ value)
-  (warning (_ "PERIOD writer not yet implemented"))
+  (warning (G_ "PERIOD writer not yet implemented"))
   (with-output-to-string
     (lambda () (write value))))
 
@@ -94,4 +94,4 @@
 
 (define (get-writer type)
   (or (hashq-ref type-writers type #f)
-      (error (_ "No writer for type") type)))
+      (error (G_ "No writer for type") type)))
-- 
cgit v1.2.3