mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-28 14:01:29 -05:00
ui: Move definition of install-locale' after that of the
warning' macro.
* guix/ui.scm (install-locale): Move definition after that of `warning'.
This commit is contained in:
parent
fcdf58c46c
commit
238328c990
1 changed files with 9 additions and 9 deletions
18
guix/ui.scm
18
guix/ui.scm
|
@ -65,15 +65,6 @@ (define %gettext-domain
|
||||||
(define _ (cut gettext <> %gettext-domain))
|
(define _ (cut gettext <> %gettext-domain))
|
||||||
(define N_ (cut ngettext <> <> <> %gettext-domain))
|
(define N_ (cut ngettext <> <> <> %gettext-domain))
|
||||||
|
|
||||||
(define (install-locale)
|
|
||||||
"Install the current locale settings."
|
|
||||||
(catch 'system-error
|
|
||||||
(lambda _
|
|
||||||
(setlocale LC_ALL ""))
|
|
||||||
(lambda args
|
|
||||||
(warning (_ "failed to install locale: ~a~%")
|
|
||||||
(strerror (system-error-errno args))))))
|
|
||||||
|
|
||||||
(define (initialize-guix)
|
(define (initialize-guix)
|
||||||
"Perform the usual initialization for stand-alone Guix commands."
|
"Perform the usual initialization for stand-alone Guix commands."
|
||||||
(install-locale)
|
(install-locale)
|
||||||
|
@ -405,6 +396,15 @@ (define-syntax-rule (leave args ...)
|
||||||
(report-error args ...)
|
(report-error args ...)
|
||||||
(exit 1)))
|
(exit 1)))
|
||||||
|
|
||||||
|
(define (install-locale)
|
||||||
|
"Install the current locale settings."
|
||||||
|
(catch 'system-error
|
||||||
|
(lambda _
|
||||||
|
(setlocale LC_ALL ""))
|
||||||
|
(lambda args
|
||||||
|
(warning (_ "failed to install locale: ~a~%")
|
||||||
|
(strerror (system-error-errno args))))))
|
||||||
|
|
||||||
(define (guix-main arg0 . args)
|
(define (guix-main arg0 . args)
|
||||||
(initialize-guix)
|
(initialize-guix)
|
||||||
(let ()
|
(let ()
|
||||||
|
|
Loading…
Reference in a new issue