diff options
author | Danjela Lura <danielaluraa@gmail.com> | 2020-06-19 14:10:56 +0200 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2020-06-19 16:03:32 +0100 |
commit | a3ac33c0e1463239fe9612d7798fd3419ac3c7bc (patch) | |
tree | c41376e95677dd1fa84db7b9266dc1bba498bcb0 /guix-data-service/web | |
parent | 8d9a4d105c6bda93e75609ac09102a6953c28c9e (diff) | |
download | data-service-a3ac33c0e1463239fe9612d7798fd3419ac3c7bc.tar data-service-a3ac33c0e1463239fe9612d7798fd3419ac3c7bc.tar.gz |
Provide the packages page with translations
Signed-off-by: Christopher Baines <mail@cbaines.net>
Diffstat (limited to 'guix-data-service/web')
-rw-r--r-- | guix-data-service/web/revision/controller.scm | 33 | ||||
-rw-r--r-- | guix-data-service/web/revision/html.scm | 7 |
2 files changed, 32 insertions, 8 deletions
diff --git a/guix-data-service/web/revision/controller.scm b/guix-data-service/web/revision/controller.scm index d4a5e83..6fa225f 100644 --- a/guix-data-service/web/revision/controller.scm +++ b/guix-data-service/web/revision/controller.scm @@ -125,7 +125,8 @@ (guard-against-mutually-exclusive-query-parameters (parse-query-parameters request - `((after_name ,identity) + `((locale ,identity #:default "en_US.utf8") + (after_name ,identity) (field ,identity #:multi-value #:default ("version" "synopsis")) (search_query ,identity) @@ -535,6 +536,14 @@ `("Revision " (samp ,commit-hash))) (header-link (string-append "/revision/" commit-hash))) + (define description-and-synopsis-locale-options + (map + (match-lambda + ((locale) + locale)) + (package-description-and-synopsis-locale-options-guix-revision + conn (commit->revision-id conn commit-hash)))) + (if (any-invalid-query-parameters? query-parameters) (case (most-appropriate-mime-type '(application/json text/html) @@ -549,6 +558,7 @@ '() '() #f + #f #:path-base path-base #:header-text header-text #:header-link header-link)))) @@ -568,7 +578,8 @@ conn commit-hash #:limit-results limit-results - #:after-name (assq-ref query-parameters 'after_name)))) + #:after-name (assq-ref query-parameters 'after_name) + #:locale (assq-ref query-parameters 'locale)))) (git-repositories (git-repositories-containing-commit conn commit-hash)) @@ -625,6 +636,7 @@ packages git-repositories show-next-page? + description-and-synopsis-locale-options #:path-base path-base #:header-text header-text #:header-link header-link) @@ -682,19 +694,25 @@ "/revision/" commit-hash)) version-history-link) - (define lint-warnings-locale-options + (define locale-options (map (match-lambda ((locale) locale)) - (lint-warning-message-locales-for-revision conn commit-hash))) + (delete-duplicates + (append + (package-description-and-synopsis-locale-options-guix-revision + conn (commit->revision-id conn commit-hash)) + (lint-warning-message-locales-for-revision conn commit-hash))))) - (let* ((metadata + (let* ((locale (assq-ref query-parameters 'locale)) + (metadata (select-package-metadata-by-revision-name-and-version conn commit-hash name - version)) + version + locale)) (derivations (select-derivations-by-revision-name-and-version conn @@ -704,7 +722,6 @@ (git-repositories (git-repositories-containing-commit conn commit-hash)) - (locale (assq-ref query-parameters 'locale)) (lint-warnings (select-lint-warnings-by-revision-package-name-and-version conn @@ -742,7 +759,7 @@ git-repositories lint-warnings query-parameters - lint-warnings-locale-options + locale-options #:header-text header-text #:header-link header-link #:version-history-link diff --git a/guix-data-service/web/revision/html.scm b/guix-data-service/web/revision/html.scm index 4485b77..b7a2ad8 100644 --- a/guix-data-service/web/revision/html.scm +++ b/guix-data-service/web/revision/html.scm @@ -519,6 +519,7 @@ packages git-repositories show-next-page? + locale-options #:key path-base header-text header-link) (define field-options @@ -554,6 +555,12 @@ (style "padding-bottom: 0") (class "form-horizontal")) ,(form-horizontal-control + "Locale" query-parameters + #:options locale-options + #:allow-selecting-multiple-options #f + #:help-text + "Language.") + ,(form-horizontal-control "Search query" query-parameters #:help-text "List packages where the name or synopsis match the query.") |