From: "pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de>
To: zimoun <zimon.toutoune@gmail.com>
Cc: Julien Lepiller <julien@lepiller.eu>,
Tobias Geerinckx-Rice <me@tobias.gr>,
52596@debbugs.gnu.org, Leo Famulari <leo@famulari.name>
Subject: [bug#52596] [guix-artwork PATCH] website: Relabel stable/latest to release/current.
Date: Fri, 24 Dec 2021 18:34:48 +0100 [thread overview]
Message-ID: <20211224173448.saiun645pxymukbl@pelzflorian.localdomain> (raw)
In-Reply-To: <861r29q7ae.fsf@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1059 bytes --]
Sorry for not having pushed yet. (Actually I had somehow assumed you
had commit access ...).
On Sun, Dec 19, 2021 at 10:21:29AM +0100, zimoun wrote:
> Well, maybe ’standard / latest’? Or something else than latest as
> development, current, or whatever else.
Actually yes.
I would like to push the attached patch
"website: Relabel stable/latest to standard/latest."
which is your patch but:
- Typo is fixed and G_ is used correctly.
- With latest remaining latest. I don't think there is much
difference, so better not invalidate existing translations. Also
latest is arguably more accurate than current.
- The sum of your changes grants copyright IMHO, so I added copyright
headers for you for all changed files.
Note that Luis Felipe opted for
;;; Public domain 2021 Luis Felipe López Acevedo
instead of
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
so I better ask first which you prefer.
- Also changing Help/GNU Guix Manual (stable)
to Help/GNU Guix Manual 1.3.0 as you proposed.
OK?
Regards,
Florian
[-- Attachment #2: website-Relabel-stable-latest-to-standard-latest.patch --]
[-- Type: text/plain, Size: 5741 bytes --]
From: zimoun <zimon.toutoune@gmail.com>
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 <pelzflorian@pelzflorian.de>
---
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 <pelzflorian@pelzflorian.de>
+;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; 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 <zimon.toutoune@gmail.com>
;;; 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 <zimon.toutoune@gmail.com>
;;; 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
next prev parent reply other threads:[~2021-12-24 17:36 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-18 10:40 [bug#52596] [guix-artwork PATCH] website: Relabel stable/latest to release/current zimoun
2021-12-18 15:22 ` pelzflorian (Florian Pelz)
2021-12-18 15:43 ` zimoun
2021-12-18 19:36 ` pelzflorian (Florian Pelz)
2021-12-19 9:21 ` zimoun
2021-12-19 10:40 ` pelzflorian (Florian Pelz)
2021-12-23 1:21 ` pelzflorian (Florian Pelz)
2021-12-24 17:34 ` pelzflorian (Florian Pelz) [this message]
2021-12-29 16:40 ` zimoun
2021-12-29 19:42 ` pelzflorian (Florian Pelz)
2021-12-29 20:07 ` Leo Famulari
2021-12-29 22:53 ` pelzflorian (Florian Pelz)
2021-12-30 15:49 ` zimoun
2021-12-30 17:03 ` pelzflorian (Florian Pelz)
2021-12-29 20:07 ` zimoun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211224173448.saiun645pxymukbl@pelzflorian.localdomain \
--to=pelzflorian@pelzflorian.de \
--cc=52596@debbugs.gnu.org \
--cc=julien@lepiller.eu \
--cc=leo@famulari.name \
--cc=me@tobias.gr \
--cc=zimon.toutoune@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).