[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: website: 'manual-url' now accepts a #:language parameter.
|
From: |
Ludovic Courtès |
|
Subject: |
01/02: website: 'manual-url' now accepts a #:language parameter. |
|
Date: |
Mon, 29 Apr 2019 18:30:13 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix-artwork.
commit bf3e4912864812c284687ede4e0ce36e4051ca1a
Author: Ludovic Courtès <address@hidden>
Date: Mon Apr 29 14:02:17 2019 +0200
website: 'manual-url' now accepts a #:language parameter.
* website/apps/base/utils.scm (manual-url): Add #:language parameter and
honor it.
---
website/apps/base/utils.scm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/website/apps/base/utils.scm b/website/apps/base/utils.scm
index 5597890..8d901df 100644
--- a/website/apps/base/utils.scm
+++ b/website/apps/base/utils.scm
@@ -1,5 +1,5 @@
;;; GNU Guix web site
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès
<address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
;;; Copyright © 2015 Mathieu Lirzin <address@hidden>
;;; Copyright © 2013 Alex Sassmannshausen <address@hidden>
;;; Copyright © 2017 Eric Bavier <address@hidden>
@@ -101,7 +101,8 @@
(string-append (guix-root-url-path) subpath)))
-(define* (manual-url #:optional (subpath ""))
+(define* (manual-url #:optional (subpath "")
+ #:key (language "en"))
"Append SUBPATH to the GNU Guix manual URL path.
SUBPATH (string)
@@ -110,11 +111,12 @@
RETURN VALUE (string)
A URL path. For example:
- /software/guix/manual/html_node/System-installation.html."
+ /software/guix/manual/en/html_node/System-installation.html."
(string-append
(guix-url (if (getenv "GUIX_WEB_SITE_INFO")
- "manual/en/"
- "manual/html_node/")) subpath))
+ (string-append "manual/" language "/")
+ (string-append "manual/" language "/html_node/"))
+ subpath)))