From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WO36D+AYkGA7QwAAgWs5BA (envelope-from ) for ; Mon, 03 May 2021 17:38:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id +LO2C+AYkGDEAwAA1q6Kng (envelope-from ) for ; Mon, 03 May 2021 15:38:08 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E6F961D5A0 for ; Mon, 3 May 2021 17:38:07 +0200 (CEST) Received: from localhost ([::1]:53322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldae7-0003uO-3j for larch@yhetil.org; Mon, 03 May 2021 11:38:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldae2-0003ss-0z for guix-patches@gnu.org; Mon, 03 May 2021 11:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldae1-0001Cg-Q4 for guix-patches@gnu.org; Mon, 03 May 2021 11:38:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ldae1-0008Ak-NZ for guix-patches@gnu.org; Mon, 03 May 2021 11:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48187] [PATCH] website: help: Add Guix's latest manual Resent-From: "pelzflorian (Florian Pelz)" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 May 2021 15:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48187 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Luis Felipe Cc: 48187@debbugs.gnu.org Received: via spool by 48187-submit@debbugs.gnu.org id=B48187.162005625731404 (code B ref 48187); Mon, 03 May 2021 15:38:01 +0000 Received: (at 48187) by debbugs.gnu.org; 3 May 2021 15:37:37 +0000 Received: from localhost ([127.0.0.1]:47046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldadc-0008AS-UB for submit@debbugs.gnu.org; Mon, 03 May 2021 11:37:37 -0400 Received: from pelzflorian.de ([5.45.111.108]:46760 helo=mail.pelzflorian.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldada-0008AM-Iv for 48187@debbugs.gnu.org; Mon, 03 May 2021 11:37:35 -0400 Received: from pelzflorian.localdomain (unknown [5.45.111.108]) by mail.pelzflorian.de (Postfix) with ESMTPSA id 5104036063D; Mon, 3 May 2021 17:37:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=pelzflorian.de; s=mail; t=1620056253; bh=ILmiKVFUvaInYruSfV6z/lemDepLB5pMkrHka9It5X4=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=SyAGNZ9c69w4ZKNHOwro6R6jIzqNU8MkR41DxzL0hUKJpxW5ZiSkS1OdUNQyQ8DCe /3YPtt+H/YzeSdiS5voqFuWoqAk5P4LtZxtbSvyQu+SvPznYmB5foLhSU/qh78x75T S6dtr+akbWpzRibuGd3essVyrsTxuy1xYSDverq0= Date: Mon, 3 May 2021 17:37:24 +0200 From: "pelzflorian (Florian Pelz)" Message-ID: <20210503153724.74z2kuwyajusqguo@pelzflorian.localdomain> References: <8UmQnlT6MS9cVKGVfsf7WZLqOi0-EbqzUNPUDKxOhYgbUbgfWqiwnWHqyeLWZSScRW913J8ecUCUBy-_WBrT0wD9vExrDMudtn4ZrQU-XQo=@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8UmQnlT6MS9cVKGVfsf7WZLqOi0-EbqzUNPUDKxOhYgbUbgfWqiwnWHqyeLWZSScRW913J8ecUCUBy-_WBrT0wD9vExrDMudtn4ZrQU-XQo=@protonmail.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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1620056288; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=MbU3rx+OBRcqylng3M5KtvET5Q+qpG6PhLy7XZGfBmM=; b=Cs9PSsLvp3SyhZ9ZtbnoXViQyhzbhS++V2MWN6vrZPMRVg4+X4/QWLAONSG0fiobtQZePc BlrWnZZ/01JqN5JKxfisBVzYwKKTDr3cOx6JsbZH117/HDGwtJ0fvp1SACIT8+bCIzxpNu 3dxgeyv3WBSWLatHdqIBcbhwfWnJQ/tm9yQVo3UUVF5QRP1lLL//1c2GqGEaQn24edmWZm /1Snu89j/2UnH2Vn3Qb6+8BjlaAS5F0S57sRSadIJLE65BXX2lm8p68BM+r2ymiqXNbIPB dK8jg9mmHDlapnULNve43MT+k3flc7a4ICiGgh6jeyRkAJt0pU8sOD/K8C1Sog== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620056288; a=rsa-sha256; cv=none; b=sH49HZ4mfSpnBwsN1ktR8bgsoAV3bFUTqn3y4cEdk9k2oLxIaezB46Bqhald4E12qGYgDe OyC9JGonUau8x/Re11OLMDn+Clqyi7Hmj2VRvy6x8P8Ev5VJhU1WWek+tdaI/WAbPn85E6 wmMw+PNR1QU+Aa1+VOe370iwBr8GHGQbQkUyW8YbMpOOWGI5/gjIBLweRyRZ5THGPPFq86 Irh+FnlGeMnwP+fOoRzh4QAYvi2S1bsXQmcJXxxoOh+d0eAPTxuZKHEu0QVJk/1fPBjzwC DZj33rllOU3vkuAlZaRePE7Kfi5NqeC+29zkDxoIRWDwHMSLfWyh0K4JWpDeIA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=pelzflorian.de header.s=mail header.b=SyAGNZ9c; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.46 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=pelzflorian.de header.s=mail header.b=SyAGNZ9c; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: E6F961D5A0 X-Spam-Score: -1.46 X-Migadu-Scanner: scn0.migadu.com X-TUID: G6uo0DXSGka4 Thank you for this patch, Luis! On Mon, May 03, 2021 at 02:07:12PM +0000, Luis Felipe via Guix-patches via wrote: > --- a/website/apps/base/templates/help.scm > +++ b/website/apps/base/templates/help.scm > @@ -43,14 +43,14 @@ system|GNU Hurd|GNU Guix package manager|Help resources") #\|) > (img > (@ (src ,(guix-url "static/base/img/manual-icon.png")) > (alt ""))) > - ,(G_ `(h3 "GNU Guix Manual")) > + ,(G_ `(h3 "GNU Guix Manual" " " ,(latest-guix-version))) This leads to a translatable msgid in po/guix-website.po like this: #: apps/base/templates/help.scm:46 #, xml-text msgid "GNU Guix Manual " msgstr "" Please change the ordering and strings to ,(G_ `(h3 "GNU Guix Manual " ,(latest-guix-version) "")) This makes for a translatable string #: apps/base/templates/help.scm:46 #, xml-text msgid "GNU Guix Manual <1/>" msgstr "" Otherwise LGTM. Regards, Florian