[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/18: installer: Correct placement of gettext call.
From: |
John Darrington |
Subject: |
09/18: installer: Correct placement of gettext call. |
Date: |
Thu, 2 Feb 2017 18:13:05 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 6cd63bec1bf137f092c3a0a444e9da984d4fea62
Author: John Darrington <address@hidden>
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
- branch wip-installer updated (9ff399e -> 688f4f7), John Darrington, 2017/02/02
- 04/18: installer: Add optional arguments to addstr*., John Darrington, 2017/02/02
- 02/18: installer: New gettext keyword M_., John Darrington, 2017/02/02
- 01/18: installer: Avoid wpa_supplicant's output causing screen damage., John Darrington, 2017/02/02
- 05/18: installer: Main page: Redisplay translatable strings upon refresh., John Darrington, 2017/02/02
- 09/18: installer: Correct placement of gettext call.,
John Darrington <=
- 08/18: installer: Replace 'file-browser' with 'key-map'., John Darrington, 2017/02/02
- 06/18: installer: Use _ instead of M_ for host-name-refresh., John Darrington, 2017/02/02
- 14/18: gurses: Cache the windows of buttons., John Darrington, 2017/02/02
- 16/18: installer: New procedure key-value-slurp., John Darrington, 2017/02/02
- 18/18: installer: Fix bug when changing languages., John Darrington, 2017/02/02
- 07/18: installer: New page to select language., John Darrington, 2017/02/02
- 10/18: installer: Fix i18n in dialogs., John Darrington, 2017/02/02
- 17/18: installer: Provide verbose description of locale., John Darrington, 2017/02/02
- 03/18: installer: New file i18n.scm., John Darrington, 2017/02/02
- 11/18: installer: New convenience procedures., John Darrington, 2017/02/02