From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WHYhM1h/kGBPFwEAgWs5BA (envelope-from ) for ; Tue, 04 May 2021 00:55:20 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +CC4Llh/kGBdGAAAbx9fmQ (envelope-from ) for ; Mon, 03 May 2021 22:55:20 +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 4BB7932370 for ; Tue, 4 May 2021 00:55:20 +0200 (CEST) Received: from localhost ([::1]:40660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldhTC-0006x6-RY for larch@yhetil.org; Mon, 03 May 2021 18:55:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldh1q-00006g-SU for guix-patches@gnu.org; Mon, 03 May 2021 18:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldh1q-0006ck-Iw for guix-patches@gnu.org; Mon, 03 May 2021 18:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ldh1q-00063Q-EK for guix-patches@gnu.org; Mon, 03 May 2021 18:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48187] [PATCH] website: help: Add Guix's latest manual Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 May 2021 22:27:02 +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 , "pelzflorian (Florian Pelz)" Cc: "48187@debbugs.gnu.org" <48187@debbugs.gnu.org> Received: via spool by 48187-submit@debbugs.gnu.org id=B48187.162008078423263 (code B ref 48187); Mon, 03 May 2021 22:27:02 +0000 Received: (at 48187) by debbugs.gnu.org; 3 May 2021 22:26:24 +0000 Received: from localhost ([127.0.0.1]:49064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldh1D-000639-W3 for submit@debbugs.gnu.org; Mon, 03 May 2021 18:26:24 -0400 Received: from lepiller.eu ([89.234.186.109]:36202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldh1B-000633-Cr for 48187@debbugs.gnu.org; Mon, 03 May 2021 18:26:22 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 48ea38ce; Mon, 3 May 2021 22:26:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date :in-reply-to:references:mime-version:content-type :content-transfer-encoding:subject:to:cc:from:message-id; s= dkim; bh=YSGTsDHTxoq9L96hcWQ8nrokRVFz8Am4brh9fYYs+TY=; b=nxPHUZa i2BJp1unmb58cVSZ+IRYJfUQsUgWANIDQVIgkBnkVF1J2NJlP/j3kkrV6jxBwWXO Wwzz8FH3MzSY/ejR3Lj8NBi8q+lGtplam3euycm2y7SOf+dEmmipyDz96FZk2xGL XMH7C1lZ2//3Ljctm0xI6DLBbjJowA/q4eO/RekftMxTBJ329Mk1Ai4QJP8ScteY lq5BF5yjrNJGnFdOTOUhFqF9drBSjILbN64NREmmoMQ5bwL3BmdOlp1o1bYF5Blk fSczD4I5mQbuMGv3RtlkX6wro26n/7MCkLLAOWSn1A+MKCSQFqDo0JFiUj19qa92 jjTr+GHkb/LTK5A== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 0483221b (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 3 May 2021 22:26:18 +0000 (UTC) Date: Mon, 03 May 2021 18:25:59 -0400 User-Agent: K-9 Mail for Android In-Reply-To: <-aFK74j-0pQv6Y1jlavwIzTZ4044hhMip9S-umIDDctwnwwQp0ZZ2_lB6Sl3Jp1C6qxbf4QzORa4kwFqTqwc-4goT17gDN69W83fRH34gs8=@protonmail.com> References: <8UmQnlT6MS9cVKGVfsf7WZLqOi0-EbqzUNPUDKxOhYgbUbgfWqiwnWHqyeLWZSScRW913J8ecUCUBy-_WBrT0wD9vExrDMudtn4ZrQU-XQo=@protonmail.com> <20210503153724.74z2kuwyajusqguo@pelzflorian.localdomain> <-aFK74j-0pQv6Y1jlavwIzTZ4044hhMip9S-umIDDctwnwwQp0ZZ2_lB6Sl3Jp1C6qxbf4QzORa4kwFqTqwc-4goT17gDN69W83fRH34gs8=@protonmail.com> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----CLS4WR7XHOTLIWUCB47AIDV7V5YM4L" Content-Transfer-Encoding: 7bit From: Julien Lepiller Message-ID: <71DCCD6D-6BF4-4989-AC2D-4AACBE02CB85@lepiller.eu> 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=1620082520; 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: content-transfer-encoding:content-transfer-encoding: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=m8lvbl50hkmYbjchB1P77tSADUUKV7e9rYGINitb8gk=; b=ufgqEGTAFREJV146QkSBe02hV2jCkFTHqpjBHTzl+x2yNs/MFWh4HKYXdA5oG0vP9/eV+A GBAFtqvl6xpJ+YOnT39B2vZEWPrwPgDMdZuiGA2Y9MncG8mNhSdxhvumDE5SvQJ6fweqfV fnvXNZhgoCUOlqqiSTdOmJTbFd2mgJVrB7YQGj0RDAyIYioVRMtk5cmMQsRTrHNAC+h9iF eUodIkVqZeDrpOMHGLJHTiDItKCvPxXpyhhbOsutfzDrjWSYh6iTsXL01lVeerlxnPeg3L g4Ctv/KxFXfP4gG0lFnoxaZL/lELgl4+/Ruw81x57Gp0j8T1m3z5tXKcMPT3Nw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620082520; a=rsa-sha256; cv=none; b=V9cfZa4GkueuYf+zwo55QCnGUtghPdZ+E3LDQRgJKkKuq3BmuDlnsxgFOT9xgct0NH89PN ydW2Jh2I8cmszswVKoVMiSvfSwrxj5GuelP/qTZRT9mewclhmU/nKOxqr9e0XJttedbAN/ ZdUKO+v9IaFhvH9/MF1RNXtg4vRrdtJ1+qIW1nEsJfukvqycRMqBxkTwpgPauaW47SQ2kr IyxU/UYFzYOS/Er7tDl8lql5QdkdiFB4AHnI3Uu5Pj/JGaaXucmiwDNgPSfvFaFyQjHUe2 +lMF2XlI5xkvyXIo/Oh1IzDxbsf9ZPSZXxAwT4OOnbmXhWnhOQJC3tM+UF65Wg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b="nxPHUZa "; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=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.36 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b="nxPHUZa "; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=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: 4BB7932370 X-Spam-Score: -1.36 X-Migadu-Scanner: scn0.migadu.com X-TUID: lsLYs72Y71Tp ------CLS4WR7XHOTLIWUCB47AIDV7V5YM4L Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Alright, I decoupled weblate from the checked out pot file=2E I regenerate = it on the fly now, since it was almost always forgotten anyway=2E Don't wor= ry about it, we can even remove it, since I suppose it will get out of sync= pretty soon :) Le 3 mai 2021 12:27:33 GMT-04:00, Luis Felipe via Guix-patches via a =C3=A9crit : >Hi, Florian :) > >On Monday, May 3, 2021 3:37 PM, pelzflorian (Florian Pelz) > wrote: > >> 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=2Escm >> > +++ b/website/apps/base/templates/help=2Escm >> > @@ -43,14 +43,14 @@ system|GNU Hurd|GNU Guix package manager|Help >resources") #\|) >> > (img >> > (@ (src ,(guix-url "static/base/img/manual-icon=2Epng")) >> > (alt ""))) >> > >> > - ,(G_ `(h3 "GNU Guix Manual")) >> > >> > >> > >> > - ,(G_ `(h3 "GNU Guix Manual" " " ,(latest-guix-version))) >> > >> > >> >> This leads to a translatable msgid in po/guix-website=2Epo like this: >> >> #: apps/base/templates/help=2Escm: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=2Escm:46 >> #, xml-text >> msgid "GNU Guix Manual <1/>" >> msgstr "" > >This new patch corrects that line=2E > >I didn't update the catalogs though, (don't know how), so I just made >the change and hope for the best :) ------CLS4WR7XHOTLIWUCB47AIDV7V5YM4L Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable Alright, I decoupled weblate from the checked out = pot file=2E I regenerate it on the fly now, since it was almost always forg= otten anyway=2E Don't worry about it, we can even remove it, since I suppos= e it will get out of sync pretty soon :)

= Le 3 mai 2021 12:27:33 GMT-04:00, Luis Felipe via Guix-patches via <guix= -patches@gnu=2Eorg> a =C3=A9crit :
Hi, Florian :)

On Monday, May 3, 2021 3:37 PM=
, pelzflorian (Florian Pelz) <pelzflorian@pelzflorian=2Ede> wrote:
 Thank you for this p=
atch, Luis!

 On Mon, May 03, 2021 at 02:07:12PM +0000, Luis Felipe v=
ia Guix-patches via wrote:

 --- a/website/apps/base/templates/help=2Escm
 +++ b/website/a=
pps/base/templates/help=2Escm
 @@ -43,14 +43,14 @@ system|GNU Hurd|GNU G=
uix package manager|Help resources") #\|)
 (img
 (@ (src ,(guix-url "=
static/base/img/manual-icon=2Epng"))
 (alt "")))

 -          ,(G_=
 `(h3 "GNU Guix Manual"))



 -          ,(G_ `(h3 "GNU Guix Ma=
nual" " " ,(latest-guix-version)))



 This leads =
to a translatable msgid in po/guix-website=2Epo like this:

 #: apps/=
base/templates/help=2Escm: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=2Escm:46
 #, =
xml-text
 msgid "GNU Guix Manual <1/>"
 msgstr ""

This new patch corrects that line=2E

I didn't update the cata=
logs though, (don't know how), so I just made the change and hope for the b=
est :)
------CLS4WR7XHOTLIWUCB47AIDV7V5YM4L--