nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lint: Correctly internationalize warning messages. 

* guix/scripts/lint.scm (emit-warning): Remove '_' call for format
  string.
  (check-description-style, check-inputs-should-be-native,
  check-synopsis-style, check-patches, check-gnu-synopsis+description):
  Wrap message in (_ ...).
This commit is contained in:
Ludovic Courtès 2014-11-19 22:42:23 +01:00
parent f4d5bca39e
commit 836f02bf52
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
guix/scripts/lint.scm
View File

@ -49,7 +49,7 @@
;; provided MESSAGE. ;; provided MESSAGE.
(let ((loc (or (package-field-location package field) (let ((loc (or (package-field-location package field)
(package-location package)))) (package-location package))))
(format (guix-warning-port) (_ "~a: ~a: ~a~%") (format (guix-warning-port) "~a: ~a: ~a~%"
(location->string loc) (location->string loc)
(package-full-name package) (package-full-name package)
message))) message)))
@ -90,14 +90,14 @@
(define (check-not-empty description) (define (check-not-empty description)
(when (string-null? description) (when (string-null? description)
(emit-warning package (emit-warning package
"description should not be empty" (_ "description should not be empty")
'description))) 'description)))
(define (check-proper-start description) (define (check-proper-start description)
(unless (or (properly-starts-sentence? description) (unless (or (properly-starts-sentence? description)
(string-prefix-ci? (package-name package) description)) (string-prefix-ci? (package-name package) description))
(emit-warning package (emit-warning package
"description should start with an upper-case letter or digit" (_ "description should start with an upper-case letter or digit")
'description))) 'description)))
(define (check-end-of-sentence-space description) (define (check-end-of-sentence-space description)
@ -113,8 +113,8 @@
r (cons (match:start m) r))))))) r (cons (match:start m) r)))))))
(unless (null? infractions) (unless (null? infractions)
(emit-warning package (emit-warning package
(format #f "sentences in description should be followed ~ (format #f (_ "sentences in description should be followed ~
by two spaces; possible infraction~p at ~{~a~^, ~}" by two spaces; possible infraction~p at ~{~a~^, ~}")
(length infractions) (length infractions)
infractions) infractions)
'description)))) 'description))))
@ -134,7 +134,7 @@ by two spaces; possible infraction~p at ~{~a~^, ~}"
(when (member "pkg-config" (when (member "pkg-config"
(map package-name (filter package? packages))) (map package-name (filter package? packages)))
(emit-warning package (emit-warning package
"pkg-config should probably be a native input" (_ "pkg-config should probably be a native input")
'inputs)))))) 'inputs))))))
(define (package-name-regexp package) (define (package-name-regexp package)
@ -149,7 +149,7 @@ line."
(define (check-not-empty synopsis) (define (check-not-empty synopsis)
(when (string-null? synopsis) (when (string-null? synopsis)
(emit-warning package (emit-warning package
"synopsis should not be empty" (_ "synopsis should not be empty")
'synopsis))) 'synopsis)))
(define (check-final-period synopsis) (define (check-final-period synopsis)
@ -157,7 +157,7 @@ line."
(when (and (string-suffix? "." synopsis) (when (and (string-suffix? "." synopsis)
(not (string-suffix? "etc." synopsis))) (not (string-suffix? "etc." synopsis)))
(emit-warning package (emit-warning package
"no period allowed at the end of the synopsis" (_ "no period allowed at the end of the synopsis")
'synopsis))) 'synopsis)))
(define check-start-article (define check-start-article
@ -169,26 +169,27 @@ line."
(when (or (string-prefix-ci? "A " synopsis) (when (or (string-prefix-ci? "A " synopsis)
(string-prefix-ci? "An " synopsis)) (string-prefix-ci? "An " synopsis))
(emit-warning package (emit-warning package
"no article allowed at the beginning of the synopsis" (_ "no article allowed at the beginning of \
the synopsis")
'synopsis))))) 'synopsis)))))
(define (check-synopsis-length synopsis) (define (check-synopsis-length synopsis)
(when (>= (string-length synopsis) 80) (when (>= (string-length synopsis) 80)
(emit-warning package (emit-warning package
"synopsis should be less than 80 characters long" (_ "synopsis should be less than 80 characters long")
'synopsis))) 'synopsis)))
(define (check-proper-start synopsis) (define (check-proper-start synopsis)
(unless (properly-starts-sentence? synopsis) (unless (properly-starts-sentence? synopsis)
(emit-warning package (emit-warning package
"synopsis should start with an upper-case letter or digit" (_ "synopsis should start with an upper-case letter or digit")
'synopsis))) 'synopsis)))
(define (check-start-with-package-name synopsis) (define (check-start-with-package-name synopsis)
(when (and (regexp-exec (package-name-regexp package) synopsis) (when (and (regexp-exec (package-name-regexp package) synopsis)
(not (starts-with-abbreviation? synopsis))) (not (starts-with-abbreviation? synopsis)))
(emit-warning package (emit-warning package
"synopsis should not start with the package name" (_ "synopsis should not start with the package name")
'synopsis))) 'synopsis)))
(let ((synopsis (package-synopsis package))) (let ((synopsis (package-synopsis package)))
@ -217,7 +218,8 @@ line."
#f)) #f))
patches)) patches))
(emit-warning package (emit-warning package
"file names of patches should start with the package name" (_ "file names of patches should start with \
the package name")
'patches)))) 'patches))))
(define (escape-quotes str) (define (escape-quotes str)
@ -254,7 +256,7 @@ descriptions maintained upstream."
(package-location package)))) (package-location package))))
(unless (and upstream (string=? upstream downstream)) (unless (and upstream (string=? upstream downstream))
(format (guix-warning-port) (format (guix-warning-port)
"~a: ~a: proposed synopsis: ~s~%" (_ "~a: ~a: proposed synopsis: ~s~%")
(location->string loc) (package-full-name package) (location->string loc) (package-full-name package)
upstream))) upstream)))
@ -266,7 +268,7 @@ descriptions maintained upstream."
(not (string=? (fill-paragraph upstream 100) (not (string=? (fill-paragraph upstream 100)
(fill-paragraph downstream 100)))) (fill-paragraph downstream 100))))
(format (guix-warning-port) (format (guix-warning-port)
"~a: ~a: proposed description:~% \"~a\"~%" (_ "~a: ~a: proposed description:~% \"~a\"~%")
(location->string loc) (package-full-name package) (location->string loc) (package-full-name package)
(fill-paragraph (escape-quotes upstream) 77 7))))))) (fill-paragraph (escape-quotes upstream) 77 7)))))))