jmd pushed a commit to branch wip-installer
in repository guix.
commit 6cd63bec1bf137f092c3a0a444e9da984d4fea62
Author: John Darrington <[email protected]>
Date: Tue Jan 31 10:44:10 2017 +0100
installer: Correct placement of gettext call.
* gnu/system/installer/format.scm (format-page-init): Call gettext from
within format.
* gnu/system/installer/role.scm (role-page-init): Call gettext from
within format.
---
gnu/system/installer/format.scm | 6 +++---
gnu/system/installer/role.scm | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/system/installer/format.scm b/gnu/system/installer/format.scm
index 7805fc8..29b8316 100644
--- a/gnu/system/installer/format.scm
+++ b/gnu/system/installer/format.scm
@@ -21,6 +21,7 @@
#:use-module (gnu system installer misc)
#:use-module (gnu system installer filesystems)
#:use-module (gnu system installer utils)
+ #:use-module (guix ui)
#:use-module (ice-9 rdelim)
#:use-module (ice-9 match)
#:use-module (gurses buttons)
@@ -186,11 +187,10 @@ match those uuids read from the respective partitions"
(render-stexi
text-window
(texi-fragment->stexi
- (gettext
(format #f
- "The partitions ~s will be formatted. @strong{Any existing
data on these partitions will be destroyed if you continue!!}"
+ (_ "The partitions ~s will be formatted. @strong{Any existing
data on these partitions will be destroyed if you continue!!}")
(map (lambda (x) (car x))
- mount-points))))
+ mount-points)))
#:markup-table installer-texinfo-markup)
diff --git a/gnu/system/installer/role.scm b/gnu/system/installer/role.scm
index 7684b10..09ebcc0 100644
--- a/gnu/system/installer/role.scm
+++ b/gnu/system/installer/role.scm
@@ -154,7 +154,7 @@
(menu (make-menu roles
#:disp-proc (lambda (datum row)
- (role-description datum)))))
+ (gettext (role-description datum))))))
(addstr* text-window (format #f
(gettext
