all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#68869] [PATCH] channels: Fix typos.
@ 2024-02-01 12:42 Rostislav Svoboda
  2024-05-12  8:34 ` [bug#68869] [PATCH v2] guix: " Dale Mellor
  0 siblings, 1 reply; 3+ messages in thread
From: Rostislav Svoboda @ 2024-02-01 12:42 UTC (permalink / raw)
  To: 68869
  Cc: Rostislav Svoboda, Christopher Baines, Josselin Poiret,
	Ludovic Courtès, Mathieu Othacehe, Ricardo Wurmus,
	Simon Tournier, Tobias Geerinckx-Rice

* guix/channels.scm (authenticate-channel): Pluralise commit numbers.

Change-Id: I7759607f37405e6d3bd4b7f5958fd11d908db204
---
 guix/channels.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/guix/channels.scm b/guix/channels.scm
index 1b07eb5221..a0df5459d4 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -3,6 +3,8 @@
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2024 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2024 Rostislav Svoboda <Rostislav.Svoboda@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -361,8 +363,11 @@ (define* (authenticate-channel channel checkout commit
 
   (define (make-reporter start-commit end-commit commits)
     (format (current-error-port)
-            (G_ "Authenticating channel '~a', commits ~a to ~a (~h new \
-commits)...~%")
+            (N_ "Authenticating channel '~a', commits ~a to ~a (~h new \
+commit)...~%"
+                "Authenticating channel '~a', commits ~a to ~a (~h new \
+commits)...~%"
+                (length commits))
             (channel-name channel)
             (commit-short-id start-commit)
             (commit-short-id end-commit)

base-commit: 7bf8b7c33304d6e69f36190f0444576da1863efc
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#68869] [PATCH v2] guix: channels: Fix typos.
  2024-02-01 12:42 [bug#68869] [PATCH] channels: Fix typos Rostislav Svoboda
@ 2024-05-12  8:34 ` Dale Mellor
  2024-05-13  8:21   ` bug#68869: " Christopher Baines
  0 siblings, 1 reply; 3+ messages in thread
From: Dale Mellor @ 2024-05-12  8:34 UTC (permalink / raw)
  To: 68869; +Cc: guix-devel-0brg6a, rostislav.svoboda

From: Rostislav Svoboda <rostislav.svoboda@gmail.com>

* guix/channels.scm (authenticate-channel): Pluralise commit numbers.

Review:
  * Microscopic documentation change, harmless, but will invoke some i18n
    activity
  * Not sure this justifies adding two names to the copyright holders list, if
    any at all?
  * Works for me

Reviewed-by: Dale Mellor <guix-devel-0brg6a@rdmp.org>
Change-Id: I7759607f37405e6d3bd4b7f5958fd11d908db204
---
 guix/channels.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/guix/channels.scm b/guix/channels.scm
index 51024dcad4..0d7bc541cc 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -3,6 +3,8 @@
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2024 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2024 Rostislav Svoboda <Rostislav.Svoboda@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -364,8 +366,11 @@ (define keyring-reference
 
   (define (make-reporter start-commit end-commit commits)
     (format (current-error-port)
-            (G_ "Authenticating channel '~a', commits ~a to ~a (~h new \
-commits)...~%")
+            (N_ "Authenticating channel '~a', commits ~a to ~a (~h new \
+commit)...~%"
+                "Authenticating channel '~a', commits ~a to ~a (~h new \
+commits)...~%"
+                (length commits))
             (channel-name channel)
             (commit-short-id start-commit)
             (commit-short-id end-commit)
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 3+ messages in thread

* bug#68869: [PATCH v2] guix: channels: Fix typos.
  2024-05-12  8:34 ` [bug#68869] [PATCH v2] guix: " Dale Mellor
@ 2024-05-13  8:21   ` Christopher Baines
  0 siblings, 0 replies; 3+ messages in thread
From: Christopher Baines @ 2024-05-13  8:21 UTC (permalink / raw)
  To: Dale Mellor; +Cc: 68869-done, rostislav.svoboda

[-- Attachment #1: Type: text/plain, Size: 730 bytes --]

Dale Mellor <guix-devel-0brg6a@rdmp.org> writes:

> From: Rostislav Svoboda <rostislav.svoboda@gmail.com>
>
> * guix/channels.scm (authenticate-channel): Pluralise commit numbers.
>
> Review:
>   * Microscopic documentation change, harmless, but will invoke some i18n
>     activity
>   * Not sure this justifies adding two names to the copyright holders list, if
>     any at all?
>   * Works for me
>
> Reviewed-by: Dale Mellor <guix-devel-0brg6a@rdmp.org>
> Change-Id: I7759607f37405e6d3bd4b7f5958fd11d908db204
> ---
>  guix/channels.scm | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)

Thanks both, I've tweaked the commit message and pushed this to master
as e5fa18b6285c59b6e9f8debe0ffde9ef5055f3a2.

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-05-13  8:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-01 12:42 [bug#68869] [PATCH] channels: Fix typos Rostislav Svoboda
2024-05-12  8:34 ` [bug#68869] [PATCH v2] guix: " Dale Mellor
2024-05-13  8:21   ` bug#68869: " Christopher Baines

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.