From: zimoun Date: Sat, 18 Dec 2021 11:40:38 +0100 Subject: [PATCH] website: Relabel stable/latest to standard/latest. * website/apps/base/templates/components.scm (navbar): Relabel. * website/apps/base/templates/help.scm (help-t): Relabel. * website/apps/download/templates/download-latest.scm (download-latest-t): Relabel. Signed-off-by: Florian Pelz --- website/apps/base/templates/components.scm | 12 +++++++----- website/apps/base/templates/help.scm | 7 ++++--- website/apps/download/templates/download-latest.scm | 10 ++++++---- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/website/apps/base/templates/components.scm b/website/apps/base/templates/components.scm index e2a74d3..b354d48 100644 --- a/website/apps/base/templates/components.scm +++ b/website/apps/base/templates/components.scm @@ -1,5 +1,6 @@ ;;; GNU Guix web site ;;; Copyright © 2019 Florian Pelz +;;; Copyright © 2021 Simon Tournier ;;; Initially written by sirgazil who waives all ;;; copyright interest on this file. @@ -399,7 +400,7 @@ manual. #:items (list (C_ "website menu" - (menu-item #:label "Stable" + (menu-item #:label "Standard" #:active-item active-item #:url (guix-url "download/"))) (C_ "website menu" @@ -416,10 +417,11 @@ manual. (menu-item #:label "All" #:active-item active-item #:url (guix-url "help/"))) - (C_ "website menu" - (menu-item #:label "GNU Guix Manual (stable)" - #:active-item active-item - #:url (guix-url "manual/"))) + (menu-item #:label (C_ "website menu" + (string-append "GNU Guix Manual " + (latest-guix-version) "")) + #:active-item active-item + #:url (guix-url "manual/")) (C_ "website menu" (menu-item #:label "GNU Guix Manual (latest)" #:active-item active-item diff --git a/website/apps/base/templates/help.scm b/website/apps/base/templates/help.scm index 3d54ae1..98bba39 100644 --- a/website/apps/base/templates/help.scm +++ b/website/apps/base/templates/help.scm @@ -1,5 +1,6 @@ ;;; GNU Guix web site ;;; Public domain 2021 Luis Felipe López Acevedo +;;; Copyright © 2021 Simon Tournier ;;; Initially written by sirgazil who waives all ;;; copyright interest on this file. @@ -51,7 +52,8 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) online. You may also find more information about Guix by running " ,(G_ `(code "info guix")) ".")) (p - ,(link-more #:label (G_ "Read stable manual") + ,(link-more #:label (G_ (string-append "Read manual " + (latest-guix-version) "")) #:url (guix-url "manual/en" #:localize #f))) (p (a (@ (href ,(guix-url "manual/de" #:localize #f))) "Deutsch") " | " @@ -76,8 +78,7 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) `(p "This version of the manual is updated frequently to include the latest changes from Guix's source files. It is - more up-to-date than the manual for the stable release of - Guix.")) + more up-to-date than the manual for the release of Guix.")) (p ,(link-more #:label (G_ "Read latest manual") #:url (guix-url "manual/devel/" #:localize #f)))) diff --git a/website/apps/download/templates/download-latest.scm b/website/apps/download/templates/download-latest.scm index 17eaadf..cdcecb7 100644 --- a/website/apps/download/templates/download-latest.scm +++ b/website/apps/download/templates/download-latest.scm @@ -1,4 +1,5 @@ ;;; GNU Guix web site +;;; Copyright © 2021 Simon Tournier ;;; Initially written by sirgazil who waives all ;;; copyright interest on this file. ;;; @@ -145,8 +146,8 @@ (theme #:title (C_ "webpage title" '("Download latest")) #:description - (G_ "Download latest GNU Guix System images built by the Cuirass continuous -integration system.") + (G_ "Download latest development GNU Guix System images built +by the Cuirass continuous integration system.") #:keywords (string-split ;TRANSLATORS: |-separated list of webpage keywords (G_ "GNU|Linux|Unix|Free software|Libre software|Operating \ @@ -163,7 +164,7 @@ Package manager") #\|) `(main (section (@ (class "page")) - ,(G_ `(h2 "Download latest images")) + ,(G_ `(h2 "Download latest development images")) ;; TRANSLATORS: Continuous Integration is a section name ;; in the English (en) manual. ,(G_ @@ -175,7 +176,8 @@ Package manager") #\|) " continuous integration system at " (a (@ (href ,ci-url)) "ci.guix.gnu.org") ". These images are " ,(G_ `(b "development snapshots")) - ", you might prefer to use stable images that can be found " + ", you might prefer to use well-tested released images +that can be found " ,(G_ `(a (@ (href ,(guix-url "download/"))) "here.")))) (div (@ (class "centered-block limit-width")) base-commit: 336f7905428a858e32ea8064317a6cc03fa64afe -- 2.34.0