diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-04-07 22:12:29 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-04-07 22:12:29 +0200 |
| commit | e377df7b305514d721510fe1f15921647ebc7552 (patch) | |
| tree | 35dd17aaf5e29c44c0f13401b6cb86e4d7df5acd /module/calp/util | |
| parent | Rename filename-extension{ => ?}. (diff) | |
| parent | Fix translation for (vcomponent datetime output). (diff) | |
| download | calp-e377df7b305514d721510fe1f15921647ebc7552.tar.gz calp-e377df7b305514d721510fe1f15921647ebc7552.tar.xz | |
Merge branch 'translation'
Diffstat (limited to 'module/calp/util')
| -rw-r--r-- | module/calp/util/config.scm | 14 | ||||
| -rw-r--r-- | module/calp/util/exceptions.scm | 3 |
2 files changed, 11 insertions, 6 deletions
diff --git a/module/calp/util/config.scm b/module/calp/util/config.scm index 4862bbda..3bc55d92 100644 --- a/module/calp/util/config.scm +++ b/module/calp/util/config.scm @@ -9,6 +9,7 @@ :use-module (srfi srfi-1) :use-module (ice-9 format) ; for format-procedure :use-module (ice-9 curried-definitions) ; for ensure + :use-module (calp translation) :export (define-config) ) @@ -41,7 +42,7 @@ (set! (it name) value) (scm-error 'configuration-error "define-config" - "No configuration slot named ~s, when defining ~s" + (_ "No configuration slot named ~s, when defining ~s") (list key name) #f))) (set-config! name (get-config name default-value))) @@ -59,7 +60,9 @@ (or (it value) (scm-error 'configuration-error "set-config!" - "Pre-property failed when setting ~s to ~s" + ;; first slot is property name, second is new + ;; property value. + (_ "Pre-property failed when setting ~s to ~s") (list name value) #f)) value)) @@ -74,7 +77,7 @@ (when (eq? v %uniq) (scm-error 'configuration-error "get-config" - "No configuration item named ~s" + (_ "No configuration item named ~s") (list key) #f)) v) (hashq-ref config-values key default))) @@ -125,7 +128,7 @@ (hash-map->list list config-values))) `(*TOP* - (header "Configuration variables") + (header ,(_ "Configuration variables")) (dl ,@(concatenate (for (module values) in groups @@ -137,7 +140,8 @@ `((dt ,key) (dd (p (@ (inline)) ,(or (description key) ""))) - (dt "V:") + ;; Configuration variable value indicator + (dt ,(_ "V:")) (dd ,(if (procedure? value) (format-procedure value) `(scheme ,value)) diff --git a/module/calp/util/exceptions.scm b/module/calp/util/exceptions.scm index 1268f9f5..0588840e 100644 --- a/module/calp/util/exceptions.scm +++ b/module/calp/util/exceptions.scm @@ -1,7 +1,8 @@ (define-module (calp util exceptions) :use-module (calp util config) + :use-module (calp translation) :use-module (hnh util exceptions)) (define-config warnings-are-errors #f - description: "Crash on warnings." + description: (_ "Crash on warnings.") post: warnings-are-errors) |