diff mbox series

[bug#45983,v2,2/3] import: gnu: Add internationalized messages.

Message ID 20210127234603.24077-2-zimon.toutoune@gmail.com
State Accepted
Headers show
Series [bug#45983,v2,1/3] guix: gnu-maintenance: Fix error handling. | expand

Checks

Context Check Description
cbaines/submitting builds success
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Simon Tournier Jan. 27, 2021, 11:46 p.m. UTC 
* guix/import/gnu.scm (gnu->guix-package): Add 'G_' to messages.
---
 guix/import/gnu.scm | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

Comments

Ludovic Courtès Jan. 31, 2021, 8:37 p.m. UTC | #1 
Hi!

I applied the whole series.

zimoun <zimon.toutoune@gmail.com> skribis:

> * guix/import/gnu.scm (gnu->guix-package): Add 'G_' to messages.

Two comments: (1) things like (message "string") are already i18n’d, and
(2):

> +     (raise (make-compound-condition
> +             (formatted-message
> +              (G_ "failed to determine latest release of GNU ~a")
> +              name))))))

I removed ‘make-compound-condition’, which is unnecessary here.

Thanks!

Ludo’.
diff mbox series

Patch

diff --git a/guix/import/gnu.scm b/guix/import/gnu.scm
index 29324d7554..d307bbbaba 100644
--- a/guix/import/gnu.scm
+++ b/guix/import/gnu.scm
@@ -1,5 +1,6 @@ 
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -17,8 +18,10 @@ 
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (guix import gnu)
+  #:use-module ((guix diagnostics) #:select (formatted-message))
   #:use-module (guix gnu-maintenance)
   #:use-module (guix import utils)
+  #:use-module (guix i18n)
   #:use-module (guix utils)
   #:use-module (guix store)
   #:use-module (gcrypt hash)
@@ -113,15 +116,16 @@  details.)"
      (let ((version (upstream-source-version release)))
        (match (find-package name)
          (#f
-          (raise (condition
-                  (&message
-                   (message "couldn't find meta-data for GNU package")))))
+          (raise (make-compound-condition
+                  (formatted-message
+                   (G_ "couldn't find meta-data for GNU ~a")
+                   name))))
          (info
           (gnu-package->sexp info release #:key-download key-download)))))
     (_
-     (raise (condition
-             (&message
-              (message
-               "failed to determine latest release of GNU package")))))))
+     (raise (make-compound-condition
+             (formatted-message
+              (G_ "failed to determine latest release of GNU ~a")
+              name))))))
 
 ;;; gnu.scm ends here