cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use lint checker related translations on some pages

Browse source 
Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
Danjela Lura 2020-05-28 23:00:10 +02:00 • committed by Christopher Baines
parent b8abe38352
commit d3096de655
8 changed files with 176 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

5
guix-data-service/model/lint-checker.scm
View file

@ -92,6 +92,7 @@ INNER JOIN lint_checker_description_sets
ON lint_checkers.lint_checker_description_set_id = lint_checker_description_sets.id
INNER JOIN lint_checker_descriptions
ON lint_checker_descriptions.id = ANY (lint_checker_description_sets.description_ids)
AND lint_checker_descriptions.locale = 'en_US.utf8'
INNER JOIN (
SELECT lint_checker_id, COUNT(*)
FROM lint_warnings
@ -136,11 +137,11 @@ INNER JOIN lint_checker_description_sets
ON lint_checkers.lint_checker_description_set_id = lint_checker_description_sets.id
INNER JOIN lint_checker_descriptions
ON lint_checker_descriptions.id = ANY (lint_checker_description_sets.description_ids)
AND lint_checker_descriptions.locale = 'en_US.utf8'
WHERE lint_checkers.id IN (
SELECT lint_checker_id
FROM guix_revision_lint_checkers
INNER JOIN guix_revisions
ON guix_revisions.id = guix_revision_lint_checkers.guix_revision_id
WHERE commit = $1
)"
WHERE commit = $1)"
(list commit-hash)))

19
guix-data-service/model/lint-warning.scm
View file

@ -72,7 +72,9 @@ INNER JOIN lint_checker_description_sets
ON lint_checkers.lint_checker_description_set_id = lint_checker_description_sets.id
INNER JOIN lint_checker_descriptions
ON lint_checker_descriptions.id = ANY (lint_checker_description_sets.description_ids)
INNER JOIN packages
AND lint_checker_descriptions.locale = "
"'" locale "' "
"INNER JOIN packages
ON lint_warnings.package_id = packages.id
INNER JOIN locations
ON locations.id = lint_warnings.location_id
@ -118,11 +120,13 @@ INNER JOIN lint_warning_messages
(list message-query)
'()))))
(define (select-lint-warnings-by-revision-package-name-and-version conn
(define* (select-lint-warnings-by-revision-package-name-and-version conn
commit-hash
name version)
(define query "
SELECT lint_warnings.id, lint_checkers.name, lint_checker_descriptions.description,
name version
#:key
locale)
(define query
"SELECT lint_warnings.id, lint_checkers.name, lint_checker_descriptions.description,
lint_checkers.network_dependent,
locations.file, locations.line, locations.column_number,
lint_warning_messages.message
@ -133,6 +137,7 @@ INNER JOIN lint_checker_description_sets
ON lint_checkers.lint_checker_description_set_id = lint_checker_description_sets.id
INNER JOIN lint_checker_descriptions
ON lint_checker_descriptions.id = ANY (lint_checker_description_sets.description_ids)
AND lint_checker_descriptions.locale = $4
INNER JOIN packages
ON lint_warnings.package_id = packages.id
LEFT OUTER JOIN locations
@ -140,7 +145,7 @@ LEFT OUTER JOIN locations
INNER JOIN lint_warning_message_sets
ON lint_warning_message_sets.id = lint_warning_message_set_id
INNER JOIN lint_warning_messages
ON lint_warning_messages.locale = 'en_US.utf8'
ON lint_warning_messages.locale = $4
AND lint_warning_messages.id = ANY (lint_warning_message_sets.message_ids)
WHERE packages.id IN (
SELECT package_derivations.package_id
@ -157,4 +162,4 @@ WHERE packages.id IN (
(exec-query conn
query
(list commit-hash name version)))
(list commit-hash name version locale)))