From patchwork Fri Dec 24 17:34:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 35634 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D69C227BBE9; Fri, 24 Dec 2021 17:36:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 14ACE27BBE9 for ; Fri, 24 Dec 2021 17:36:17 +0000 (GMT) Received: from localhost ([::1]:49532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0oUK-0003TG-7F for patchwork@mira.cbaines.net; Fri, 24 Dec 2021 12:36:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0oU6-0003T8-Nt for guix-patches@gnu.org; Fri, 24 Dec 2021 12:36:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54679) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0oU5-0000N6-Pq for guix-patches@gnu.org; Fri, 24 Dec 2021 12:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0oU5-0003sG-O9 for guix-patches@gnu.org; Fri, 24 Dec 2021 12:36:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52596] [guix-artwork PATCH] website: Relabel stable/latest to release/current. Resent-From: "pelzflorian (Florian Pelz)" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Dec 2021 17:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52596 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: zimoun Cc: Julien Lepiller , Tobias Geerinckx-Rice , 52596@debbugs.gnu.org, Leo Famulari Received: via spool by 52596-submit@debbugs.gnu.org id=B52596.164036730514769 (code B ref 52596); Fri, 24 Dec 2021 17:36:01 +0000 Received: (at 52596) by debbugs.gnu.org; 24 Dec 2021 17:35:05 +0000 Received: from localhost ([127.0.0.1]:37992 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0oTA-0003q9-Fb for submit@debbugs.gnu.org; Fri, 24 Dec 2021 12:35:04 -0500 Received: from pelzflorian.de ([5.45.111.108]:39788 helo=mail.pelzflorian.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0oT7-0003pa-GC for 52596@debbugs.gnu.org; Fri, 24 Dec 2021 12:35:03 -0500 Received: from pelzflorian.localdomain (unknown [5.45.111.108]) by mail.pelzflorian.de (Postfix) with ESMTPSA id D31B53606F5; Fri, 24 Dec 2021 18:34:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=pelzflorian.de; s=mail; t=1640367300; bh=OGmjHRlyEUO3fmRUq7ARA88kPkRyvkpLwhCO0CUjXXU=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=TivSnDzHHjN2HKUOmTVYIp34PBvnbqq75cz2FrcLjhwl9lx+c29gHAkHPmu7vO/rR Cp0fm1X8Xg5ODtZkBtrmR3xtCiSXbcUaZM846+RjUiFfnlsqMVU9Bp6H7pSAZLvse8 RkDMzQazitRzOFiBVpWwLKZtiEOvNY0VQeCAvbGw= Date: Fri, 24 Dec 2021 18:34:48 +0100 From: "pelzflorian (Florian Pelz)" Message-ID: <20211224173448.saiun645pxymukbl@pelzflorian.localdomain> References: <20211218104038.306475-1-zimon.toutoune@gmail.com> <20211218152217.l5vtbwkwhmiwuzfe@pelzflorian.localdomain> <20211218193653.5h5aex5m6wbxq6dc@pelzflorian.localdomain> <861r29q7ae.fsf@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <861r29q7ae.fsf@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 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 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(-) base-commit: 336f7905428a858e32ea8064317a6cc03fa64afe 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"))