[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/18: installer: Improve i18n in ping page.
From: |
John Darrington |
Subject: |
12/18: installer: Improve i18n in ping page. |
Date: |
Thu, 2 Feb 2017 18:13:05 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit e7b3a8f96bf3acdfc7c2a2d74dfd6c810ed5cc3a
Author: John Darrington <address@hidden>
Date: Wed Feb 1 08:43:02 2017 +0100
installer: Improve i18n in ping page.
* gnu/system/installer/ping.scm (ping-key-handler): Deal properly
with internationalised strings.
---
gnu/system/installer/ping.scm | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/gnu/system/installer/ping.scm b/gnu/system/installer/ping.scm
index 0620517..2bde5eb 100644
--- a/gnu/system/installer/ping.scm
+++ b/gnu/system/installer/ping.scm
@@ -22,6 +22,7 @@
#:use-module (gnu system installer misc)
#:use-module (gnu system installer utils)
#:use-module (guix store)
+ #:use-module (guix ui)
#:use-module (gurses buttons)
#:use-module (ncurses curses)
#:use-module (web uri)
@@ -90,9 +91,9 @@
(car %default-substitute-urls)))))
(addstr test-window
- (gettext "Test successful. Network is working."))
+ (_ "Test successful. Network is working."))
(addstr test-window
- (gettext "Test failed. No servers reached.")))
+ (_ "Test failed. No servers reached.")))
(refresh* test-window)))) #f))
@@ -100,7 +101,13 @@
(when (not (page-initialised? page))
(ping-page-init page)
(page-set-initialised! page #t))
- (refresh* (page-datum page 'test-window)))
+
+ (let ((text-window (page-datum page 'text-window)))
+ (addstr* text-window
+ (_ "Choose \"Test\" to check network connectivity."))
+
+ (refresh* text-window)
+ (refresh* (page-datum page 'test-window))))
(define (ping-page-init p)
(let* ((s (page-surface p))
@@ -126,10 +133,9 @@
)
(box test-window 0 0)
- (addstr* text-window
- (gettext "Choose \"Test\" to check network connectivity."))
(page-set-wwin! p frame)
(page-set-datum! p 'test-window test-window)
+ (page-set-datum! p 'text-window text-window)
(page-set-datum! p 'navigation buttons)
(buttons-post buttons button-window)
(refresh* text-window)
- 14/18: gurses: Cache the windows of buttons., (continued)
- 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
- 13/18: gurses: Avoid one use of car/cdr., John Darrington, 2017/02/02
- 15/18: gurses: Use match instead of car., John Darrington, 2017/02/02
- 12/18: installer: Improve i18n in ping page.,
John Darrington <=