05/07: Add locale values in the JSON response for the lint warnings page

[Christopher Baines]

cbaines pushed a commit to branch master
in repository data-service.

commit d442d408ee580e51faca26844deb5cabe3c971ac
Author: Danjela Lura <danielaluraa@gmail.com>
AuthorDate: Wed Jun 24 14:15:16 2020 +0200

    Add locale values in the JSON response for the lint warnings page
    
    Signed-off-by: Christopher Baines <mail@cbaines.net>
---
 guix-data-service/model/lint-warning.scm      |  7 ++++---
 guix-data-service/web/revision/controller.scm | 10 ++++++++--
 guix-data-service/web/revision/html.scm       |  4 ++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/guix-data-service/model/lint-warning.scm 
b/guix-data-service/model/lint-warning.scm
index e4bb1b1..6371772 100644
--- a/guix-data-service/model/lint-warning.scm
+++ b/guix-data-service/model/lint-warning.scm
@@ -63,15 +63,16 @@
     (string-append "
 SELECT DISTINCT ON (lint_warnings.id) lint_warnings.id,
             lint_checkers.name, 
translated_lint_checker_descriptions.description,
-            lint_checkers.network_dependent, packages.name, packages.version,
+            translated_lint_checker_descriptions.locale, 
lint_checkers.network_dependent,
+            packages.name, packages.version,
             locations.file, locations.line, locations.column_number,
-            lint_warning_messages.message
+            lint_warning_messages.message, lint_warning_messages.locale
 FROM lint_warnings
 INNER JOIN lint_checkers
   ON lint_warnings.lint_checker_id = lint_checkers.id
 INNER JOIN (
   SELECT DISTINCT ON (lint_checkers.id) lint_checkers.id AS lint_checker_id,
-              lint_checker_descriptions.description
+              lint_checker_descriptions.description, 
lint_checker_descriptions.locale
   FROM guix_revision_lint_checkers
   INNER JOIN guix_revisions
     ON guix_revision_lint_checkers.guix_revision_id = guix_revisions.id
diff --git a/guix-data-service/web/revision/controller.scm 
b/guix-data-service/web/revision/controller.scm
index 08529be..2df5b99 100644
--- a/guix-data-service/web/revision/controller.scm
+++ b/guix-data-service/web/revision/controller.scm
@@ -1083,14 +1083,20 @@
                . ,(list->vector
                    (map (match-lambda
                           ((id lint-checker-name lint-checker-description
+                               lint-checker-description-locale
                                lint-checker-network-dependent
                                package-name package-version
                                file line-number column-number
-                               message)
+                               message message-locale)
                            `((package . ((name    . ,package-name)
                                          (version . ,package-version)))
                              ,@(if (member "message" fields)
-                                   `((message . ,message))
+                                   `((message . ,message)
+                                     (message-locale . ,message-locale))
+                                   '())
+                             ,@(if (member "linter" fields)
+                                   `((lint-checker-description . 
,lint-checker-description)
+                                     (lint-checker-description-locale . 
,lint-checker-description-locale))
                                    '())
                              ,@(if (member "location" fields)
                                    `((location . ((file          . ,file)
diff --git a/guix-data-service/web/revision/html.scm 
b/guix-data-service/web/revision/html.scm
index cf34d5f..a22c38e 100644
--- a/guix-data-service/web/revision/html.scm
+++ b/guix-data-service/web/revision/html.scm
@@ -1945,10 +1945,10 @@ figure {
           ,@(let ((fields (assq-ref query-parameters 'field)))
               (map
                (match-lambda
-                 ((id lint-checker-name lint-checker-description
+                 ((id lint-checker-name lint-checker-description 
lint-checker-description-locale
                       lint-checker-network-dependent
                       package-name package-version file line-number 
column-number
-                      message)
+                      message message-locale)
                   `(tr
                     (td (a (@ (href ,(string-append
                                       (string-join