[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
158/197: installer: Correct placement of gettext call.
From: |
Danny Milosavljevic |
Subject: |
158/197: installer: Correct placement of gettext call. |
Date: |
Mon, 3 Jul 2017 20:37:17 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit de160b42aa07990ed58cfc82f43235d355cd76e2
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
- 124/197: gurses: Populate dropdown boxes in forms using a menu., (continued)
- 124/197: gurses: Populate dropdown boxes in forms using a menu., Danny Milosavljevic, 2017/07/03
- 131/197: gurses: Use inverse instead of underline for field value area., Danny Milosavljevic, 2017/07/03
- 133/197: installer: Change livery., Danny Milosavljevic, 2017/07/03
- 146/197: gurses: Use match instead of car/cdr in line-split., Danny Milosavljevic, 2017/07/03
- 147/197: gurses: In paragraph-format avoid use of car and cdr., Danny Milosavljevic, 2017/07/03
- 144/197: gurses: Avoid one more use of car and cdr., Danny Milosavljevic, 2017/07/03
- 143/197: gurses: Add predicate to test if a complex char is blank., Danny Milosavljevic, 2017/07/03
- 149/197: gurses: Add new procedure "word-endings"., Danny Milosavljevic, 2017/07/03
- 155/197: installer: Use _ instead of M_ for host-name-refresh., Danny Milosavljevic, 2017/07/03
- 160/197: installer: New convenience procedures., Danny Milosavljevic, 2017/07/03
- 158/197: installer: Correct placement of gettext call.,
Danny Milosavljevic <=
- 163/197: gurses: Cache the windows of buttons., Danny Milosavljevic, 2017/07/03
- 172/197: gurses: Update the cursor position when posting the form., Danny Milosavljevic, 2017/07/03
- 165/197: installer: New procedure key-value-slurp., Danny Milosavljevic, 2017/07/03
- 175/197: gurses: Don't crash if asked for an item by an invalid index., Danny Milosavljevic, 2017/07/03
- 171/197: installer: New page to edit user accounts., Danny Milosavljevic, 2017/07/03
- 187/197: installer: Add procudure for starting a wireless interface., Danny Milosavljevic, 2017/07/03
- 192/197: installer: Only build if guile-ncurses is available., Danny Milosavljevic, 2017/07/03
- 68/197: installer: Add new page to set the system role., Danny Milosavljevic, 2017/07/03
- 117/197: installer: Remove unnecessary "begin"., Danny Milosavljevic, 2017/07/03
- 113/197: installer: Explicitly set the #:panel parameter for window creation procedures., Danny Milosavljevic, 2017/07/03