Change gettext '_' to 'G_'.

Guile 3 reserves _ for other stuff.

8 files changed, 75 insertions, 75 deletions

diff --git a/module/calp/html/caltable.scm b/module/calp/html/caltable.scm
index 2c027c35..bdbcf55f 100644
--- a/module/calp/html/caltable.scm
+++ b/module/calp/html/caltable.scm
@@ -58,7 +58,7 @@
 
         ;; Cell 0, 0. The letter v. for week number
         (div (@ (class "column-head row-head"))
-             ,(_ "v."))
+             ,(G_ "v."))
 
         ;; top row, names of week days
         ,@(map (lambda (d) `(div (@ (class "column-head"))
diff --git a/module/calp/html/components.scm b/module/calp/html/components.scm
index df30b6bc..463bae38 100644
--- a/module/calp/html/components.scm
+++ b/module/calp/html/components.scm
@@ -54,7 +54,7 @@
               rest: args)
   (when (and onclick href)
     (scm-error 'wrong-type-arg "btn"
-               (_ "href and onclick are mutually exclusive. href = ~s, onclick = ~s.")
+               (G_ "href and onclick are mutually exclusive. href = ~s, onclick = ~s.")
                (list href onclick)
                #f))
   (let ((classes (string-join (cons "btn" class) " "))
diff --git a/module/calp/html/util.scm b/module/calp/html/util.scm
index 948cadb7..0a5b44ae 100644
--- a/module/calp/html/util.scm
+++ b/module/calp/html/util.scm
@@ -33,6 +33,6 @@
                       #xFF))
             "#000000" "#FFFFFF")))
     (lambda args
-      (format (current-error-port) (_ "Error calculating foreground color?~%~s~%") args)
+      (format (current-error-port) (G_ "Error calculating foreground color?~%~s~%") args)
       "#FF0000"
       )))
diff --git a/module/calp/html/vcomponent.scm b/module/calp/html/vcomponent.scm
index 6d4f3ca7..0516b9d4 100644
--- a/module/calp/html/vcomponent.scm
+++ b/module/calp/html/vcomponent.scm
@@ -56,10 +56,10 @@
           (configuration-error
            (lambda (key subr msg args data)
              (format (current-error-port)
-                     (_ "Error retrieving configuration, ~?~%") msg args)))
+                     (G_ "Error retrieving configuration, ~?~%") msg args)))
           (#t ; for errors when running the filter
            (lambda (err . args)
-             (warning (_ "~a on formatting description, ~s") err args)
+             (warning (G_ "~a on formatting description, ~s") err args)
              str))))
 
 ;; TODO replace with propper mimetype parser
@@ -91,11 +91,11 @@
                                    "unknown")))))
                    (time ,(let ((dt (prop event 'DTSTART)))
                             (if (datetime? dt)
-                                (datetime->string dt (_ "~Y-~m-~d ~H:~M"))
-                                (date->string dt (_ "~Y-~m-~d") ))))
+                                (datetime->string dt (G_ "~Y-~m-~d ~H:~M"))
+                                (date->string dt (G_ "~Y-~m-~d") ))))
                    (a (@ (href ,(date->string (as-date (prop event 'DTSTART)) "/week/~Y-~m-~d.html")))
                       ;; Button for viewing calendar, accompanied by a calendar icon
-                      ,(_ "View") " 📅")
+                      ,(G_ "View") " 📅")
                    (span ,(prop event 'SUMMARY)))))
   (cons
    `(style ,(lambda () (calendar-styles calendars #t)))
@@ -166,7 +166,7 @@
 
           (div (@ (class "fields"))
                ,(when (and=> (prop ev 'LOCATION) (negate string-null?))
-                  `(div (b ,(_ "Location: "))
+                  `(div (b ,(G_ "Location: "))
                         (div (@ (class "location") (data-property "location"))
                              ,(string-map (lambda (c) (if (char=? c #\,) #\newline c))
                                           (prop ev 'LOCATION)))))
@@ -244,10 +244,10 @@
                              ,@(format-recurrence-rule ev)))
 
                ,(when (prop ev 'LAST-MODIFIED)
-                  `(div (@ (class "last-modified")) ,(_ "Last modified") " "
+                  `(div (@ (class "last-modified")) ,(G_ "Last modified") " "
                         ,(datetime->string (prop ev 'LAST-MODIFIED)
                                            ;; Last modified datetime
-                                           (_ "~1 ~H:~M")))))
+                                           (G_ "~1 ~H:~M")))))
 
           ))))
 
@@ -258,7 +258,7 @@
   (let ((date (car day))
         (events (cdr day)))
     `(section (@ (class "text-day"))
-              (header (h2 ,(let ((s (date->string date (_ "~Y-~m-~d"))))
+              (header (h2 ,(let ((s (date->string date (G_ "~Y-~m-~d"))))
                              `(a (@ (href "#" ,s)
                                     (class "hidelink")) ,s))))
               ,@(stream->list
@@ -340,7 +340,7 @@
 ;; TODO possibly unused?
 (define (repeat-info event)
   `(div (@ (class "eventtext"))
-        (h2 ,(_ "Recurrences"))
+        (h2 ,(G_ "Recurrences"))
         (table (@ (class "recur-components"))
                ,@((@@ (vcomponent recurrence internal) map-fields)
                   (lambda (key value)
@@ -412,7 +412,7 @@
          (form (@ (class "edit-form"))
                (select (@ (class "calendar-selection"))
                  ;; NOTE flytta "muffarna" utanför
-                 (option ,(_ "- Choose a Calendar -"))
+                 (option ,(G_ "- Choose a Calendar -"))
                  ,@(let ((dflt ((@ (vcomponent) default-calendar))))
                      (map (lambda (calendar)
                             (define name (prop calendar 'NAME))
@@ -422,7 +422,7 @@
                                      ,name))
                           calendars)))
                (input (@ (type "text")
-                         (placeholder ,(_ "Summary"))
+                         (placeholder ,(G_ "Summary"))
                          (name "summary") (required)
                          (data-property "summary")
                                         ; (value ,(prop ev 'SUMMARY))
@@ -440,25 +440,25 @@
                     (div (@ (class "checkboxes"))
                          (input (@ (type "checkbox")
                                    (name "wholeday")
-                                   (data-label ,(_ "Whole day?"))
+                                   (data-label ,(G_ "Whole day?"))
                                    ))
                          (input (@ (type "checkbox")
                                    (name "has_repeats")
-                                   (data-label ,(_ "Recurring?"))
+                                   (data-label ,(G_ "Recurring?"))
                                    )))
 
                     )
 
-               (input (@ (placeholder ,(_ "Location"))
-                         (data-label ,(_ "Location"))
+               (input (@ (placeholder ,(G_ "Location"))
+                         (data-label ,(G_ "Location"))
                          (name "location")
                          (type "text")
                          (data-property "location")
                                         ; (value ,(or (prop ev 'LOCATION) ""))
                          ))
 
-               (textarea (@ (placeholder ,(_ "Description"))
-                            (data-label ,(_ "Description"))
+               (textarea (@ (placeholder ,(G_ "Description"))
+                            (data-label ,(G_ "Description"))
                             (data-property "description")
                             (name "description"))
                                         ; ,(prop ev 'DESCRIPTION)
@@ -467,9 +467,9 @@
                (input-list
                 (@ (name "categories")
                    (data-property "categories")
-                   (data-label ,(_ "Categories")))
+                   (data-label ,(G_ "Categories")))
                 (input (@ (type "text")
-                          (placeholder ,(_ "Category")))))
+                          (placeholder ,(G_ "Category")))))
 
                ;; TODO This should be a "list" where any field can be edited
                ;; directly. Major thing holding us back currently is that
@@ -518,7 +518,7 @@
                                         ; "20:56"
                          ))
               (div (@ (class "fields"))
-                   (div (b ,(_ "Location: "))
+                   (div (b ,(G_ "Location: "))
                         (div (@ (class "location")
                                 (data-property "location"))
                                         ; "Alsättersgatan 13"
@@ -540,7 +540,7 @@
                    ;;      "varje vecka"
                    ;;      ".")
                    (div (@ (class "last-modified"))
-                        ,(_ "Last Modified") " -"
+                        ,(G_ "Last Modified") " -"
                                         ; "2021-09-29 19:56"
                         ))))))
 
@@ -548,21 +548,21 @@
   `(template
     (@ (id "vevent-edit-rrule"))
     (div (@ (class "eventtext"))
-         (h2 ,(_ "Recurrences"))
+         (h2 ,(G_ "Recurrences"))
          (dl
-          (dt ,(_ "Frequency"))
+          (dt ,(G_ "Frequency"))
           (dd (select (@ (name "freq"))
                 (option "-")
                 ,@(map (lambda (x) `(option (@ (value ,x)) ,(string-titlecase (symbol->string x))))
                        '(SECONDLY MINUTELY HOURLY DAILY WEEKLY MONTHLY YEARLY))))
 
-          (dt ,(_ "Until"))
+          (dt ,(G_ "Until"))
           (dd (date-time-input (@ (name "until"))))
 
-          (dt ,(_ "Conut"))
+          (dt ,(G_ "Conut"))
           (dd (input (@ (type "number") (name "count") (min 0))))
 
-          (dt ,(_ "Interval"))
+          (dt ,(G_ "Interval"))
           (dd (input (@ (type "number") (name "interval") ; min and max depend on FREQ
                         )))
 
@@ -576,14 +576,14 @@
                       (dd (input-list (@ (name ,name))
                                       (input (@ (type "number")
                                                 (min ,min) (max ,max)))))))
-                  `((bysecond ,(_ "By Second") 0 60)
-                    (byminute ,(_ "By Minute") 0 59)
-                    (byhour ,(_ "By Hour") 0 23)
-                    (bymonthday ,(_ "By Month Day") -31 31) ; except 0
-                    (byyearday ,(_ "By Year Day") -366 366) ; except 0
-                    (byweekno ,(_ "By Week Number") -53 53) ; except 0
-                    (bymonth ,(_ "By Month") 1 12)
-                    (bysetpos ,(_ "By Set Position") -366 366) ; except 0
+                  `((bysecond ,(G_ "By Second") 0 60)
+                    (byminute ,(G_ "By Minute") 0 59)
+                    (byhour ,(G_ "By Hour") 0 23)
+                    (bymonthday ,(G_ "By Month Day") -31 31) ; except 0
+                    (byyearday ,(G_ "By Year Day") -366 366) ; except 0
+                    (byweekno ,(G_ "By Week Number") -53 53) ; except 0
+                    (bymonth ,(G_ "By Month") 1 12)
+                    (bysetpos ,(G_ "By Set Position") -366 366) ; except 0
                     )))
 
           ;; (dt "By Week Day")
@@ -594,7 +594,7 @@
           ;;                 ,(week-day-select '())
           ;;                 ))
 
-          (dt ,(_ "Weekstart"))
+          (dt ,(G_ "Weekstart"))
           (dd ,(week-day-select '((name "wkst")))))))
   )
 
@@ -610,29 +610,29 @@
          (nav (@ (class "popup-control"))
               (button (@ (class "close-button")
                          ;; Close this popup
-                         (title ,(_ "Close"))
+                         (title ,(G_ "Close"))
                          (aria-label "Close"))
                       "×")
               (button (@ (class "maximize-button")
                          ;; Make this popup occupy the entire screen
-                         (title ,(_ "Fullscreen"))
+                         (title ,(G_ "Fullscreen"))
                          ;; (aria-label "")
                          )
                       ,(xml-entities "🗖"))
               (button (@ (class "remove-button")
                          ;; Remove/Trash the event this popup represent
                          ;; Think garbage can
-                         (title ,(_ "Remove")))
+                         (title ,(G_ "Remove")))
                       ,(xml-entities "🗑")))
 
          (tab-group (@ (class "window-body"))
                     (vevent-description
-                     (@ (data-label ,(xml-entities "📅")) (data-title ,(_ "Overview"))
+                     (@ (data-label ,(xml-entities "📅")) (data-title ,(G_ "Overview"))
                         (class "vevent")))
 
                     (vevent-edit
                      (@ (data-label ,(xml-entities "🖊"))
-                        (data-title ,(_ "Edit"))
+                        (data-title ,(G_ "Edit"))
                         ;; Used by JavaScript to target this tab
                         (data-originaltitle "Edit")))
 
@@ -641,9 +641,9 @@
 
                     (vevent-changelog
                      (@ (data-label ,(xml-entities "📒"))
-                        (data-title ,(_ "Changelog"))))
+                        (data-title ,(G_ "Changelog"))))
 
                     ,@(when (debug)
                         `((vevent-dl
                            (@ (data-label ,(xml-entities "🐸"))
-                              (data-title ,(_ "Debug"))))))))))
+                              (data-title ,(G_ "Debug"))))))))))
diff --git a/module/calp/html/view/calendar.scm b/module/calp/html/view/calendar.scm
index 99109741..a240d00c 100644
--- a/module/calp/html/view/calendar.scm
+++ b/module/calp/html/view/calendar.scm
@@ -78,10 +78,10 @@
              ,display)))
 
   (unless next-start
-    (scm-error 'misc-error "html-generate" (_ "Next-start needs to be a procedure") #f #f))
+    (scm-error 'misc-error "html-generate" (G_ "Next-start needs to be a procedure") #f #f))
 
   (unless prev-start
-    (scm-error 'misc-error "html-generate" (_ "Prev-start needs to be a procedure") #f #f))
+    (scm-error 'misc-error "html-generate" (G_ "Prev-start needs to be a procedure") #f #f))
 
   (xhtml-doc
    (@ (lang sv))
@@ -92,9 +92,9 @@
     (meta (@ (name viewport)
              (content "width=device-width, initial-scale=0.5")))
     (meta (@ (name description)
-             (content ,(format #f (_ "Calendar for the dates between ~a and ~a")
-                               (date->string start-date (_ "~Y-~m-~d"))
-                               (date->string end-date   (_ "~Y-~m-~d"))))))
+             (content ,(format #f (G_ "Calendar for the dates between ~a and ~a")
+                               (date->string start-date (G_ "~Y-~m-~d"))
+                               (date->string end-date   (G_ "~Y-~m-~d"))))))
     ;; NOTE this is only for the time actually part of this calendar.
     ;; overflowing times from pre-start and post-end is currently ignored here.
     (meta (@ (name start-time)
@@ -154,11 +154,11 @@ window.default_calendar='~a';"
          ;; Page footer
          (footer
           (@ (style "grid-area: footer"))
-          (span ,(_ "Page generated ")
-                ,(date->string (current-date) (_ "~Y-~m-~d")))
-          (span ,(_ "Current time ") (current-time (@ (interval 1))))
+          (span ,(G_ "Page generated ")
+                ,(date->string (current-date) (G_ "~Y-~m-~d")))
+          (span ,(G_ "Current time ") (current-time (@ (interval 1))))
           (span (a (@ (href ,(repo-url)))
-                   ,(_ "Source Code"))))
+                   ,(G_ "Source Code"))))
 
          ;; Small calendar and navigation
          (nav (@ (class "calnav") (style "grid-area: nav"))
@@ -169,11 +169,11 @@ window.default_calendar='~a';"
                                     start-date)
                                 "/week/~1.html")
                          ;; Button to view week
-                         (_ "Week"))
+                         (G_ "Week"))
 
                    ,(btn href: (date->string (set (day start-date) 1) "/month/~1.html")
                          ;; button to view month
-                         (_ "Month"))
+                         (G_ "Month"))
 
                    (today-button
                     (a (@ (class "btn")
@@ -183,7 +183,7 @@ window.default_calendar='~a';"
                                               [(week) "view=week"]
                                               [else ""]))))
                        ;; Button to go to today
-                       ,(_ "Today"))))
+                       ,(G_ "Today"))))
 
               (date-jump
                ;; Firefox's accessability complain about each date
@@ -203,11 +203,11 @@ window.default_calendar='~a';"
                      ,(btn "➔"))))
 
          (details (@ (open) (style "grid-area: cal"))
-                  (summary ,(_ "Month overview"))
+                  (summary ,(G_ "Month overview"))
                   (div (@ (class "smallcall-head"))
                        ,(string-titlecase (date->string start-date
                                                         ;; Header of small calendar
-                                                        (_ "~B ~Y"))))
+                                                        (G_ "~B ~Y"))))
                   ;; NOTE it might be a good idea to put the navigation buttons
                   ;; earlier in the DOM-tree/tag order. At least Vimium's
                   ;; @key{[[} keybind sometimes finds parts of events instead.
@@ -233,16 +233,16 @@ window.default_calendar='~a';"
                     (input (@ (type "text")
                               (name "q")
                               ;; Search placeholder
-                              (placeholder ,(_ "Search"))))
+                              (placeholder ,(G_ "Search"))))
                     (input (@ (type "submit")
                               (value ">"))))
 
               ,(when (or (debug) (edit-mode))
                  `(details (@ (class "sliders"))
-                           (summary ,(_ "Option sliders"))
+                           (summary ,(G_ "Option sliders"))
 
                            ,@(when (edit-mode)
-                               `((label ,(_ "Event blankspace"))
+                               `((label ,(G_ "Event blankspace"))
                                  ,(slider-input
                                    variable: "editmode"
                                    min: 0
@@ -251,7 +251,7 @@ window.default_calendar='~a';"
                                    value: 1)))
 
                            ,@(when (debug)
-                               `((label ,(_ "Fontsize"))
+                               `((label ,(G_ "Fontsize"))
                                  ,(slider-input
                                    unit: "pt"
                                    min: 1
@@ -262,7 +262,7 @@ window.default_calendar='~a';"
 
               ;; List of calendars
               (details (@ (class "calendarlist"))
-                       (summary ,(_ "Calendar list"))
+                       (summary ,(G_ "Calendar list"))
                        (ul ,@(map
                               (lambda (calendar)
                                 `(li (@ (data-calendar ,(base64encode (prop calendar 'NAME))))
@@ -288,7 +288,7 @@ window.default_calendar='~a';"
               ;; Events which started before our start point,
               ;; but "spill" into our time span.
               (section (@ (class "text-day"))
-                       (header (h2 ,(_ "Earlier")))
+                       (header (h2 ,(G_ "Earlier")))
                        ;; TODO this group gets styles applied incorrectly.
                        ;; Figure out way to merge it with the below call.
                        ,@(stream->list
diff --git a/module/calp/html/view/calendar/shared.scm b/module/calp/html/view/calendar/shared.scm
index 4779d11b..413bb5f5 100644
--- a/module/calp/html/view/calendar/shared.scm
+++ b/module/calp/html/view/calendar/shared.scm
@@ -36,7 +36,7 @@
 
   (unless event-length-key
     (scm-error 'wrong-type-arg "fix-event-widths!"
-               (_ "event-length-key is required")
+               (G_ "event-length-key is required")
                #f #f))
 
   ;; @var{x} is how for left in the container we are.
diff --git a/module/calp/html/view/calendar/week.scm b/module/calp/html/view/calendar/week.scm
index caad8912..44898b0d 100644
--- a/module/calp/html/view/calendar/week.scm
+++ b/module/calp/html/view/calendar/week.scm
@@ -36,7 +36,7 @@
                 ;; Top left area
                 (div (@ (class "week-indicator"))
                      (span (@ (style "font-size: 50%"))
-                           ,(_ "v."))
+                           ,(G_ "v."))
                      ,@(->> (week-number start-date)
                             number->string string->list
                             (map (lambda (c) `(span ,(string c))))))
@@ -49,7 +49,7 @@
                 ,@(map (lambda (day-date)
                          `(div (@ (class "meta"))
                                (span (@ (class "daydate"))
-                                     ,(date->string day-date (_ "~Y-~m-~d")))
+                                     ,(date->string day-date (G_ "~Y-~m-~d")))
                                (span (@ (class "dayname"))
                                      ;; TODO translation here?
                                      ,(string-titlecase (date->string day-date "~a")))))
diff --git a/module/calp/html/view/search.scm b/module/calp/html/view/search.scm
index 114541ed..7b991104 100644
--- a/module/calp/html/view/search.scm
+++ b/module/calp/html/view/search.scm
@@ -26,25 +26,25 @@
          errors has-query? search-term search-result page paginator)
   (xhtml-doc
    (@ (lang sv))
-   (head (title ,(_ "Search results"))
+   (head (title ,(G_ "Search results"))
          ,(include-css "/static/style.css"))
    (body
-    (a (@ (href ("/today"))) ,(_ "Show today"))
-    (h2 ,(_ "Search term"))
+    (a (@ (href ("/today"))) ,(G_ "Show today"))
+    (h2 ,(G_ "Search term"))
     (form
      (pre (textarea (@ (name "q") (rows 5) (spellcheck false)
                        (style "width:100%"))
                     ,(when has-query?
                        (with-output-to-string
                          (lambda () (pretty-print search-term))))))
-     (label (@ (for "onlyfuture")) ,(_ "limit to future occurences"))
+     (label (@ (for "onlyfuture")) ,(G_ "limit to future occurences"))
      (input (@ (name "onlyfuture") (id "onlyfuture") (type checkbox)))
      (input (@ (type submit))))
     ,@(if errors
-          `((h2 ,(_ "Error searching"))
+          `((h2 ,(G_ "Error searching"))
             (div (@ (class "error"))
                  (pre ,errors)))
-          `((h2 ,(format #f (_ "Result (page ~a)") page))
+          `((h2 ,(format #f (G_ "Result (page ~a)") page))
             (ul ,@(compact-event-list search-result))
             (div (@ (class "paginator"))
                  ,@(paginator->list